fix: merge

Author: at88mph

helm/applications/science-portal/config/org.opencadc.science-portal.properties

@@ -28,18 +28,16 @@ org.opencadc.science-portal.oidc.scope = {{ .scope }}
 
 org.opencadc.science-portal.tokenCache.url = redis://{{ $.Release.Name }}-redis-master.{{ $.Release.Namespace }}.svc.{{ $.Values.kubernetesClusterDomain }}:6379
 
-{{- if .Values.storageHomeURL }}
-org.opencadc.science-portal.storageXmlInfoUrl = {{ .Values.storageHomeURL }}
-{{- end }}
+{{ if .Values.deployment.sciencePortal.storageHomeURL -}}
+org.opencadc.science-portal.storageXmlInfoUrl = {{ .Values.deployment.sciencePortal.storageHomeURL }}
+{{ end }}
 
 {{ with .Values.experimentalFeatures }}
 {{- if .enabled }}
-
-{{- with resourceSlider }}
-{{- if .enabled }
-org.opencadc.science-portal.experimental.resourceSlider = true
+{{- with .slider }}
+{{- if .enabled }}
+org.opencadc.science-portal.experimental.slider.enabled = true
 {{- end }}
 {{- end }}
-
 {{- end }}
 {{- end }}

helm/applications/science-portal/values.yaml

@@ -112,16 +112,21 @@ deployment:
     # themeName: canfar
     themeName:
 
-# Optional.  The absolute base URL of the /home folder containing the user's home directories.  This is used to query the storage quota 
-# information, and display a panel in the Portal UI.
-# Example:
-#   storageHomeURL: https://example.org/cavern/nodes/home
-# storageHomeURL:
+    # Optional.  The absolute base URL of the /home folder containing the user's home directories.  This is used to query the storage quota 
+    # information, and display a panel in the Portal UI.
+    # Example:
+    #   storageHomeURL: https://example.org/cavern/nodes/home
+    # storageHomeURL:
 
 # Experimental features that can be enabled.  These represent features that are not released and confined behind feature flags.
 experimentalFeatures:
   enabled: false
 
+  # Enable the slider experimental feature.
+  # This feature allows users to dynamically adjust the resource limits of their jobs with a different User Interface experience.
+  slider:
+    enabled: false
+
   # Enable the Resource Slider feature, which allows users to select the amount of resources (CPU and Memory) they want to 
   # use for their jobs with a UI Slider Component.
   resourceSlider: