From ebd4c530de6036d7f3daaf5d9cd702eaf7127a65 Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 20 May 2020 14:15:59 +0800 Subject: [PATCH 01/26] added desktop web chart, releases and jenkins --- Jenkinsfile | 69 ++++++++++ charts/nynja-app-desktop/.helmignore | 21 ++++ charts/nynja-app-desktop/Chart.yaml | 5 + .../nynja-app-desktop/templates/00-label.yaml | 32 +++++ .../nynja-app-desktop/templates/_helpers.tpl | 32 +++++ .../templates/configmap.yaml | 20 +++ .../templates/deployment.yaml | 88 +++++++++++++ .../templates/mqtt-serviceentry.yaml | 20 +++ .../templates/nginx-configmap.yaml | 119 ++++++++++++++++++ .../templates/sealedsecrets.yaml | 14 +++ .../nynja-app-desktop/templates/service.yaml | 18 +++ .../templates/virtualservice.yaml | 63 ++++++++++ charts/nynja-app-desktop/values.yaml | 45 +++++++ releases/prod/nynja-app-desktop.yaml | 34 +++++ releases/staging/nynja-app-desktop.yaml | 34 +++++ 15 files changed, 614 insertions(+) create mode 100644 charts/nynja-app-desktop/.helmignore create mode 100644 charts/nynja-app-desktop/Chart.yaml create mode 100644 charts/nynja-app-desktop/templates/00-label.yaml create mode 100644 charts/nynja-app-desktop/templates/_helpers.tpl create mode 100644 charts/nynja-app-desktop/templates/configmap.yaml create mode 100644 charts/nynja-app-desktop/templates/deployment.yaml create mode 100644 charts/nynja-app-desktop/templates/mqtt-serviceentry.yaml create mode 100644 charts/nynja-app-desktop/templates/nginx-configmap.yaml create mode 100644 charts/nynja-app-desktop/templates/sealedsecrets.yaml create mode 100644 charts/nynja-app-desktop/templates/service.yaml create mode 100644 charts/nynja-app-desktop/templates/virtualservice.yaml create mode 100644 charts/nynja-app-desktop/values.yaml create mode 100644 releases/prod/nynja-app-desktop.yaml create mode 100644 releases/staging/nynja-app-desktop.yaml diff --git a/Jenkinsfile b/Jenkinsfile index 20d12358d..26fab97c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,6 +11,13 @@ pipeline { IMAGE_BUILD_TAG = "$BRANCH_NAME-$BUILD_NUMBER" HELM_CHART_NAME = "nynja-app-web" DEV_BRANCH = "dev" + SLACK_CHANNEL_DESKTOP = "#nynja-app-desktop" + NAMESPACE_DESKTOP = "nynja-desktop" + APP_NAME_DESKTOP = "nynja-app-desktop" + IMAGE_NAME_DESKTOP = "eu.gcr.io/nynja-ci-201610/${NAMESPACE_DESKTOP}/${APP_NAME_DESKTOP}" + IMAGE_BUILD_TAG_DESKTOP = "$BRANCH_NAME-$BUILD_NUMBER" + HELM_CHART_NAME_DESKTOP = "nynja-app-desktop" + DESKTOP_BRANCH = "desktop-master" } agent { kubernetes(builders.multi([ @@ -158,6 +165,68 @@ pipeline { } } } + } + stage('Build Desktop Release') { + when { + branch env.DESKTOP_BRANCH + } + stages { + stage("Build") { + steps { + container('nodejs') { + sh 'npm install' + sh 'npm run build:prod' + dockerBuildAndPushToRegistry "${NAMESPACE_DESKTOP}/${APP_NAME_DESKTOP}", [IMAGE_BUILD_TAG_DESKTOP] + } + } + } + stage("Helm chart") { + steps { + container('helm') { + helmBuildAndPushToRegistry HELM_CHART_NAME_DESKTOP + } + } + } + stage("Approval: Deploy to staging ?") { + steps { + slackSend channel: SLACK_CHANNEL_DESKTOP, message: "$APP_NAME_DESKTOP: build #$BUILD_NUMBER ready to deploy to `STAGING`, approval required: $BUILD_URL (24h)" + + timeout(time: 24, unit: 'HOURS') { input 'Deploy to staging ?' } + } + post { failure { echo 'Deploy aborted for build #...' }} + } + stage("Deploy to staging") { + steps { + slackSend channel: SLACK_CHANNEL_DESKTOP, message: "$APP_NAME_DESKTOP: deploying build #$BUILD_NUMBER to `STAGING`" + deployHelmTo "staging", NAMESPACE_DESKTOP + } + } + stage("Approval: Deploy to production ?") { + steps { + slackSend channel: SLACK_CHANNEL_DESKTOP, message: "$APP_NAME_DESKTOP: build #$BUILD_NUMBER ready to deploy to `PRODUCTION`, approval required: $BUILD_URL (24h)" + + timeout(time: 7, unit: 'DAYS') { input 'Deploy to production ?' } + } + post { failure { echo 'Deploy aborted for build #...' }} + } + /* + stage('Tagging release') { + steps { + container('nodejs') { + // Updating the "latest tag" + dockerTagLatestAndPushToRegistry "${NAMESPACE_DESKTOP}/${APP_NAME_DESKTOP}", IMAGE_BUILD_TAG_DESKTOP + } + } + } + */ + stage("Deploy to production") { + steps { + slackSend channel: SLACK_CHANNEL_DESKTOP, message: "$APP_NAME_DESKTOP: deploying build #$BUILD_NUMBER to `PRODUCTION`" + + deployHelmTo "prod", NAMESPACE_DESKTOP + } + } + } } } } diff --git a/charts/nynja-app-desktop/.helmignore b/charts/nynja-app-desktop/.helmignore new file mode 100644 index 000000000..daebc7da7 --- /dev/null +++ b/charts/nynja-app-desktop/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml new file mode 100644 index 000000000..2ab9a6f44 --- /dev/null +++ b/charts/nynja-app-desktop/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +appVersion: "1.0" +description: Deployment of the nynja desktop application +name: nynja-app-desktop +version: 0.2.4 diff --git a/charts/nynja-app-desktop/templates/00-label.yaml b/charts/nynja-app-desktop/templates/00-label.yaml new file mode 100644 index 000000000..5df61418c --- /dev/null +++ b/charts/nynja-app-desktop/templates/00-label.yaml @@ -0,0 +1,32 @@ +# This hook depends on helm creating the target namespace if it doesn't exist +# before the hook is called. This is the case on Helm v2.9.1 +apiVersion: batch/v1 +kind: Job +metadata: + name: enable-istio-injection-{{ .Release.Namespace }} + namespace: kube-system + labels: + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{.Release.Service | quote }} + app.kubernetes.io/instance: {{.Release.Name | quote }} + helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}" + annotations: + helm.sh/hook: pre-install + helm.sh/hook-delete-policy: hook-before-creation,hook-succeeded +spec: + template: + spec: + containers: + - name: labeler + image: gcr.io/google_containers/hyperkube:v1.9.7 + command: + - kubectl + - label + - --overwrite + - ns + - {{ .Release.Namespace }} + - istio-injection=enabled + restartPolicy: Never + # use tiller service account since it should have permissions to do namespace labeling + serviceAccountName: tiller diff --git a/charts/nynja-app-desktop/templates/_helpers.tpl b/charts/nynja-app-desktop/templates/_helpers.tpl new file mode 100644 index 000000000..ef613ae6d --- /dev/null +++ b/charts/nynja-app-desktop/templates/_helpers.tpl @@ -0,0 +1,32 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "nynja-app-desktop.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "nynja-app-desktop.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "nynja-app-desktop.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/charts/nynja-app-desktop/templates/configmap.yaml b/charts/nynja-app-desktop/templates/configmap.yaml new file mode 100644 index 000000000..4eb7faa2a --- /dev/null +++ b/charts/nynja-app-desktop/templates/configmap.yaml @@ -0,0 +1,20 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: {{ template "nynja-app-desktop.fullname" . }}-well-known-files + labels: + app: {{ template "nynja-app-desktop.name" . }} + chart: {{ template "nynja-app-desktop.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: + apple-app-site-association: |- + { + "applinks": { + "apps": [], + "details": [{ + "appID": "{{ .Values.wellKnown.appleAppSiteAssociation.appId }}", + "paths": ["*"] + }] + } + } diff --git a/charts/nynja-app-desktop/templates/deployment.yaml b/charts/nynja-app-desktop/templates/deployment.yaml new file mode 100644 index 000000000..eb9058935 --- /dev/null +++ b/charts/nynja-app-desktop/templates/deployment.yaml @@ -0,0 +1,88 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: {{ template "nynja-app-desktop.fullname" . }} + labels: + app: {{ template "nynja-app-desktop.name" . }} + chart: {{ template "nynja-app-desktop.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app: {{ template "nynja-app-desktop.name" . }} + release: {{ .Release.Name }} + template: + metadata: + annotations: + sidecar.istio.io/inject: "true" + labels: + app: {{ template "nynja-app-desktop.name" . }} + release: {{ .Release.Name }} + spec: + containers: + - name: nginx-spa + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 80 + volumeMounts: + - mountPath: /usr/share/nginx/html/.well-known + name: well-known-files + readOnly: true + - mountPath: /etc/nginx/conf.d/default.conf + name: nginx-conf + readOnly: true + subPath: default.conf +{{- if .Values.auth.basic.enabled }} + - mountPath: /usr/share/nginx/html/.htpasswd + name: htpasswd + readOnly: true + subPath: .htpasswd +{{- end }} + readinessProbe: + httpGet: + path: /status + port: http + successThreshold: 1 + failureThreshold: 10 + initialDelaySeconds: 10 + periodSeconds: 3 + timeoutSeconds: 5 + livenessProbe: + httpGet: + path: /status + port: http + successThreshold: 1 + failureThreshold: 10 + initialDelaySeconds: 30 + periodSeconds: 3 + timeoutSeconds: 5 + resources: +{{ toYaml .Values.resources | indent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} + volumes: + - name: well-known-files + configMap: + name: {{ template "nynja-app-desktop.fullname" . }}-well-known-files + - name: nginx-conf + configMap: + name: {{ template "nynja-app-desktop.fullname" . }}-nginx-conf +{{- if .Values.auth.basic.enabled }} + - name: htpasswd + secret: + secretName: {{ template "nynja-app-desktop.fullname" . }}-htpasswd +{{- end }} diff --git a/charts/nynja-app-desktop/templates/mqtt-serviceentry.yaml b/charts/nynja-app-desktop/templates/mqtt-serviceentry.yaml new file mode 100644 index 000000000..a5211af6a --- /dev/null +++ b/charts/nynja-app-desktop/templates/mqtt-serviceentry.yaml @@ -0,0 +1,20 @@ +kind: ServiceEntry +apiVersion: networking.istio.io/v1alpha3 +metadata: + name: {{ template "nynja-app-desktop.fullname" . }} + labels: + app: {{ template "nynja-app-desktop.name" . }} + chart: {{ template "nynja-app-desktop.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + hosts: + - {{ .Values.mqtt.host }} + resolution: DNS + ports: + - number: 8083 + name: mqtt-ws + protocol: HTTP + - number: 8888 + name: http-api + protocol: HTTP diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml new file mode 100644 index 000000000..cb1926016 --- /dev/null +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -0,0 +1,119 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: {{ template "nynja-app-desktop.fullname" . }}-nginx-conf + labels: + app: {{ template "nynja-app-desktop.name" . }} + chart: {{ template "nynja-app-desktop.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: + default.conf: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + + if ( $host ~ ^join\.(?.+)$ ) { + set $join_link 1; + set $auth_type "off"; + } + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + if ($join_link = 1) { + return 302 https://web.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } diff --git a/charts/nynja-app-desktop/templates/sealedsecrets.yaml b/charts/nynja-app-desktop/templates/sealedsecrets.yaml new file mode 100644 index 000000000..4061da596 --- /dev/null +++ b/charts/nynja-app-desktop/templates/sealedsecrets.yaml @@ -0,0 +1,14 @@ +{{- if .Values.auth.basic.enabled -}} +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + name: {{ template "nynja-app-desktop.fullname" . }}-htpasswd + labels: + app: {{ template "nynja-app-desktop.name" . }} + chart: {{ template "nynja-app-desktop.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + encryptedData: + .htpasswd: {{ .Values.auth.basic.sealedSecret }} +{{- end }} diff --git a/charts/nynja-app-desktop/templates/service.yaml b/charts/nynja-app-desktop/templates/service.yaml new file mode 100644 index 000000000..d1af03416 --- /dev/null +++ b/charts/nynja-app-desktop/templates/service.yaml @@ -0,0 +1,18 @@ +kind: Service +apiVersion: v1 +metadata: + name: {{ template "nynja-app-desktop.fullname" . }} + labels: + app: {{ template "nynja-app-desktop.name" . }} + chart: {{ template "nynja-app-desktop.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + selector: + app: {{ template "nynja-app-desktop.name" . }} + release: {{ .Release.Name }} + ports: + - protocol: TCP + port: 9080 + targetPort: 80 + name: http diff --git a/charts/nynja-app-desktop/templates/virtualservice.yaml b/charts/nynja-app-desktop/templates/virtualservice.yaml new file mode 100644 index 000000000..b4a723ab1 --- /dev/null +++ b/charts/nynja-app-desktop/templates/virtualservice.yaml @@ -0,0 +1,63 @@ +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: {{ template "nynja-app-desktop.fullname" . }} + labels: + app: {{ template "nynja-app-desktop.name" . }} + chart: {{ template "nynja-app-desktop.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + gateways: + {{- range .Values.gateway.selector }} + - {{ . }} + {{- end }} + hosts: + {{- range .Values.gateway.hosts }} + - {{ . }} + {{- end }} + http: + - match: + - uri: + prefix: "/mqtt" + timeout: 60s + route: + - destination: + host: {{ .Values.mqtt.host }} + port: + number: 8083 + websocketUpgrade: true + - match: + - uri: + prefix: /api/v1/ + route: + - destination: + host: {{ .Values.mqtt.host }} + port: + number: 8888 + timeout: 10s + retries: + attempts: 3 + perTryTimeout: 5s + - match: + - uri: + prefix: /web/nynjacoin.nccs.chp.CallHistory + route: + - destination: + host: {{ .Values.confcall.historyService }} + port: + number: 41714 + - match: + - uri: + prefix: "/web/" + timeout: 36000s + route: + - destination: + host: {{ .Values.confcall.service }} + port: + number: 41514 + - route: + - destination: + host: {{ template "nynja-app-desktop.fullname" . }} + port: + number: 9080 diff --git a/charts/nynja-app-desktop/values.yaml b/charts/nynja-app-desktop/values.yaml new file mode 100644 index 000000000..6f3725380 --- /dev/null +++ b/charts/nynja-app-desktop/values.yaml @@ -0,0 +1,45 @@ + +replicaCount: 1 + +auth: + # Whether of not basic auth should be enabled to access the website + basic: + enabled: true + # the .htpasswd file content, sealed for the target environment (cluster + namespace) + sealedSecret: + +image: + repository: eu.gcr.io/nynja-ci-201610/nynja-desktop/nynja-app-desktop + tag: stable + pullPolicy: IfNotPresent + +gateway: + selector: + - api-gateway.default.svc.cluster.local + hosts: + - desktop.nynja.net + +wellKnown: + appleAppSiteAssociation: + appId: + +mqtt: + host: messaging-service.messaging.svc.cluster.local + +confcall: + service: calling-service.callconf.svc.cluster.local + historyService: calling-service-history.callconf.svc.cluster.local + +resources: + limits: + cpu: 100m + memory: 200Mi + requests: + cpu: 50m + memory: 100Mi + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml new file mode 100644 index 000000000..3c42cf5b5 --- /dev/null +++ b/releases/prod/nynja-app-desktop.yaml @@ -0,0 +1,34 @@ +apiVersion: flux.weave.works/v1beta1 +kind: HelmRelease +metadata: + name: nynja-app-desktop + namespace: nynja-app-desktop +spec: + releaseName: nynja-app-desktop + chart: + repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ + name: nynja-app-desktop + version: 0.2.4 + values: + replicaCount: 3 + auth: + basic: + enabled: false + sealedSecret: "" + image: + repository: ${IMAGE_NAME_DESKTOP} + tag: ${IMAGE_BUILD_TAG_DESKTOP} + gateway: + selector: + - api-gateway.default.svc.cluster.local + hosts: + - desktop.nynja.net + - join.nynja.net + wellKnown: + appleAppSiteAssociation: + appId: 9GKQ5AMF2B.com.nynja.mobile.communicator + mqtt: + host: messaging-service.messaging.svc.cluster.local + confcall: + service: calling-service.callconf.svc.cluster.local + historyService: calling-service-history.callconf.svc.cluster.local diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml new file mode 100644 index 000000000..eead82ec1 --- /dev/null +++ b/releases/staging/nynja-app-desktop.yaml @@ -0,0 +1,34 @@ +apiVersion: flux.weave.works/v1beta1 +kind: HelmRelease +metadata: + name: nynja-app-desktop + namespace: nynja-app-desktop +spec: + releaseName: nynja-app-desktop + chart: + repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ + name: nynja-app-desktop + version: 0.2.4 + values: + replicaCount: 3 + auth: + basic: + enabled: false + sealedSecret: "" + image: + repository: ${IMAGE_NAME_DESKTOP} + tag: ${IMAGE_BUILD_TAG_DESKTOP} + gateway: + selector: + - api-gateway.default.svc.cluster.local + hosts: + - desktop.staging.nynja.net + - join.staging.nynja.net + wellKnown: + appleAppSiteAssociation: + appId: 9GKQ5AMF2B.com.nynja.rc.mobile.communicator + mqtt: + host: messaging-service.messaging.svc.cluster.local + confcall: + service: calling-service.callconf.svc.cluster.local + historyService: calling-service-history.callconf.svc.cluster.local -- GitLab From e7b0fb8a65baaebaadb59b9720547618c6590473 Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 20 May 2020 17:54:37 +0800 Subject: [PATCH 02/26] fixed namespace in desktop web release files --- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 3c42cf5b5..6a8362d8d 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -2,7 +2,7 @@ apiVersion: flux.weave.works/v1beta1 kind: HelmRelease metadata: name: nynja-app-desktop - namespace: nynja-app-desktop + namespace: nynja-desktop spec: releaseName: nynja-app-desktop chart: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index eead82ec1..635298162 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -2,7 +2,7 @@ apiVersion: flux.weave.works/v1beta1 kind: HelmRelease metadata: name: nynja-app-desktop - namespace: nynja-app-desktop + namespace: nynja-desktop spec: releaseName: nynja-app-desktop chart: -- GitLab From 25f95e9b6ccd5dadbc28fd628cc9c6378e455b10 Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 20 May 2020 18:43:43 +0800 Subject: [PATCH 03/26] removed desktop release for prod --- releases/prod/nynja-app-desktop.yaml | 34 ---------------------------- 1 file changed, 34 deletions(-) delete mode 100644 releases/prod/nynja-app-desktop.yaml diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml deleted file mode 100644 index 6a8362d8d..000000000 --- a/releases/prod/nynja-app-desktop.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: flux.weave.works/v1beta1 -kind: HelmRelease -metadata: - name: nynja-app-desktop - namespace: nynja-desktop -spec: - releaseName: nynja-app-desktop - chart: - repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ - name: nynja-app-desktop - version: 0.2.4 - values: - replicaCount: 3 - auth: - basic: - enabled: false - sealedSecret: "" - image: - repository: ${IMAGE_NAME_DESKTOP} - tag: ${IMAGE_BUILD_TAG_DESKTOP} - gateway: - selector: - - api-gateway.default.svc.cluster.local - hosts: - - desktop.nynja.net - - join.nynja.net - wellKnown: - appleAppSiteAssociation: - appId: 9GKQ5AMF2B.com.nynja.mobile.communicator - mqtt: - host: messaging-service.messaging.svc.cluster.local - confcall: - service: calling-service.callconf.svc.cluster.local - historyService: calling-service-history.callconf.svc.cluster.local -- GitLab From 944efb4cdc15f26f5bcb04847deb286d558086ef Mon Sep 17 00:00:00 2001 From: jitender Date: Thu, 21 May 2020 12:54:12 +0800 Subject: [PATCH 04/26] added app version in nginx config --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 2ab9a6f44..4297728b9 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.4 +version: 0.2.5 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index cb1926016..ef3fca8c5 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -78,6 +78,12 @@ data: return 200; } + location /appversion { + auth_basic off; + default_type application/json; + return 200 '{"status":"success","version":"0.4.0","build":"1589451878"}'; + } + # Webpack debug proxy (temporary) #location /debug { # proxy_set_header X-Forwarded-For $remote_addr; -- GitLab From 312aabae4a11a2d3d9f790747aacb75f863dae4f Mon Sep 17 00:00:00 2001 From: jitender Date: Thu, 21 May 2020 16:49:28 +0800 Subject: [PATCH 05/26] updated staging release for desktop. --- releases/staging/nynja-app-desktop.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 635298162..824cb250e 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.4 + version: 0.2.5 values: replicaCount: 3 auth: -- GitLab From 0dcb6aec38bf7f317bef530ff9c65fbead745489 Mon Sep 17 00:00:00 2001 From: JelianRadoev Date: Tue, 26 May 2020 15:30:15 +0300 Subject: [PATCH 06/26] NY-10310 [WEB] Confirmation when sending contact request --- src/componets/Urlify/Urlify.js | 9 +++++++-- .../Panels/ContactDetailsPanel/ContactDetailsPanel.js | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/componets/Urlify/Urlify.js b/src/componets/Urlify/Urlify.js index d7b5d1734..7d4cc46e0 100644 --- a/src/componets/Urlify/Urlify.js +++ b/src/componets/Urlify/Urlify.js @@ -59,15 +59,20 @@ class Urlify extends Component { class Mention extends Tag { toReact() { + const alias = this.getContent(true); const attributes = { pathname: `/contacts/${this.params.accountId}`, + state: { + id: this.params.accountId, + alias, + } }; if (noLinkPersistent) { - return `@${this.getContent(true)}`; + return `@${alias}`; } - return @{this.getContent(true)}; + return @{alias}; } } diff --git a/src/containers/Panels/ContactDetailsPanel/ContactDetailsPanel.js b/src/containers/Panels/ContactDetailsPanel/ContactDetailsPanel.js index e944d2a9c..b4b5db336 100644 --- a/src/containers/Panels/ContactDetailsPanel/ContactDetailsPanel.js +++ b/src/containers/Panels/ContactDetailsPanel/ContactDetailsPanel.js @@ -342,6 +342,9 @@ class ContactDetailsPanel extends Component { } else if (contact.phone_id) { this.props.actions.requestContact({ ...contact, introductionText: textToSend, addMethod }); this.setState({ introductionText: '' }); + } else if (router.params.phone_id) { + this.props.actions.requestContact({ phone_id: router.params.phone_id, introductionText: textToSend, addMethod }); + this.setState({ introductionText: '' }); } } -- GitLab From 077e8514f1327943b26f3e8add69a1ccf3242b4a Mon Sep 17 00:00:00 2001 From: jitender Date: Tue, 26 May 2020 23:41:44 +0800 Subject: [PATCH 07/26] updated NGINX to filter join url redirection for desktop based on user agent --- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 6 +++++- charts/nynja-app-web/templates/nginx-configmap.yaml | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 00243952f..6e899f906 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -64,7 +64,11 @@ data: set $auth_type "off"; } if ($join_link = 1) { - return 302 https://desktop.$domain/join$request_uri; + if ( $http_user_agent ~ 'Electron' ) { + return 302 https://desktop.$domain/join$request_uri; + } + return 302 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; } # {{ if .Values.auth.basic.enabled }} diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index 32c71f0d0..b04912dd7 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -64,6 +64,9 @@ data: set $auth_type "off"; } if ($join_link = 1) { + if ( $http_user_agent ~ 'Electron' ) { + return 302 https://desktop.$domain/join$request_uri; + } return 302 https://web.$domain/join$request_uri; } -- GitLab From af2de9fc087e2f6e40bb89cfef3aed792e13beba Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 00:18:43 +0800 Subject: [PATCH 08/26] trigger --- charts/nynja-app-desktop/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nynja-app-desktop/values.yaml b/charts/nynja-app-desktop/values.yaml index 6f3725380..2d0e38edd 100644 --- a/charts/nynja-app-desktop/values.yaml +++ b/charts/nynja-app-desktop/values.yaml @@ -2,7 +2,7 @@ replicaCount: 1 auth: - # Whether of not basic auth should be enabled to access the website + ## Whether of not basic auth should be enabled to access the website basic: enabled: true # the .htpasswd file content, sealed for the target environment (cluster + namespace) -- GitLab From 5a57f85576b8223ca2956fb9d997f6afaa380992 Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 00:53:36 +0800 Subject: [PATCH 09/26] updated chart to 0.2.7 --- charts/nynja-app-desktop/Chart.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 343792e45..d30ac6875 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.6 +version: 0.2.7 diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index a70feb13d..a0103f625 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.6 + version: 0.2.7 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index c845934a3..7d874ab00 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.6 + version: 0.2.7 values: replicaCount: 3 auth: -- GitLab From ba2471899678b006cbe4aa1efb529e454d851dda Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 10:33:43 +0800 Subject: [PATCH 10/26] updating web chart to 0.2.4 --- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index bbbbe838d..d38eb5b39 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.1 + version: 0.2.4 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 344502541..4ed210178 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.1 + version: 0.2.4 values: replicaCount: 3 auth: -- GitLab From a14ab4440035b25164b4ba4b9f28e3f55d64f395 Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 13:28:43 +0800 Subject: [PATCH 11/26] updated charts to web-0.2.5 and desktop-0.2.8 --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/values.yaml | 1 + charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/values.yaml | 1 + releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index d30ac6875..bfe8811ae 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.7 +version: 0.2.8 diff --git a/charts/nynja-app-desktop/values.yaml b/charts/nynja-app-desktop/values.yaml index 2d0e38edd..2ada0569f 100644 --- a/charts/nynja-app-desktop/values.yaml +++ b/charts/nynja-app-desktop/values.yaml @@ -18,6 +18,7 @@ gateway: - api-gateway.default.svc.cluster.local hosts: - desktop.nynja.net + - join.nynja.net wellKnown: appleAppSiteAssociation: diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index e930b74ad..f2ded2685 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.4 +version: 0.2.5 diff --git a/charts/nynja-app-web/values.yaml b/charts/nynja-app-web/values.yaml index 6856b5936..957d07eb2 100644 --- a/charts/nynja-app-web/values.yaml +++ b/charts/nynja-app-web/values.yaml @@ -18,6 +18,7 @@ gateway: - api-gateway.default.svc.cluster.local hosts: - web.nynja.net + - join.nynja.net wellKnown: appleAppSiteAssociation: diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 58f020026..e01b97318 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.1 + version: 0.2.5 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index a0103f625..ed52017d2 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.7 + version: 0.2.8 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index d38eb5b39..28386eb03 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.4 + version: 0.2.5 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 7d874ab00..dacd9e639 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.7 + version: 0.2.8 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 4ed210178..a211b3f5a 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.4 + version: 0.2.5 values: replicaCount: 3 auth: -- GitLab From 1fa437c10b90d92dbd8f3e4a49c73ad7ebad1a8f Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 15:14:17 +0800 Subject: [PATCH 12/26] updated nginx config to support deskop in join url --- charts/nynja-app-desktop/Chart.yaml | 2 +- .../nynja-app-desktop/templates/nginx-configmap.yaml | 11 +++++++---- charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 12 ++++++++---- releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 22 insertions(+), 15 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index bfe8811ae..a69aa0d38 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.8 +version: 0.2.9 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 6e899f906..9c6957a4d 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -54,6 +54,8 @@ data: set $auth_type "Restricted"; # Handle join links (ex. join.nynja.net/123) set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; if ( $host ~ ^join\.(?.+)$ ) { set $join_link 1; @@ -63,11 +65,12 @@ data: set $join_link 0; set $auth_type "off"; } + if ( $http_user_agent ~ 'Electron' ) { + set $client_type "desktop"; + } if ($join_link = 1) { - if ( $http_user_agent ~ 'Electron' ) { - return 302 https://desktop.$domain/join$request_uri; - } - return 302 https://web.$domain/join$request_uri; + return 302 https://$client_type.$domain/join$request_uri; + #return 302 https://web.$domain/join$request_uri; #return 302 https://desktop.$domain/join$request_uri; } diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index f2ded2685..0a4a75b4a 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.5 +version: 0.2.6 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index b04912dd7..50435cd76 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -54,6 +54,8 @@ data: set $auth_type "Restricted"; # Handle join links (ex. join.nynja.net/123) set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; if ( $host ~ ^join\.(?.+)$ ) { set $join_link 1; @@ -63,11 +65,13 @@ data: set $join_link 0; set $auth_type "off"; } + if ( $http_user_agent ~ 'Electron' ) { + set $client_type "desktop"; + } if ($join_link = 1) { - if ( $http_user_agent ~ 'Electron' ) { - return 302 https://desktop.$domain/join$request_uri; - } - return 302 https://web.$domain/join$request_uri; + return 302 https://$client_type.$domain/join$request_uri; + #return 302 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; } # {{ if .Values.auth.basic.enabled }} diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index e01b97318..5b985805b 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.5 + version: 0.2.6 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index ed52017d2..d7481da88 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.8 + version: 0.2.9 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 28386eb03..5c96c879e 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.5 + version: 0.2.6 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index dacd9e639..dec95e8b8 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.8 + version: 0.2.9 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index a211b3f5a..b0233ca55 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.5 + version: 0.2.6 values: replicaCount: 3 auth: -- GitLab From 3c876ac95d4506984ceebe2526d387fa48da9a77 Mon Sep 17 00:00:00 2001 From: Yordan Neshkolov Date: Wed, 27 May 2020 12:41:51 +0300 Subject: [PATCH 13/26] Removed the Event signup menu --- src/containers/ActionMenu/ActionMenu.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/containers/ActionMenu/ActionMenu.js b/src/containers/ActionMenu/ActionMenu.js index eb514591f..1491ef04e 100644 --- a/src/containers/ActionMenu/ActionMenu.js +++ b/src/containers/ActionMenu/ActionMenu.js @@ -197,11 +197,11 @@ class LeftMenu extends Component { - - - - - + {/**/} + {/* */} + {/* */} + {/* */} + {/**/} -- GitLab From a28db742748c845bd4c5aed6f0b8ab4b6a4e5a69 Mon Sep 17 00:00:00 2001 From: Yordan Neshkolov Date: Wed, 27 May 2020 13:23:20 +0300 Subject: [PATCH 14/26] NY-10500 [WEB]: White screen on join by link anonymous --- .../resource/conversations/modules/Conversations.module.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/resource/conversations/modules/Conversations.module.js b/src/core/resource/conversations/modules/Conversations.module.js index 9807c970b..6ebabfdc5 100644 --- a/src/core/resource/conversations/modules/Conversations.module.js +++ b/src/core/resource/conversations/modules/Conversations.module.js @@ -350,6 +350,11 @@ const makeScheduledMeetingsSelector = () => createSelector( * @returns {Boolean} */ const getUnreadStatusForCall = (state) => { + const init = profileSelectors.isInit(state); + if (!init) { + return false; + } + const callInfo = audioVideoSelectors.getCallData(state); if (callInfo && callInfo.conferenceId) { const { chatRoomId, p2p, from } = callInfo; -- GitLab From 6f90ebcef493f59631e9d5fffce16f1b4b31da0c Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 18:51:10 +0800 Subject: [PATCH 15/26] handled join url with http_referer in nginx --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 2 +- releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index a69aa0d38..35e08ae81 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.9 +version: 0.2.10 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 9c6957a4d..56fe24ade 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -65,7 +65,7 @@ data: set $join_link 0; set $auth_type "off"; } - if ( $http_user_agent ~ 'Electron' ) { + if ( $http_referer ~* desktop\.(?.+)$ ) { set $client_type "desktop"; } if ($join_link = 1) { diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 0a4a75b4a..a3de6ea60 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.6 +version: 0.2.7 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index 50435cd76..ca5d14eea 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -65,7 +65,7 @@ data: set $join_link 0; set $auth_type "off"; } - if ( $http_user_agent ~ 'Electron' ) { + if ( $http_referer ~* desktop\.(?.+)$ ) { set $client_type "desktop"; } if ($join_link = 1) { diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 5b985805b..e41e04f5d 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.6 + version: 0.2.7 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index d7481da88..f49f1d0d5 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.9 + version: 0.2.10 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 5c96c879e..d3cae4da7 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.6 + version: 0.2.7 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index dec95e8b8..3086e4c3b 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.9 + version: 0.2.10 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index b0233ca55..b313316dd 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.6 + version: 0.2.7 values: replicaCount: 3 auth: -- GitLab From 9e2e1a17eac29707a52b666e5b05608f488c8a42 Mon Sep 17 00:00:00 2001 From: Yordan Neshkolov Date: Wed, 27 May 2020 18:16:50 +0300 Subject: [PATCH 16/26] NY-10506 [WEB]: Remove dialog for not supported browsers on Safari for iOs --- src/pages/JoinByLink/JoinByLink.js | 4 ++-- src/pages/NinjaApp/NinjaApp.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/JoinByLink/JoinByLink.js b/src/pages/JoinByLink/JoinByLink.js index f51df24aa..25ce7a82a 100644 --- a/src/pages/JoinByLink/JoinByLink.js +++ b/src/pages/JoinByLink/JoinByLink.js @@ -5,7 +5,7 @@ import stylesFunc from './JoinByLink.styles'; import { connect } from 'react-redux'; import { profileSelectors } from 'Resource/profile'; import { bindActionCreators } from 'redux'; -import { BrowserView, isMobileOnly, isAndroid, isIOS, isMobile } from 'react-device-detect'; +import { BrowserView, isMobileOnly, isAndroid, isIOS, isMobile, isMobileSafari } from 'react-device-detect'; import { JoinByLinkForm } from '../../containers'; import { LinkError, AudioVideo, AudioVideoAnonymousHeader, LoadingSpinner, NynjaHelmet } from '../../componets'; import { @@ -70,7 +70,7 @@ class JoinByLink extends Component { const agent = navigator.userAgent; if (!(isSafari || isChrome || isFirefox || isOpera || (isEdge && agent.indexOf("Edg/") > -1))){ this.openModal('isBrowserModalOpen'); - } else if (isSafari && browserVersion === '13.1') { + } else if (isSafari && browserVersion === '13.1' && !isMobileSafari) { this.setState({ showSafariWarning: true }); } diff --git a/src/pages/NinjaApp/NinjaApp.js b/src/pages/NinjaApp/NinjaApp.js index de923a907..af6d8d83a 100644 --- a/src/pages/NinjaApp/NinjaApp.js +++ b/src/pages/NinjaApp/NinjaApp.js @@ -11,7 +11,7 @@ import { bindActionCreators } from 'redux'; import { AudioVideo } from '../../componets'; import { requestNotificationPermission } from '../../core/managers/browserNotificationsManager'; import { withTranslation } from 'react-i18next'; -import { isSafari, browserVersion } from "react-device-detect"; +import { isSafari, browserVersion, isMobileSafari } from "react-device-detect"; import ConfirmDialog from "Components/Modals/ConfirmDialog/ConfirmDialog"; const styles = theme => (stylesFunc(theme, darkBgImg)); @@ -36,7 +36,7 @@ export class Dashboard extends Component { } checkSafari() { - if (isSafari && browserVersion === '13.1') { + if (isSafari && browserVersion === '13.1' && !isMobileSafari) { this.setState({ showSafariWarning: true }); } } -- GitLab From 89084d799c2afd290f0b5b70d20401711c383e76 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Thu, 28 May 2020 16:25:13 +0800 Subject: [PATCH 17/26] api url changed --- lib/desktop_updater.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index cc361d719..36f8e2fd4 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -501,7 +501,8 @@ if (process.env.currentVersion) { getAppVesrion(); },10*60*1000) function getAppVesrion(type='update-check'){ - fetch('https://desktop.staging.nynja.net/appversion', { + // fetch('https://desktop.staging.nynja.net/appversion', { + fetch('https://'+window.location.host+'/appversion', { cache: 'no-store', method: 'GET', headers: { -- GitLab From 63dcd115495e3c2065e6fb2f467f0e71c91d2085 Mon Sep 17 00:00:00 2001 From: akashtl Date: Thu, 28 May 2020 16:27:57 +0800 Subject: [PATCH 18/26] build number issue fixed --- lib/desktop_updater.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 36f8e2fd4..d0e965911 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -66,7 +66,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { 'Unable to update, please try again later.')); //document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ ' (Build: ' + msgJSON.currentBuild+')'; + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ (msgJSON.currentBuild===0?'':' (Build: ' + msgJSON.currentBuild+')'); document.getElementById('update_version_electron').innerHTML = (msgJSON.electron === undefined ? process.versions.electron : msgJSON.electron); document.getElementById('update_version_chromium').innerHTML = (msgJSON.chromium === undefined ? process.versions.chrome : msgJSON.chromium); @@ -97,7 +97,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Unable to update, please try again later.')); - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ ' (Build: ' + msgJSON.currentBuild+')'; + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+(msgJSON.currentBuild===0?'': ' (Build: ' + msgJSON.currentBuild+')'); //document.getElementById('update_version_electron').innerHTML = msgJSON.electron; //document.getElementById('update_version_chromium').innerHTML = msgJSON.chromium; //document.getElementById('update_version_nodejs').innerHTML = msgJSON.nodejs; -- GitLab From e7a34e63388dae47bee811fdbf3f25b9eecc03ed Mon Sep 17 00:00:00 2001 From: System Administrator Date: Wed, 27 May 2020 22:02:17 +0800 Subject: [PATCH 19/26] added build number in release notes popup --- lib/desktop_updater.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index d0e965911..68a04b510 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -173,12 +173,12 @@ function showReleaseNotes(type, msgJSON) { // //msgJSON.version // return; // } - + Object.keys(releaseNotes[releaseNote]).map(function(buildNumber, bn){ console.log('[DTU]', 'releaseNotesVersions > releaseNote : ',releaseNote) var SPAN_NODE = document.createElement("SPAN"); SPAN_NODE.style = "font-size: 16px;font-weight: bold;"; - SPAN_NODE.innerText = "Version: " + releaseNote; + SPAN_NODE.innerText = "Version: " + releaseNote+ (buildNumber==="content"?"":" (Build: "+buildNumber+")"); document.getElementById('releases_info').appendChild(SPAN_NODE); @@ -186,7 +186,7 @@ function showReleaseNotes(type, msgJSON) { UL_NODE.style = "margin: 5px 0 5px 15px;list-style: none;list-style-type: disc;list-style-position: outside;"; console.log('[DTU]', 'releaseNotesVersions > releaseNotes[releaseNote] : ',releaseNotes[releaseNote]) - releaseNotes[releaseNote].content.map(function (note, j) { + releaseNotes[releaseNote][buildNumber].map(function (note, j) { var LI_NODE = document.createElement("LI"); LI_NODE.innerText = note; @@ -202,6 +202,23 @@ function showReleaseNotes(type, msgJSON) { } } }); + }); +/*releaseNotes[releaseNote].content.map(function (note, j) { + + var LI_NODE = document.createElement("LI"); + LI_NODE.innerText = note; + LI_NODE.style = "margin-left: 20px;"; + UL_NODE.appendChild(LI_NODE); + // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, LI_NODE, UL_NODE) + if ((j + 1) === releaseNotes[releaseNote].content.length) { + + // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, UL_NODE) + document.getElementById('releases_info').appendChild(UL_NODE) + console.log('[DTU]', (j + 1) , document.getElementById('releases_info').innerHTML) + if ((i + 1) === Object.keys(releaseNotes).length) { + } + } + });*/ }) } function updateVersionNotesClick() { -- GitLab From 12041b909a1b1930bfaac0cdb5dba25692b2eb8f Mon Sep 17 00:00:00 2001 From: System Administrator Date: Wed, 27 May 2020 22:10:39 +0800 Subject: [PATCH 20/26] build Number added in release notes json file --- lib/releaseNotes/releaseNotesDesktop.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/releaseNotes/releaseNotesDesktop.json b/lib/releaseNotes/releaseNotesDesktop.json index b924862f0..f90059a8f 100644 --- a/lib/releaseNotes/releaseNotesDesktop.json +++ b/lib/releaseNotes/releaseNotesDesktop.json @@ -1,11 +1,11 @@ { "0.4.1": { - "content": [ + "1589451878": [ "Stability improvements" ] }, "0.4.0": { - "content": [ + "1589451878": [ "Electron Framework updated to latest version 8.0.1", "Fixed select all keyboard shortcut (command + A) issue in Mac OS", "Handled mic and camera permission issue on Mac OS", @@ -19,7 +19,7 @@ ] }, "0.3.8": { - "content": [ + "1589451878": [ "Updated login page design.", "Added download guideline in app update process.", "Added release notes in update popup.", @@ -62,4 +62,4 @@ "Added \"Invite by email\" (through add contact)." ] } -} \ No newline at end of file +} -- GitLab From d0a6ba5e8930c027bcd940abbbf15d667758e777 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Wed, 27 May 2020 22:28:49 +0800 Subject: [PATCH 21/26] added check for v0.4.0 fetch appversion --- lib/desktop_updater.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 68a04b510..eadd2bc76 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -28,8 +28,14 @@ ipcRendererUpdateWeb.on('update', function (event, message) { startDownloading() } } else if(msgJSON.key==='update-check-menu') { - getAppVesrion('update-check-menu'); + + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ + getAppVesrion('update-check-menu'); // ipcRendererOnUpdateEvent(msgJSON); + } else{ + ipcRendererOnUpdateEvent(msgJSON); + } } else { ipcRendererOnUpdateEvent(msgJSON); @@ -512,11 +518,14 @@ if (process.env.currentVersion) { * Call api to get version(major), build(minor) * and latest notes for release */ + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ getAppVesrion(); setInterval(function(){ console.log('[DTU] CHECK APP VERSION AFTER 10 MINS') getAppVesrion(); - },10*60*1000) + },10*60*1000); + } function getAppVesrion(type='update-check'){ // fetch('https://desktop.staging.nynja.net/appversion', { fetch('https://'+window.location.host+'/appversion', { -- GitLab From a617b13472bc9e9f89d288a13fbaf78f93255c56 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Thu, 28 May 2020 09:46:58 +0800 Subject: [PATCH 22/26] issue fixed for build number --- lib/desktop_updater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index eadd2bc76..b815b7af2 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -199,7 +199,7 @@ function showReleaseNotes(type, msgJSON) { LI_NODE.style = "margin-left: 20px;"; UL_NODE.appendChild(LI_NODE); // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, LI_NODE, UL_NODE) - if ((j + 1) === releaseNotes[releaseNote].content.length) { + if ((j + 1) === releaseNotes[releaseNote][buildNumber].length) { // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, UL_NODE) document.getElementById('releases_info').appendChild(UL_NODE) -- GitLab From 2f0d432a6266e154023a92b857837de17a06d0dc Mon Sep 17 00:00:00 2001 From: akashtl Date: Thu, 28 May 2020 18:42:29 +0800 Subject: [PATCH 23/26] v0.3.8 support for update --- lib/desktop_updater.js | 78 ++++++++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 22 deletions(-) mode change 100644 => 100755 lib/desktop_updater.js diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js old mode 100644 new mode 100755 index b815b7af2..4b231460e --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -57,6 +57,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { * currentBuild: 1590208348, * status: 200 */ + var app_ver_split = process.env.currentVersion.split('.'); switch (msgJSON.key) { case 'update-check-menu': //Update UI button or text @@ -65,14 +66,24 @@ function ipcRendererOnUpdateEvent(msgJSON) { document.getElementById('update-info').innerHTML = (msgJSON.upgrade ? 'Update Available' : (msgJSON.version !== '' ? '' : '')); // document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? 'A new release is available (' + msgJSON.version + ').' : (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Encountered an error while updating, try again later.')); + //document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; + + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +' (Build: ' + msgJSON.build + ')' : - 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): + 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : - 'Unable to update, please try again later.')); + 'Unable to update, please try again later.')); + + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ (msgJSON.currentBuild===0?'':' (Build: ' + msgJSON.currentBuild+')'); + + }else{ + + document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? 'A new release is available (' + msgJSON.version + ').' : (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Encountered an error while updating, try again later.')); + + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; + } - //document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ (msgJSON.currentBuild===0?'':' (Build: ' + msgJSON.currentBuild+')'); document.getElementById('update_version_electron').innerHTML = (msgJSON.electron === undefined ? process.versions.electron : msgJSON.electron); document.getElementById('update_version_chromium').innerHTML = (msgJSON.chromium === undefined ? process.versions.chrome : msgJSON.chromium); @@ -97,13 +108,22 @@ function ipcRendererOnUpdateEvent(msgJSON) { document.getElementById('update-info').innerHTML = (msgJSON.upgrade ? 'Update Available' : (msgJSON.version !== '' ? '' : '')); - document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? - (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +' (Build: ' + msgJSON.build + ')' : - 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): - (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : - 'Unable to update, please try again later.')); + + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ + document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? + (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +' (Build: ' + msgJSON.build + ')' : + 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): + (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : + 'Unable to update, please try again later.')); - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+(msgJSON.currentBuild===0?'': ' (Build: ' + msgJSON.currentBuild+')'); + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+(msgJSON.currentBuild===0?'': ' (Build: ' + msgJSON.currentBuild+')'); + }else{ + + document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? 'A new release is available (' + msgJSON.version + ').' : (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Encountered an error while updating, try again later.')); + + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; + + } //document.getElementById('update_version_electron').innerHTML = msgJSON.electron; //document.getElementById('update_version_chromium').innerHTML = msgJSON.chromium; //document.getElementById('update_version_nodejs').innerHTML = msgJSON.nodejs; @@ -242,19 +262,27 @@ function updateInfoClick(msgJSON) { // // // document.getElementById('update-install').removeEventListener('click'); // document.getElementById('update_download_install').style = ''; // document.getElementById('update_download_install').addEventListener("click", updateConfClick) - if(msgJSON.upgradeType==="version"){ - // alert(1) - document.getElementById('update_download_install').innerHTML = 'Update'; - document.getElementById('update_download_install').style = ''; - document.getElementById('update_download_install').addEventListener("click", updateConfClick) - document.getElementById('releases_info_p').innerHTML = 'After finishing the download, NYNJA application will be restarted to apply new updates.'; + + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ + if(msgJSON.upgradeType==="version"){ + // alert(1) + document.getElementById('update_download_install').innerHTML = 'Update'; + document.getElementById('update_download_install').style = ''; + document.getElementById('update_download_install').addEventListener("click", updateConfClick) + document.getElementById('releases_info_p').innerHTML = 'After finishing the download, NYNJA application will be restarted to apply new updates.'; + }else{ + // alert(2) + + document.getElementById('update_download_install').innerHTML = 'Refresh Only'; + document.getElementById('update_refresh_only').style = ''; + document.getElementById('update_refresh_only').addEventListener("click", startDownloading) + document.getElementById('releases_info_p').innerHTML = 'By clicking on Confirm button, Nynja application will refresh to apply new updates.'; + } }else{ - // alert(2) - - document.getElementById('update_download_install').innerHTML = 'Refresh Only'; - document.getElementById('update_refresh_only').style = ''; - document.getElementById('update_refresh_only').addEventListener("click", startDownloading) - document.getElementById('releases_info_p').innerHTML = 'By clicking on Confirm button, Nynja application will refresh to apply new updates.'; + + document.getElementById('update_download_install').style = ''; + document.getElementById('update_download_install').addEventListener("click", updateConfClick) } } } @@ -281,6 +309,8 @@ function updateConfClick(msgJSON) {//alert(1); */ function startDownloading() { console.log('start-download') + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ //Update confirm and notify main process if(isVersionUpdate){ // alert('start1') @@ -293,7 +323,11 @@ function startDownloading() { appversionObj.action = 'update-build'; ipcRendererUpdateWeb.send('update-main', appversionObj); } + }else{ + document.getElementById('update-notify-box').style = ''; + ipcRendererUpdateWeb.send('update-main', 'update-start'); + } //ipcRendererUpdateWeb.send('update-main', 'update-start'); document.getElementById('update-info').style = 'display: none;'; document.getElementById('update-desc-box').style = 'display: none;'; -- GitLab From 2ad5238cd6ac1651f08823bebb5bdbd4ac35bc8f Mon Sep 17 00:00:00 2001 From: Yordan Neshkolov Date: Thu, 28 May 2020 15:00:07 +0300 Subject: [PATCH 24/26] Version update 0.34.0 + release notes --- lib/releaseNotes/releaseNotes.json | 16 +++++++++++++++- src/core/configs/Constants.config.js | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/releaseNotes/releaseNotes.json b/lib/releaseNotes/releaseNotes.json index 3ef39ea48..b586b03ed 100644 --- a/lib/releaseNotes/releaseNotes.json +++ b/lib/releaseNotes/releaseNotes.json @@ -1,4 +1,18 @@ { + "0.34.0": { + "content": [ + "Added a badge notification for new message on the \"return to chat\" button", + "Show active speakers when a media is on full screen", + "Show Current Selected (active) Chat in show unread chats mode", + "Add a notification for new messages on the title of the tab", + "Updated time zones list for calendar in new meeting", + "New message indicator when chat scrolled up", + "Make the active screen share icon on the title clickable to go to screen share page", + "When editing the group participants/admins the action buttons should be always shown", + "Left menu: expanding Settings should scroll down", + "New meeting - add 2 submenus, start meeting now and schedule meeting" + ] + }, "0.33.0": { "content": [ "New feature and shortcut for Scheduled meetings", @@ -17,7 +31,7 @@ "Calling: Member name view - larger font and fixed size for all members", "Conference Call: Made the icons after the member name buttons", "Members sorting: Camera and voice are in one group now", - "New meeting title should be editable when an existing group is selected" + "New meeting title is editable when an existing group is selected" ] }, "0.32.1": { diff --git a/src/core/configs/Constants.config.js b/src/core/configs/Constants.config.js index 02b354b7b..82bf5feab 100644 --- a/src/core/configs/Constants.config.js +++ b/src/core/configs/Constants.config.js @@ -1,5 +1,5 @@ const constants = { - version: '0.33.0', + version: '0.34.0', buildNumber: `${__APP_VERSION__}`, historyPageSize: 30, storagePageSize: 50, -- GitLab From b167630bd844a3f3472099b03d85c2f4833f1065 Mon Sep 17 00:00:00 2001 From: akashtl Date: Thu, 28 May 2020 20:51:07 +0800 Subject: [PATCH 25/26] fixed release notes v0.3.8 --- lib/desktop_updater.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 4b231460e..31657976c 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -183,11 +183,19 @@ function showReleaseNotes(type, msgJSON) { var releaseNotesVersions = Object.keys(releaseNotes); console.log('[DTU]', 'releaseNotesVersions : ',releaseNotesVersions) if(msgJSON.upgrade){ - releaseNotesVersions = [msgJSON.version]; - console.log('[DTU]', 'msgJSON.upgrade:',msgJSON.upgrade,releaseNotesVersions) - console.log('[DTU]', 'msgJSON.upgrade:',releaseNotes[msgJSON.version],msgJSON.notes) - releaseNotes[msgJSON.version] = {}; - releaseNotes[msgJSON.version]["content"] = msgJSON.notes; + + var app_ver_split = process.env.currentVersion.split('.'); + + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ + releaseNotesVersions = [msgJSON.version]; + console.log('[DTU]', 'msgJSON.upgrade:',msgJSON.upgrade,releaseNotesVersions) + console.log('[DTU]', 'msgJSON.upgrade:',releaseNotes[msgJSON.version],msgJSON.notes) + releaseNotes[msgJSON.version] = {}; + releaseNotes[msgJSON.version]["content"] = msgJSON.notes; + }else{ + releaseNotesVersions = [msgJSON.version]; + + } }else{ releaseNotesVersions = releaseNotesVersions.slice(releaseNotesVersions.indexOf(msgJSON.currentVersion)); console.log('[DTU]', 'msgJSON.upgrade:',msgJSON.upgrade, releaseNotesVersions) -- GitLab From 9f97d6f20ad7bc4d9563a8f34b364e5f8250c3dc Mon Sep 17 00:00:00 2001 From: Yordan Neshkolov Date: Fri, 29 May 2020 12:52:18 +0300 Subject: [PATCH 26/26] NY-10531 WEB Auto translate group chat issue --- .../resource/messages/groups/sagas/GroupsMessages.saga.js | 4 ++-- .../resource/messages/personal/sagas/PersonalMessages.saga.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/resource/messages/groups/sagas/GroupsMessages.saga.js b/src/core/resource/messages/groups/sagas/GroupsMessages.saga.js index 3e89894dc..f1e9479f4 100644 --- a/src/core/resource/messages/groups/sagas/GroupsMessages.saga.js +++ b/src/core/resource/messages/groups/sagas/GroupsMessages.saga.js @@ -680,11 +680,11 @@ function* cursorWatcher() { yield call(cursor, { phoneId: phoneId, groupId: groupId, lastReadMessageId: activeGroupLastMsg, state: globalState }); const { autoTranslateIncoming, autoTranscribe } = yield select(roomListSelectors.getMemberSettings, groupId, phoneId); - if (autoTranslateIncoming && toTranslate.length > 0) { + if (autoTranslateIncoming && toTranslate && toTranslate.length > 0) { yield all(toTranslate.map(m => put(translateActions.translate(m)))); } - if (autoTranscribe && toTranscribe.length > 0) { + if (autoTranscribe && toTranscribe && toTranscribe.length > 0) { yield all(toTranscribe.map(m => put(transcribeActions.transcribe({ msg: m })))); } } diff --git a/src/core/resource/messages/personal/sagas/PersonalMessages.saga.js b/src/core/resource/messages/personal/sagas/PersonalMessages.saga.js index a770dbc29..d2cac76e8 100644 --- a/src/core/resource/messages/personal/sagas/PersonalMessages.saga.js +++ b/src/core/resource/messages/personal/sagas/PersonalMessages.saga.js @@ -566,11 +566,11 @@ function* cursorWatcher() { if (dialog.unread_amount > 0 || dialog.p2p_unread_amount > 0) { yield call(cursor, activeDialogId); - if (request.payload.toTranslate.length > 0) { + if (request.payload.toTranslate && request.payload.toTranslate.length > 0) { yield all(request.payload.toTranslate.map(m => put(translateActions.translate(m)))); } - if (request.payload.toTranscribe.length > 0) { + if (request.payload.toTranscribe && request.payload.toTranscribe.length > 0) { yield all(request.payload.toTranscribe.map(m => put(transcribeActions.transcribe({ msg: m })))); } } -- GitLab