Merge pull request #42 from helxplatform/develop

Updates for release 1.6.0

Chart.yaml

@@ -15,10 +15,10 @@ 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.5.0
+version: 1.6.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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "6.3.0"
+appVersion: "6.4.2"

README.md

@@ -2,7 +2,7 @@
 
 A Helm chart for Kubernetes
 
-![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.0](https://img.shields.io/badge/AppVersion-6.1.0-informational?style=flat-square)
+![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.3.0](https://img.shields.io/badge/AppVersion-6.3.0-informational?style=flat-square)
 
 ## About HELX-UI
 
@@ -29,6 +29,7 @@ Additionally there is a workflow that allows bumping the chart version, if this
 | config.analytics.enabled | bool | `false` |  |
 | config.analytics.platform | string | `"google"` |  |
 | config.analytics.token | string | `""` |  |
+| config.appstore_asset_base_url | string | `"https:\\/\\/raw.githubusercontent.com\\/helxplatform\\/appstore"` |  |
 | config.appstore_asset_branch | string | `"master"` |  |
 | config.brand_description | object | `{"html":""}` | Multiline value (4 space indent) with html code describing the deployment, will be displayed on the Workspaces login page |
 | config.brand_name | string | `""` |  |
@@ -38,10 +39,13 @@ Additionally there is a workflow that allows bumping the chart version, if this
 | config.meta.description | string | `"HeLx UI"` | Page description with a link preview. |
 | config.meta.title | string | `"HeLx UI"` | Browser tab title and title on "Workspaces" login page |
 | config.search.enabled | string | `"true"` | If search page should show up. This is configured to work with DUG |
+| config.search.tour_enabled | string | `"false"` | - If guided tour for search should show up |
 | config.search.url | string | `"https:\\/\\/helx.renci.org"` |  |
-| config.support | object | `{"faqs_url":"","help_portal_url":"","user_guide_url":""}` | Support page sections to display. If a link is provided, the corresponding section will be displayed |
+| config.support | object | `{"faqs_url":"","help_portal_url":"","howto_video_url":"","intro_video_url":"","user_guide_url":""}` | Support page sections to display. If a link is provided, the corresponding section will be displayed |
 | config.support.faqs_url | string | `""` | Link for a page with FAQs. |
 | config.support.help_portal_url | string | `""` | Link to portal for submitting tickets/requesting features/reporting bugs |
+| config.support.howto_video_url | string | `""` | Link to a video on how to use the deployment |
+| config.support.intro_video_url | string | `""` | Link to an introduction video for the deployment. |
 | config.support.user_guide_url | string | `""` | Link to a page with user instructions on how to use the deployment |
 | config.tranql_url | string | `"https:\\/\\/helx.renci.org\\/tranql\\/"` |  |
 | config.workspaces.enabled | string | `"true"` | Allow Workspaces. |

templates/configmap.yaml

@@ -16,11 +16,18 @@ data:
   hidden_result_tabs: {{ .Values.config.hidden_result_tabs | quote }}
   search_enabled: {{ .Values.config.search.enabled | quote }}
   search_url: '{{ .Values.config.search.url }}'
+  {{- if eq .Values.config.search.enabled "false" }}
+  search_tour_enabled: "false"
+  {{- else }}
+  search_tour_enabled: {{ .Values.config.search.tour_enabled | quote }}
+  {{- end }}
   tranql_url: {{ .Values.config.tranql_url | quote }}
   login_title: {{ .Values.config.login_title | quote }}
   support_help_portal_url: {{ .Values.config.support.help_portal_url | quote }}
   support_user_guide_url: {{ .Values.config.support.user_guide_url | quote }}
   support_faqs_url: {{ .Values.config.support.faqs_url | quote }}
+  support_intro_video_url: {{ .Values.config.support.intro_video_url | quote }}
+  support_howto_video_url: {{ .Values.config.support.howto_video_url | quote }}
   workspaces_enabled: {{ .Values.config.workspaces.enabled | quote }}
   brand_desc.html: {{ .Values.config.brand_description.html | nindent 4 }}
   {{- if and (eq .Values.config.workspaces.enabled "true") (eq .Values.config.search.enabled "false") }}

templates/deployment.yaml

@@ -146,6 +146,21 @@ spec:
                 configMapKeyRef:
                   key: support_faqs_url
                   name: {{ include "ui.fullname" . }}-config
+            - name: REACT_APP_SUPPORT_INTRO_VIDEO_URL
+              valueFrom:
+                configMapKeyRef:
+                  key: support_intro_video_url
+                  name: {{ include "ui.fullname" . }}-config
+            - name: REACT_APP_SUPPORT_HOWTO_VIDEO_URL
+              valueFrom:
+                configMapKeyRef:
+                  key: support_howto_video_url
+                  name: {{ include "ui.fullname" . }}-config
+            - name: REACT_APP_SEARCH_TOUR_ENABLED
+              valueFrom:
+                configMapKeyRef:
+                  key: search_tour_enabled
+                  name: {{ include "ui.fullname" . }}-config
       volumes:
         - name: branddesc
           configMap:

values.yaml

@@ -65,14 +65,16 @@ config:
     enabled: false
     platform: google
     token: ""
-  appstore_asset_base_url: "https://raw.githubusercontent.com/helxplatform/appstore"
+  appstore_asset_base_url: 'https:\/\/raw.githubusercontent.com\/helxplatform\/appstore'
   appstore_asset_branch: "master"
   brand_name: ""
   hidden_result_tabs: ""
   search:
     # -- If search page should show up. This is configured to work with DUG
     enabled: "true"
     url: 'https:\/\/helx.renci.org'
+    # --- If guided tour for search should show up
+    tour_enabled: "false"
   tranql_url: 'https:\/\/helx.renci.org\/tranql\/'
   # -- Support page sections to display. If a link is provided, the corresponding section will be displayed
   support:
@@ -82,6 +84,10 @@ config:
     user_guide_url: ''
     # -- Link for a page with FAQs.
     faqs_url: ''
+    # -- Link to an introduction video for the deployment.
+    intro_video_url: ''
+    # -- Link to a video on how to use the deployment
+    howto_video_url: ''
   workspaces:
     # -- Allow Workspaces.
     enabled: "true"