@rancher/shell 3.0.9-rc.3 → 3.0.9-rc.5

package/edit/auditlog.cattle.io.auditpolicy/__tests__/__snapshots__/General.test.ts.snap

@@ -0,0 +1,174 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`component: General rendering & initial state should render with default props (snapshot) 1`] = `
+<div>
+  <div
+    class="row"
+  >
+    <div
+      class="col span-6"
+    >
+      <fieldset>
+        <h3>
+          auditPolicy.general.enabled.title
+        </h3>
+        <checkbox-stub
+          componenttestid="checkbox"
+          data-testid="auditPolicy-enabled"
+          disabled="false"
+          id="test-id-123"
+          indeterminate="false"
+          labelkey="auditPolicy.general.enabled.checkbox"
+          mode="create"
+          primary="false"
+          value="false"
+          valuewhentrue="true"
+        />
+      </fieldset>
+    </div>
+  </div>
+  <div
+    class="spacer"
+  />
+  <div
+    class="row"
+  >
+    <div
+      class="col span-6"
+    >
+      <fieldset>
+        <h3>
+          auditPolicy.general.verbosity.title
+        </h3>
+        <banner-stub
+          class="mt-0"
+          closable="false"
+          color="info"
+          disabled="false"
+          labelkey="auditPolicy.general.verbosity.banner"
+          stacked="false"
+        />
+        <h4>
+          auditPolicy.general.verbosity.level.title 
+          <i
+            class="icon icon-info has-clean-tooltip"
+          />
+        </h4>
+        <div
+          class="row"
+        >
+          <div
+            class="col span-12"
+          >
+            <labeled-select-stub
+              appendtobody="true"
+              clearable="false"
+              closeonselect="true"
+              disabled="false"
+              hovertooltip="true"
+              label="auditPolicy.general.verbosity.level.label"
+              loading="false"
+              localizedlabel="false"
+              mode="create"
+              nooptionslabelkey="labelSelect.noOptions.empty"
+              optionlabel="label"
+              options="[object Object],[object Object],[object Object],[object Object]"
+              reduce="[Function]"
+              required="false"
+              selectable="[Function]"
+              value="0"
+            />
+          </div>
+        </div>
+        <div
+          class="spacer-small"
+        />
+        <div
+          class="row"
+        >
+          <div
+            class="col span-6"
+          >
+            <h4>
+              auditPolicy.general.verbosity.request.title 
+              <i
+                class="icon icon-info has-clean-tooltip"
+              />
+            </h4>
+            <div
+              class="row"
+            >
+              <checkbox-stub
+                componenttestid="checkbox"
+                disabled="false"
+                id="test-id-123"
+                indeterminate="false"
+                label="auditPolicy.general.verbosity.request.requestHeaders"
+                mode="create"
+                primary="false"
+                value="false"
+                valuewhentrue="true"
+              />
+            </div>
+            <div
+              class="row"
+            >
+              <checkbox-stub
+                componenttestid="checkbox"
+                disabled="false"
+                id="test-id-123"
+                indeterminate="false"
+                label="auditPolicy.general.verbosity.request.requestBody"
+                mode="create"
+                primary="false"
+                value="false"
+                valuewhentrue="true"
+              />
+            </div>
+          </div>
+          <div
+            class="col span-6"
+          >
+            <h4>
+              auditPolicy.general.verbosity.response.title 
+              <i
+                class="icon icon-info has-clean-tooltip"
+              />
+            </h4>
+            <div
+              class="row"
+            >
+              <checkbox-stub
+                componenttestid="checkbox"
+                disabled="false"
+                id="test-id-123"
+                indeterminate="false"
+                label="auditPolicy.general.verbosity.response.responseHeaders"
+                mode="create"
+                primary="false"
+                value="false"
+                valuewhentrue="true"
+              />
+            </div>
+            <div
+              class="row"
+            >
+              <checkbox-stub
+                componenttestid="checkbox"
+                disabled="false"
+                id="test-id-123"
+                indeterminate="false"
+                label="auditPolicy.general.verbosity.response.responseBody"
+                mode="create"
+                primary="false"
+                value="false"
+                valuewhentrue="true"
+              />
+            </div>
+          </div>
+        </div>
+      </fieldset>
+    </div>
+  </div>
+</div>
+`;

package/edit/auditlog.cattle.io.auditpolicy/__tests__/__snapshots__/index.test.ts.snap

@@ -0,0 +1,29 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`component: CRUAuditPolicy (index) rendering & initial state should render with default props (snapshot) 1`] = `
+<div
+  data-v-app=""
+>
+  
+  <!--v-if-->
+  <cru-resource-stub
+    cancelevent="false"
+    canyaml="true"
+    componenttestid="form"
+    description=""
+    errors=""
+    finishmode="finish"
+    minheight=""
+    mode="create"
+    namespacekey="metadata.namespace"
+    prevententersubmit="false"
+    resource="[object Object]"
+    showcancel="true"
+    steps=""
+    stepsoptions="[object Object]"
+    subtypes=""
+    validationpassed="true"
+  />
+  
+</div>
+`;

package/edit/auditlog.cattle.io.auditpolicy/__tests__/index.test.ts

@@ -0,0 +1,215 @@
+import { shallowMount, VueWrapper } from '@vue/test-utils';
+import CRUAuditPolicy from '../index.vue';
+import { ComponentPublicInstance } from 'vue';
+
+// Mock the ID generation to have consistent snapshots
+jest.mock('@shell/utils/string', () => ({ generateRandomAlphaString: () => 'test-id-123' }));
+
+// Type definitions for component
+interface AuditPolicyComponent extends ComponentPublicInstance {
+  mode: string;
+  value: Record<string, any>;
+}
+
+const defaultProps = {
+  value: {
+    id:       'test-policy',
+    type:     'auditlog.cattle.io.auditpolicy',
+    metadata: { name: 'test-policy' },
+    spec:     { enabled: false }
+  },
+  mode: 'create'
+};
+
+const globalMocks = {
+  global: {
+    mocks: {
+      $t:     (key: string) => key,
+      t:      (key: string) => key,
+      $store: {
+        getters: {
+          'i18n/t':            (key: string) => key,
+          currentStore:        () => 'cluster',
+          'cluster/schemaFor': () => ({
+            attributes: { namespaced: true },
+            id:         'auditlog.cattle.io.auditpolicy'
+          })
+        },
+        dispatch: jest.fn()
+      },
+      $route: {
+        params: {},
+        query:  {}
+      },
+      $router: {
+        push:    jest.fn(),
+        replace: jest.fn()
+      },
+      $fetchState: { pending: false }
+    },
+    provide: {
+      store: {
+        getters:  { 'i18n/t': (key: string) => key },
+        dispatch: jest.fn()
+      }
+    },
+    stubs: {
+      Loading:              true,
+      CruResource:          true,
+      NameNsDescription:    true,
+      Error:                true,
+      Tabbed:               true,
+      Tab:                  true,
+      General:              true,
+      Filters:              true,
+      AdditionalRedactions: true,
+      Labels:               true
+    }
+  }
+};
+
+function factory(props: Record<string, any> = {}, options: Record<string, any> = {}): VueWrapper<AuditPolicyComponent> {
+  return shallowMount(CRUAuditPolicy, {
+    props:  { ...defaultProps, ...props },
+    ...globalMocks,
+    global: {
+      ...globalMocks.global,
+      // Prevent directive conflicts by using shallow mounting without plugins
+      plugins: [],
+      ...(options.global || {})
+    },
+    ...options
+  }) as VueWrapper<AuditPolicyComponent>;
+}
+
+describe('component: CRUAuditPolicy (index)', () => {
+  describe('rendering & initial state', () => {
+    it('should render with default props (snapshot)', () => {
+      const wrapper = factory();
+
+      expect(wrapper.element).toMatchSnapshot();
+    });
+
+    it('should mount successfully', () => {
+      const wrapper = factory();
+
+      expect(wrapper.exists()).toBe(true);
+      expect(wrapper.vm).toBeDefined();
+    });
+
+    it('should render with different modes', () => {
+      const modes = ['create', 'edit', 'view'];
+
+      modes.forEach((mode) => {
+        const wrapper = factory({ mode });
+
+        expect(wrapper.exists()).toBe(true);
+        expect(wrapper.vm.mode).toBe(mode);
+      });
+    });
+  });
+
+  describe('component initialization', () => {
+    it('should initialize with provided value', () => {
+      const wrapper = factory();
+
+      expect(wrapper.vm.value).toBeDefined();
+      expect(wrapper.vm.value.spec).toBeDefined();
+    });
+
+    it('should handle different value configurations', () => {
+      const customValue = {
+        id:       'custom-policy',
+        type:     'auditlog.cattle.io.auditpolicy',
+        metadata: { name: 'custom' },
+        spec:     { enabled: true }
+      };
+      const wrapper = factory({ value: customValue });
+
+      expect(wrapper.vm.value.id).toBe('custom-policy');
+      expect(wrapper.vm.value.spec.enabled).toBe(true);
+    });
+
+    it('should handle spec initialization lifecycle', () => {
+      const valueWithoutSpec = {
+        ...defaultProps.value,
+        spec: undefined
+      };
+      // The component created() hook should initialize spec when missing
+      const wrapper = factory({ value: valueWithoutSpec });
+
+      // After mounting, spec should be initialized
+      expect(wrapper.vm.value.spec).toBeDefined();
+    });
+  });
+
+  describe('component structure', () => {
+    it('should have the correct component name', () => {
+      const wrapper = factory();
+
+      expect(wrapper.vm.$options.name).toBe('CRUAuditPolicy');
+    });
+
+    it('should use CreateEditView and FormValidation mixins', () => {
+      const wrapper = factory();
+
+      // Check that mixins are applied by testing for their properties/methods
+      expect(typeof wrapper.vm.mode).toBe('string');
+      expect(wrapper.vm.value).toBeDefined();
+    });
+
+    it('should render main template elements', () => {
+      const wrapper = factory();
+
+      expect(wrapper.html()).toContain('cru-resource-stub');
+      expect(wrapper.findComponent({ name: 'CruResource' })).toBeTruthy();
+    });
+  });
+
+  describe('props and configuration', () => {
+    it('should handle different modes correctly', () => {
+      const modes = ['create', 'edit', 'view'];
+
+      modes.forEach((mode) => {
+        const wrapper = factory({ mode });
+
+        expect(wrapper.vm.mode).toBe(mode);
+      });
+    });
+
+    it('should handle different value objects', () => {
+      const customValue = {
+        id:       'test-policy',
+        type:     'auditlog.cattle.io.auditpolicy',
+        metadata: { name: 'test' },
+        spec:     { enabled: true, verbosity: { level: 2 } }
+      };
+      const wrapper = factory({ value: customValue });
+
+      expect(wrapper.vm.value.spec.enabled).toBe(true);
+      expect(wrapper.vm.value.spec.verbosity.level).toBe(2);
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should handle empty value object', () => {
+      const wrapper = factory({ value: {} });
+
+      // The created() hook initializes spec, so empty object gets spec added
+      expect(wrapper.vm.value).toStrictEqual({ spec: { enabled: false } });
+    });
+
+    it('should handle component updates', async() => {
+      const wrapper = factory();
+
+      await wrapper.setProps({
+        value: {
+          ...defaultProps.value,
+          spec: { enabled: true }
+        }
+      });
+
+      expect(wrapper.vm.value.spec.enabled).toBe(true);
+    });
+  });
+});

package/edit/auditlog.cattle.io.auditpolicy/index.vue

@@ -0,0 +1,104 @@
+<script lang="ts">
+// Shared AuditPolicy interface for all audit log policy components
+import CreateEditView from '@shell/mixins/create-edit-view';
+import FormValidation from '@shell/mixins/form-validation';
+import CruResource from '@shell/components/CruResource.vue';
+import NameNsDescription from '@shell/components/form/NameNsDescription.vue';
+import Labels from '@shell/components/form/Labels.vue';
+import Tabbed from '@shell/components/Tabbed/index.vue';
+import Tab from '@shell/components/Tabbed/Tab.vue';
+import Loading from '@shell/components/Loading.vue';
+import General from '@shell/edit/auditlog.cattle.io.auditpolicy/General.vue';
+import Filters from '@shell/edit/auditlog.cattle.io.auditpolicy/Filters.vue';
+import AdditionalRedactions from '@shell/edit/auditlog.cattle.io.auditpolicy/AdditionalRedactions.vue';
+
+export default {
+  name:       'CRUAuditPolicy',
+  components: {
+    CruResource,
+    General,
+    Labels,
+    Loading,
+    NameNsDescription,
+    Filters,
+    AdditionalRedactions,
+    Tab,
+    Tabbed,
+  },
+  mixins: [CreateEditView, FormValidation],
+
+  created() {
+    if ( !this.value.spec ) {
+      this.value.spec = { enabled: false };
+    }
+  },
+};
+</script>
+
+<template>
+  <Loading v-if="$fetchState.pending" />
+  <CruResource
+    :done-route="doneRoute"
+    :mode="mode"
+    :resource="value"
+    :subtypes="[]"
+    :validation-passed="fvFormIsValid"
+    :errors="errors"
+    @error="e=>errors = e"
+    @finish="save"
+    @cancel="done"
+  >
+    <NameNsDescription
+      v-if="!isView"
+      :value="value"
+      :mode="mode"
+      :namespaced="schema.attributes.namespaced"
+      :nameRequired="false"
+      :register-before-hook="registerBeforeHook"
+    />
+    <Tabbed :side-tabs="true">
+      <Tab
+        name="general"
+        :label="t('auditPolicy.general.title')"
+        :weight="3"
+      >
+        <General
+          v-model:value="value.spec"
+          :mode="mode"
+        />
+      </Tab>
+      <Tab
+        name="filters"
+        :label="t('auditPolicy.filters.title')"
+        :weight="2"
+      >
+        <Filters
+          v-model:value="value.spec"
+          :mode="mode"
+        />
+      </Tab>
+      <Tab
+        name="additional-redactions"
+        :label="t('auditPolicy.additionalRedactions.title')"
+        :weight="1"
+      >
+        <AdditionalRedactions
+          v-model:value="value.spec"
+          :mode="mode"
+        />
+      </Tab>
+      <Tab
+        name="labels-and-annotations"
+        label-key="generic.labelsAndAnnotations"
+        :weight="0"
+      >
+        <Labels
+          default-container-class="labels-and-annotations-container"
+          :value="value"
+          :mode="mode"
+          :display-side-by-side="false"
+        />
+      </Tab>
+    </Tabbed>
+  </CruResource>
+</template>

package/edit/auditlog.cattle.io.auditpolicy/types.ts

@@ -0,0 +1,28 @@
+// Types & Interfaces
+export interface FilterRule {
+  action: string;
+  requestURI: string;
+}
+
+export interface RedactionRule {
+  headers?: string[];
+  paths?: string[];
+}
+
+export interface VerbosityDetails {
+  headers?: boolean;
+  body?: boolean;
+}
+
+export interface Verbosity {
+  level: number;
+  request?: VerbosityDetails;
+  response?: VerbosityDetails;
+}
+
+export interface AuditPolicy {
+  enabled?: boolean;
+  verbosity?: Verbosity;
+  filters?: FilterRule[];
+  additionalRedactions?: RedactionRule[];
+}

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

@@ -122,6 +122,15 @@ export default {
       return _SPECIFY;
     },
 
+    isGitHubDotComRepository() {
+      // It needs to be specifically https://github.com, if different it could have something like https://company-intranet.github.com/ or https://company.com/github.com/
+      return this.value.spec.repo?.toLowerCase().includes('https://github.com');
+    },
+
+    isBasicAuthSelected() {
+      return this.tempCachedValues.clientSecretName?.selected === AUTH_TYPE._BASIC;
+    },
+
     steps() {
       return [
         {
@@ -189,7 +198,6 @@ export default {
       handler:   'updateTls',
       immediate: true
     },
-
     workspace(neu) {
       if ( this.isCreate ) {
         set(this.value, 'metadata.namespace', neu);
@@ -502,6 +510,12 @@ export default {
 
       <h2 v-t="'fleet.gitRepo.auth.title'" />
 
+      <Banner
+        v-if="isGitHubDotComRepository && isBasicAuthSelected"
+        color="warning"
+        label-key="fleet.gitRepo.auth.githubdotcomPasswordBanner"
+        data-testid="gitrepo-githubdotcom-password-warning"
+      />
       <SelectOrCreateAuthSecret
         data-testid="gitrepo-git-auth"
         :value="value.spec.clientSecretName"
@@ -515,6 +529,7 @@ export default {
         label-key="fleet.gitRepo.auth.git"
         :cache-secrets="true"
         :show-ssh-known-hosts="true"
+        :is-github-dot-com-repository="isGitHubDotComRepository"
         @update:value="updateAuth($event, 'clientSecretName')"
         @inputauthval="updateCachedAuthVal($event, 'clientSecretName')"
       />

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

@@ -50,6 +50,7 @@ export default {
       RANCHER_TYPES,
       fvFormRuleSets:     [{ path: 'spec.displayName', rules: ['required'] }],
       resourceQuotaKey:   0,
+      isQuotasValid:      true,
     };
   },
   computed: {
@@ -110,6 +111,9 @@ export default {
     }
   },
   methods: {
+    validateQuotas(isValid) {
+      this.isQuotasValid = isValid;
+    },
     async save(saveCb) {
       try {
         this.errors = [];
@@ -158,7 +162,7 @@ export default {
     },
 
     removeQuota(key) {
-      const isExtended = key.startsWith(`${ TYPES.EXTENDED }.`);
+      const isExtended = key.startsWith(`${ TYPES.EXTENDED }`);
       let resourceKey = key;
 
       if (isExtended) {
@@ -176,6 +180,7 @@ export default {
               delete limit.extended;
             }
           }
+
           if (usedLimit?.extended && typeof usedLimit.extended[resourceKey] !== 'undefined') {
             delete usedLimit.extended[resourceKey];
             if (Object.keys(usedLimit.extended).length === 0) {
@@ -207,7 +212,7 @@ export default {
     :resource="value"
     :subtypes="[]"
     :can-yaml="false"
-    :validation-passed="fvFormIsValid"
+    :validation-passed="fvFormIsValid && isQuotasValid"
     @error="e=>errors = e"
     @finish="save"
     @cancel="done"
@@ -258,6 +263,7 @@ export default {
           :mode="canEditTabElements"
           :types="isStandaloneHarvester ? HARVESTER_TYPES : RANCHER_TYPES"
           @remove="removeQuota"
+          @validationChanged="validateQuotas"
         />
       </Tab>
       <Tab