Merge pull request #23 from helxplatform/develop

dev to master for publishing 1.1.0

Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 1.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

templates/configmap.yaml

@@ -5,9 +5,11 @@ metadata:
   labels:
     {{- include "ui.labels" . | nindent 4 }}
 data:
+  analytics_enabled: {{ .Values.config.analytics.enabled | quote }}
+  analytics_platform: {{ .Values.config.analytics.platform | quote }}
+  analytics_token: {{ .Values.config.analytics.token | quote }}
   meta_title: {{ .Values.config.meta.title | quote }}
   meta_description: {{ .Values.config.meta.description | quote }}
-  analytics: {{ .Values.config.analytics.token | quote }}
   appstore_asset_branch: {{ .Values.config.appstore_asset_branch }}
   brand_name: {{ .Values.config.brand_name }}
   hidden_support_sections: {{ .Values.config.hidden_support_sections | quote }}

templates/deployment.yaml

@@ -52,10 +52,20 @@ spec:
           env: 
             - name: NODE_ENV
               value: production
-            - name: REACT_APP_ANLAYTICS
+            - name: REACT_APP_ANALYTICS_ENABLED
               valueFrom:
                 configMapKeyRef:
-                  key: analytics
+                  key: analytics_enabled
+                  name: {{ include "ui.fullname" . }}-config
+            - name: REACT_APP_ANALYTICS_PLATFORM
+              valueFrom:
+                configMapKeyRef:
+                  key: analytics_platform
+                  name: {{ include "ui.fullname" . }}-config
+            - name: REACT_APP_ANALYTICS_TOKEN
+              valueFrom:
+                configMapKeyRef:
+                  key: analytics_token
                   name: {{ include "ui.fullname" . }}-config
             - name: REACT_APP_HELX_SEARCH_URL
               valueFrom:

values.yaml

@@ -63,7 +63,9 @@ config:
     title: HeLx UI
     description: HeLx UI
   analytics:
-    token: "0c39f8410fd548bfa1976957d0248289"
+    enabled: false
+    platform: google
+    token: ""
   appstore_asset_branch: "master"
   brand_name: ""
   # If you need to hide the any section on support page, add it in a comma-separated string. (i.e "community, documentation")