diff --git a/VERSION b/VERSION index 26bea73e81..f176c94419 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.31.0 +0.31.1 diff --git a/cli/pkg/workspace/airy_yaml.go b/cli/pkg/workspace/airy_yaml.go index edce172ed1..4013d4a1b4 100644 --- a/cli/pkg/workspace/airy_yaml.go +++ b/cli/pkg/workspace/airy_yaml.go @@ -12,6 +12,8 @@ type IngressConf struct { Https bool `yaml:"https,omitempty"` LetsencryptEmail string `yaml:"letsencryptEmail,omitempty"` LoadbalancerAnnotations map[string]string `yaml:"loadbalancerAnnotations,omitempty"` + HttpsTermination string `yaml:"httpsTermination,omitempty"` + HttpsCertificate string `yaml:"httpsCertificate,omitempty"` } type SecurityConf struct { diff --git a/cli/pkg/workspace/template/copy.go b/cli/pkg/workspace/template/copy.go index eb3a77c09a..23280747c9 100644 --- a/cli/pkg/workspace/template/copy.go +++ b/cli/pkg/workspace/template/copy.go @@ -18,6 +18,8 @@ type Variables struct { LoadbalancerAnnotations map[string]string Https bool LetsencryptEmail string + HttpsTermination string + HttpsCertificate string } //go:embed src diff --git a/cli/pkg/workspace/template/src/airy.yaml b/cli/pkg/workspace/template/src/airy.yaml index 5ae673b013..2865c11a55 100644 --- a/cli/pkg/workspace/template/src/airy.yaml +++ b/cli/pkg/workspace/template/src/airy.yaml @@ -4,11 +4,19 @@ kubernetes: namespace: {{ .Namespace }} ngrokEnabled: {{ default false .NgrokEnabled }} ingress: -{{- if .Host }} + {{- if .Host }} host: {{ default "airy.core" .Host }} -{{- end }} + {{- end }} https: {{ default false .Https}} + {{- if .LetsencryptEmail }} letsencryptEmail: {{ .LetsencryptEmail}} + {{- end }} + {{- if .HttpsTermination }} + httpsTermination: {{ .HttpsTermination}} + {{- end }} + {{- if .HttpsCertificate }} + httpsCertificate: {{ .HttpsCertificate}} + {{- end }} {{- if .LoadbalancerAnnotations }} loadbalancerAnnotations: {{- range $k, $v := .LoadbalancerAnnotations }} diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index d32b06b94a..b181511a06 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -3,12 +3,36 @@ title: Changelog sidebar_label: ๐Ÿ“ Changelog --- +## 0.31.1 + +#### ๐Ÿš€ Features + +- [[#2432](https://github.com/airyhq/airy/issues/2432)] Added more options to the UI [[#2433](https://github.com/airyhq/airy/pull/2433)] +- [[#2393](https://github.com/airyhq/airy/issues/2393)] Add more chatplugin options [[#2431](https://github.com/airyhq/airy/pull/2431)] + +#### ๐Ÿ› Bug Fixes + +- [[#2390](https://github.com/airyhq/airy/issues/2390)] Fix duplicate ingress port definition [[#2446](https://github.com/airyhq/airy/pull/2446)] +- [[#2390](https://github.com/airyhq/airy/issues/2390)] Fix serviceAccount for helm [[#2442](https://github.com/airyhq/airy/pull/2442)] + +#### ๐Ÿงฐ Enhancements + +- [[#2390](https://github.com/airyhq/airy/issues/2390)] HTTPS termination at LB level [[#2427](https://github.com/airyhq/airy/pull/2427)] + +#### Airy CLI + +You can download the Airy CLI for your operating system from the following links: + +[MacOS](https://airy-core-binaries.s3.amazonaws.com/0.31.1/darwin/amd64/airy) +[Linux](https://airy-core-binaries.s3.amazonaws.com/0.31.1/linux/amd64/airy) +[Windows](https://airy-core-binaries.s3.amazonaws.com/0.31.1/windows/amd64/airy.exe) + ## 0.31.0 #### ๐Ÿš€ Features - [[#628](https://github.com/airyhq/airy/issues/628)] Make library compatible with node.js [[#2426](https://github.com/airyhq/airy/pull/2426)] -- [[#2405](https://github.com/airyhq/airy/issues/2405)]ย Icons for Rendering/Sending File Attachments [[#2420](https://github.com/airyhq/airy/pull/2420)] +- [[#2405](https://github.com/airyhq/airy/issues/2405)] Icons for Rendering/Sending File Attachments [[#2420](https://github.com/airyhq/airy/pull/2420)] - [[#2406](https://github.com/airyhq/airy/issues/2406)] Instagram Source: Render Messages with Media & Share in Inbox UI [[#2419](https://github.com/airyhq/airy/pull/2419)] - [[#2109](https://github.com/airyhq/airy/issues/2109)] Render send file attachments via facebook messenger [[#2404](https://github.com/airyhq/airy/pull/2404)] - [[#2257](https://github.com/airyhq/airy/issues/2257)] Add analytics demo [[#2325](https://github.com/airyhq/airy/pull/2325)] @@ -1242,25 +1266,3 @@ You can download the Airy CLI for your operating system from the following links [Linux](https://airy-core-binaries.s3.amazonaws.com/0.9.0/linux/amd64/airy) [Windows](https://airy-core-binaries.s3.amazonaws.com/0.9.0/windows/amd64/airy.exe) -## 0.8.1 - -#### Changes - -#### ๐Ÿš€ Features - -- [[#861](https://github.com/airyhq/airy/issues/861)] Render quick replies from facebook [[#942](https://github.com/airyhq/airy/pull/942)] -- [[#910](https://github.com/airyhq/airy/issues/910)] Add message metadata API documentation [[#937](https://github.com/airyhq/airy/pull/937)] -- [[#918](https://github.com/airyhq/airy/issues/918)]ย New Airy websocket using Airy events [[#928](https://github.com/airyhq/airy/pull/928)] -- [[#875](https://github.com/airyhq/airy/issues/875)] Improve Box component [[#924](https://github.com/airyhq/airy/pull/924)] -- [[#910](https://github.com/airyhq/airy/issues/910)] Add message metadata API [[#933](https://github.com/airyhq/airy/pull/933)] -- [[#856](https://github.com/airyhq/airy/issues/856)] Render Generic Template from Facebook [[#930](https://github.com/airyhq/airy/pull/930)] -- [[#855](https://github.com/airyhq/airy/issues/855)] Render Button Template from Facebook [[#921](https://github.com/airyhq/airy/pull/921)] - -#### Airy CLI - -You can download the Airy CLI for your operating system from the following links: - -[MacOS](https://airy-core-binaries.s3.amazonaws.com/0.8.1/darwin/amd64/airy) -[Linux](https://airy-core-binaries.s3.amazonaws.com/0.8.1/linux/amd64/airy) -[Windows](https://airy-core-binaries.s3.amazonaws.com/0.8.1/windows/amd64/airy.exe) - diff --git a/docs/docs/getting-started/installation/aws.md b/docs/docs/getting-started/installation/aws.md index 739abaee71..598e14324b 100644 --- a/docs/docs/getting-started/installation/aws.md +++ b/docs/docs/getting-started/installation/aws.md @@ -200,35 +200,22 @@ If you don't have your own HTTPS certificate you can request one from AWS ACM. ::: -#### Configure the ingress service +#### Upgrade your Airy Core instance -Locate and set your KUBECONFIG file and set the other environment variables: +Edit your `airy.yaml` file and add the following configuration: -```sh -export KUBECONFIG="PATH/TO/DIR/kube.conf" -export ARN="Your-unique-ACM-ARN" -export HOSTNAME="public-FQDN" -``` - -Modify the existing ingress service to reconfigure the AWS LoadBalancer: - -```sh -kubectl -n kube-system annotate service ingress-nginx-controller "service.beta.kubernetes.io/aws-load-balancer-ssl-ports=443" "service.beta.kubernetes.io/aws-load-balancer-ssl-cert=${ARN}" -kubectl -n kube-system patch service ingress-nginx-controller --patch '{"spec": { "ports": [ { "name": "https", "port": 443, "protocol": "TCP", "targetPort": 80 } ] } }' ``` - -Update the `hostnames` configMap with the new https endpoint: - -```sh -kubectl patch configmap hostnames --patch "{\"data\": { \"HOST\": \"https://${HOSTNAME}\"} }" +ingress: + host: "The-fqdn-used-in-your-certificate" + https: true + httpsTermination: "LoadBalancer" + httpsCertificate: "Your-unique-ACM-ARN" ``` -Update the existing ingress resources with the new hostname (for this you will additionally require the [jq](https://stedolan.github.io/jq/download/) utility): +Upgrade your Airy Core instance ```sh -kubectl get ingress airy-core -o json | jq "(.spec.rules[0].host=\"${HOSTNAME}\")" | kubectl apply -f - -kubectl get ingress airy-core-ui -o json | jq "(.spec.rules[0].host=\"${HOSTNAME}\")" | kubectl apply -f - -kubectl get ingress airy-core-redirect -o json | jq "(.spec.rules[0].host=\"${HOSTNAME}\")" | kubectl apply -f - +airy upgrade ``` #### Setup your DNS diff --git a/docs/docs/sources/chatplugin/customization.md b/docs/docs/sources/chatplugin/customization.md index 6014870533..2d02e725cd 100644 --- a/docs/docs/sources/chatplugin/customization.md +++ b/docs/docs/sources/chatplugin/customization.md @@ -50,6 +50,8 @@ If you are happy with your customization, copy it and add this code inside the t | sendMessageIcon | URL | Set your icon as `sendButton` and replace the default paperplane | | startNewConversationText | string | Set the Start new Conversation text button of your Airy Chat Plugin | | disableMobile | boolean | Disable the entire Airy Chat Plugin for mobile devices | +| hideInputBar | boolean | Disables the input bar of the Airy Chat Plugin | +| hideEmojis | boolean | Disables the emojis in the input bar of the Airy Chat Plugin | | bubbleState | 'expanded', 'minimized' | Set the behaviour of the chatplugin to be always expanded or always minimized | | closeMode | 'basic', 'medium', 'full' | Choose one of the different option to close the chatplugin and start a new conversation | diff --git a/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.module.scss b/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.module.scss index 6a9b11edd3..ad1257e581 100644 --- a/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.module.scss +++ b/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.module.scss @@ -104,6 +104,9 @@ align-self: flex-end; cursor: pointer; margin-bottom: 1px; + display: flex; + align-items: center; + justify-content: center; img { display: block; @@ -116,7 +119,7 @@ svg { width: 18px; - height: 20px; + height: 18px; } } @@ -141,6 +144,7 @@ align-items: center; position: relative; height: 30px; + margin-right: 4px; background: transparent; border: none; cursor: pointer; diff --git a/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.tsx b/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.tsx index f8b20256df..edeaffde86 100644 --- a/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.tsx +++ b/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.tsx @@ -130,24 +130,26 @@ const AiryInputBar = (props: AiryInputBarProps) => { return ( <> -
-