@rancher/shell 0.3.23 → 0.3.25

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

@@ -131,18 +131,18 @@ export default {
     const addRepositorySteps = [stepRepoInfo, stepTargetInfo].sort((a, b) => (b.weight || 0) - (a.weight || 0));
 
     return {
-      allClusters:          [],
-      allClusterGroups:     [],
-      allWorkspaces:        [],
-      tempCachedValues:     {},
-      username:             null,
-      password:             null,
-      publicKey:            null,
-      privateKey:           null,
-      tlsMode:              null,
-      caBundle:             null,
-      targetAdvancedErrors: null,
-      matchingClusters:     null,
+      allClusters:             [],
+      allClusterGroups:        [],
+      allWorkspaces:           [],
+      tempCachedValues:        {},
+      username:                null,
+      password:                null,
+      publicKey:               null,
+      privateKey:              null,
+      tlsMode:                 null,
+      caBundle:                null,
+      targetAdvancedErrors:    null,
+      matchingClusters:        null,
       ref,
       refValue,
       targetMode,
@@ -152,6 +152,7 @@ export default {
       stepRepoInfo,
       stepTargetInfo,
       addRepositorySteps,
+      displayHelmRepoURLRegex: false
     };
   },
 
@@ -261,9 +262,8 @@ export default {
     targetCluster:              'updateTargets',
     targetClusterGroup:         'updateTargets',
     targetAdvanced:             'updateTargets',
-
-    tlsMode:  'updateTls',
-    caBundle: 'updateTls',
+    tlsMode:                    'updateTls',
+    caBundle:                   'updateTls',
 
     workspace(neu) {
       if ( this.isCreate ) {
@@ -289,6 +289,10 @@ export default {
 
     updateCachedAuthVal(val, key) {
       this.tempCachedValues[key] = typeof val === 'string' ? { selected: val } : { ...val };
+
+      if (key === 'helmSecretName') {
+        this.toggleHelmRepoURLRegex(val && val.selected !== AUTH_TYPE._NONE);
+      }
     },
 
     updateAuth(val, key) {
@@ -303,6 +307,14 @@ export default {
       this.updateCachedAuthVal(val, key);
     },
 
+    toggleHelmRepoURLRegex(active) {
+      this.displayHelmRepoURLRegex = active;
+
+      if (!active) {
+        delete this.value.spec?.helmRepoURLRegex;
+      }
+    },
+
     updateTargets() {
       const spec = this.value.spec;
       const mode = this.targetMode;
@@ -583,6 +595,22 @@ export default {
         @inputauthval="updateCachedAuthVal($event, 'helmSecretName')"
       />
 
+      <div
+        v-if="displayHelmRepoURLRegex"
+        class="row mt-20"
+      >
+        <div
+          class="col span-6"
+          data-testid="gitrepo-helm-repo-url-regex"
+        >
+          <LabeledInput
+            v-model="value.spec.helmRepoURLRegex"
+            :mode="mode"
+            label-key="fleet.gitRepo.helmRepoURLRegex"
+          />
+        </div>
+      </div>
+
       <template v-if="isTls">
         <div class="spacer" />
         <div class="row">

package/edit/logging.banzaicloud.io.output/index.vue

@@ -258,6 +258,13 @@ export default {
   $logo: 60px;
 
 .output {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+
+  .side-tabs {
+    flex: 1;
+  }
   .provider {
     h1 {
       display: inline-block;

package/edit/management.cattle.io.clusterroletemplatebinding.vue

@@ -1,7 +1,6 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
-import Banner from '@components/Banner/Banner.vue';
 import { MANAGEMENT } from '@shell/config/types';
 import Loading from '@shell/components/Loading';
 import ClusterPermissionsEditor from '@shell/components/form/Members/ClusterPermissionsEditor';
@@ -9,7 +8,6 @@ import { exceptionToErrorsArray } from '@shell/utils/error';
 
 export default {
   components: {
-    Banner,
     ClusterPermissionsEditor,
     CruResource,
     Loading,
@@ -64,15 +62,9 @@ export default {
     @finish="saveOverride"
     @cancel="done"
   >
-    <ClusterPermissionsEditor
-      v-model="bindings"
-      :cluster-name="$store.getters['currentCluster'].id"
-    />
-    <Banner
-      v-for="(err, i) in errors"
-      :key="i"
-      color="error"
-      :label="err"
+    <ClusterPermissionsEditor
+      v-model="bindings"
+      :cluster-name="$store.getters['currentCluster'].id"
     />
   </CruResource>
 </template>

package/edit/namespace.vue

@@ -7,8 +7,8 @@ import { MANAGEMENT } from '@shell/config/types';
 import { CONTAINER_DEFAULT_RESOURCE_LIMIT, PROJECT } from '@shell/config/labels-annotations';
 import ContainerResourceLimit from '@shell/components/ContainerResourceLimit';
 import PodSecurityAdmission from '@shell/components/PodSecurityAdmission';
-import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
+import ResourceTabs from '@shell/components/form/ResourceTabs/index.vue';
 import CruResource from '@shell/components/CruResource';
 import { PROJECT_ID, _VIEW, FLAT_VIEW, _CREATE } from '@shell/config/query-params';
 import MoveModal from '@shell/components/MoveModal';
@@ -30,7 +30,7 @@ export default {
     PodSecurityAdmission,
     ResourceQuota,
     Tab,
-    Tabbed,
+    ResourceTabs,
     MoveModal
   },
 
@@ -198,7 +198,11 @@ export default {
         />
       </template>
     </NameNsDescription>
-    <Tabbed :side-tabs="true">
+    <ResourceTabs
+      v-model="value"
+      :mode="mode"
+      :side-tabs="true"
+    >
       <Tab
         v-if="showResourceQuota"
         :weight="1"
@@ -269,7 +273,7 @@ export default {
           @updateLabels="PSAChanged"
         />
       </Tab>
-    </Tabbed>
+    </ResourceTabs>
     <MoveModal v-if="projects" />
   </CruResource>
 </template>