@rancher/shell 3.0.5-rc.2 → 3.0.5-rc.5

package/edit/fleet.cattle.io.gitrepo.vue

@@ -28,9 +28,8 @@ import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 import FormValidation from '@shell/mixins/form-validation';
 import UnitInput from '@shell/components/form/UnitInput';
 import { toSeconds } from '@shell/utils/duration';
-
-const MINIMUM_POLLING_INTERVAL = 15;
-const DEFAULT_POLLING_INTERVAL = 60;
+import FleetOCIStorageSecret from '@shell/components/fleet/FleetOCIStorageSecret.vue';
+import { DEFAULT_POLLING_INTERVAL, MINIMUM_POLLING_INTERVAL } from '@shell/models/fleet-application';
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -48,6 +47,7 @@ export default {
     ArrayList,
     Banner,
     CruResource,
+    FleetOCIStorageSecret,
     InputWithSelect,
     Labels,
     LabeledInput,
@@ -130,7 +130,6 @@ export default {
     return {
       allClusters:             [],
       allClusterGroups:        [],
-      allWorkspaces:           [],
       tempCachedValues:        {},
       username:                null,
       password:                null,
@@ -153,7 +152,7 @@ export default {
         path:  'spec.repo',
         rules: [
           'required',
-          'gitRepository'
+          'urlRepository'
         ],
       }]
     };
@@ -215,14 +214,6 @@ export default {
       return !(this.value?.spec?.repo || '').startsWith('http://');
     },
 
-    isPollingEnabled() {
-      return !this.value.spec.disablePolling;
-    },
-
-    isWebhookConfigured() {
-      return !!this.value.status?.webhookCommit;
-    },
-
     targetOptions() {
       const out = [
         {
@@ -279,22 +270,6 @@ export default {
       return out;
     },
 
-    clusterNames() {
-      const out = this.allClusters
-        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
-        .map((x) => x.metadata.name);
-
-      return out;
-    },
-
-    clusterGroupNames() {
-      const out = this.allClusterGroups
-        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
-        .map((x) => x.metadata.name);
-
-      return out;
-    },
-
     tlsOptions() {
       return [
         { label: this.t('fleet.gitRepo.tls.verify'), value: _VERIFY },
@@ -304,7 +279,7 @@ export default {
     },
 
     showPollingIntervalWarning() {
-      return !this.isView && this.isPollingEnabled && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
+      return !this.isView && this.value.isPollingEnabled && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
     },
   },
 
@@ -328,6 +303,10 @@ export default {
     this.registerBeforeHook(this.cleanTLS, 'cleanTLS');
     this.registerBeforeHook(this.doCreateSecrets, `registerAuthSecrets${ new Date().getTime() }`, 99);
     this.registerBeforeHook(this.updateBeforeSave);
+
+    if (this.realMode === _EDIT && this.workspace !== this.value.namespace) {
+      this.$store.commit('updateWorkspace', { value: this.value.namespace, getters: this.$store.getters });
+    }
   },
 
   methods: {
@@ -750,6 +729,20 @@ export default {
         </div>
       </template>
       <div class="spacer" />
+
+      <h2 v-t="'fleet.gitRepo.ociStorageSecret.title'" />
+      <div class="row mt-20">
+        <div class="col span-6">
+          <FleetOCIStorageSecret
+            :secret="value.spec.ociRegistrySecret"
+            :workspace="workspace"
+            :mode="mode"
+            @update:value="value.spec.ociRegistrySecret=$event"
+          />
+        </div>
+      </div>
+      <div class="spacer" />
+
       <h2 v-t="'fleet.gitRepo.resources.label'" />
       <div class="resource-handling">
         <Checkbox
@@ -777,7 +770,7 @@ export default {
       <div class="row polling">
         <div class="col span-6">
           <Checkbox
-            v-model:value="isPollingEnabled"
+            :value="value.isPollingEnabled"
             data-testid="gitRepo-enablePolling-checkbox"
             class="check"
             type="checkbox"
@@ -786,7 +779,7 @@ export default {
             @update:value="enablePolling"
           />
         </div>
-        <template v-if="isPollingEnabled">
+        <template v-if="value.isPollingEnabled">
           <div class="col">
             <Banner
               v-if="showPollingIntervalWarning"
@@ -795,7 +788,7 @@ export default {
               data-testid="gitRepo-pollingInterval-minimumValueWarning"
             />
             <Banner
-              v-if="isWebhookConfigured"
+              v-if="value.isWebhookConfigured"
               color="warning"
               label-key="fleet.gitRepo.polling.pollingInterval.webhookWarning"
               data-testid="gitRepo-pollingInterval-webhookWarning"