Merge pull request #70 from bcgov/bugfix/modals

Bucket config modal updates
bcgov · Apr 13, 2023 · 3f535cf · 3f535cf
2 parents e5b74c1 + 0549a4e
commit 3f535cf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/charts/bcbox/Chart.yaml b/charts/bcbox/Chart.yaml
@@ -3,7 +3,7 @@ name: bcbox
 # 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: 0.0.3
+version: 0.0.4
 kubeVersion: ">= 1.13.0"
 description: A frontend UI for managing access control to S3 Objects
 # A chart can be either an 'application' or a 'library' chart.

diff --git a/charts/bcbox/templates/hpa.yaml b/charts/bcbox/templates/hpa.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.autoscaling.enabled }}
 ---
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "bcbox.fullname" . }}

diff --git a/frontend/src/components/bucket/BucketConfigForm.vue b/frontend/src/components/bucket/BucketConfigForm.vue
@@ -86,7 +86,6 @@ const onSubmit = async (values: any) => {
       }
     );
   } catch (error: any) {
-    emit('cancel-bucket-config');
     toast.add(
       {
         severity: 'error',
@@ -145,6 +144,7 @@ const onCancel = () => {
         label="Key"
         placeholder="directory"
         help-text="An optional path prefix within a bucket. The path will be created if it doesn't already exist."
+        :disabled="!!props.bucket"
       />
       <Button
         class="mt-2"

diff --git a/frontend/src/components/form/TextInput.vue b/frontend/src/components/form/TextInput.vue
@@ -10,13 +10,15 @@ type Props = {
   label?: string;
   name: string;
   placeholder?: string;
+  disabled?: boolean;
 };
 
 const props = withDefaults(defineProps<Props>(), {
   helpText: '',
   type: 'text',
   label: '',
-  placeholder: ''
+  placeholder: '',
+  disabled: false
 });
 
 const { errorMessage, value } = useField<string>(toRef(props, 'name'));
@@ -31,6 +33,7 @@ const { errorMessage, value } = useField<string>(toRef(props, 'name'));
       :name="name"
       :placeholder="placeholder"
       :class="{ 'p-invalid': errorMessage }"
+      :disabled="disabled"
     />
     <small id="`${name}-help`">{{ helpText }}</small>
     <ErrorMessage