@rancher/shell 3.0.12-rc.1 → 3.0.12-rc.2

package/composables/useUserRetentionValidation.ts

@@ -1,4 +1,4 @@
-import { Ref, ComputedRef, ref, computed } from 'vue';
+import { Ref } from 'vue';
 import { useStore } from 'vuex';
 
 import { SETTING } from '@shell/config/settings';
@@ -10,24 +10,12 @@ import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 dayjs.extend(duration);
 
-type SettingValidation = 'user-retention-cron' | 'disable-inactive-user-after' | 'delete-inactive-user-after';
-
-type Validation = {
-  [SETTING.DISABLE_INACTIVE_USER_AFTER]?: boolean;
-  [SETTING.DELETE_INACTIVE_USER_AFTER]?: boolean;
-  [SETTING.USER_RETENTION_CRON]?: boolean;
-}
-
 interface UseUserRetentionValidation {
   validateUserRetentionCron: (cronSetting: string | null) => string | undefined;
   validateDisableInactiveUserAfterDuration: (duration: string) => string | undefined;
   validateDeleteInactiveUserAfterDuration: (duration: string) => string | undefined;
   validateDeleteInactiveUserAfter: (duration: string) => string | undefined;
   validateDurationAgainstAuthUserSession: (duration: string) => string | undefined;
-  setValidation: (formField: SettingValidation, isValid: boolean) => void;
-  removeValidation : (setting: SettingValidation) => void;
-  addValidation: (setting: SettingValidation) => void;
-  isFormValid: ComputedRef<boolean>;
 }
 
 class ExpectedValidationError extends Error {
@@ -42,38 +30,6 @@ export const useUserRetentionValidation = (disableAfterPeriod: Ref<boolean>, del
   const store = useStore();
   const { t } = useI18n(store);
 
-  /**
-   * Tracks the validation state for user retention fields
-   */
-  const validation = ref<Validation>({
-    [SETTING.DISABLE_INACTIVE_USER_AFTER]: true,
-    [SETTING.DELETE_INACTIVE_USER_AFTER]:  true,
-    [SETTING.USER_RETENTION_CRON]:         true,
-  });
-
-  const isFormValid = computed(() => {
-    const validations = validation.value;
-
-    return !Object.values(validations).includes(false);
-  });
-
-  const setValidation = (formField: SettingValidation, isValid: boolean) => {
-    validation.value[formField] = isValid;
-  };
-
-  const removeValidation = (setting: SettingValidation) => {
-    const { [setting]: _, ...rest } = validation.value;
-
-    validation.value = rest;
-  };
-
-  const addValidation = (setting: SettingValidation) => {
-    validation.value = {
-      ...validation.value,
-      [setting]: true,
-    };
-  };
-
   /**
    * Takes a duration string and produces a dayjs duration object.
    * @param duration Duration string in {h|m|s} (e.g. 6h3m2s)
@@ -193,9 +149,5 @@ export const useUserRetentionValidation = (disableAfterPeriod: Ref<boolean>, del
     validateDeleteInactiveUserAfterDuration,
     validateDeleteInactiveUserAfter,
     validateDurationAgainstAuthUserSession,
-    setValidation,
-    removeValidation,
-    addValidation,
-    isFormValid,
   };
 };

package/config/cookies.js

@@ -1,4 +1,3 @@
 export const CSRF = 'CSRF';
 export const USERNAME = 'R_USERNAME';
 export const LOCALE = 'R_LOCALE';
-export const REDIRECTED = 'R_REDIRECTED';

package/config/labels-annotations.js

@@ -87,6 +87,7 @@ export const CATALOG = {
 
   PRIME_ONLY:   'catalog.cattle.io/prime-only',
   EXPERIMENTAL: 'catalog.cattle.io/experimental',
+  DEPRECATED:   'catalog.cattle.io/deprecated',
   NAMESPACE:    'catalog.cattle.io/namespace',
   RELEASE_NAME: 'catalog.cattle.io/release-name',
   FEATURED:     'catalog.cattle.io/featured',

package/config/query-params.js

@@ -72,6 +72,7 @@ export const DEPRECATED = 'deprecated';
 export const HIDDEN = 'hidden';
 export const FROM_TOOLS = 'tools';
 export const FROM_CLUSTER = 'cluster';
+export const NEW_APP_INSTANCE = 'new-instance';
 export const HIDE_SIDE_NAV = 'hide-side-nav';
 
 // Cluster provisioning

package/config/router/routes.js

@@ -432,10 +432,6 @@ export default [
         path:      '/c/:cluster/monitoring/route-receiver/create',
         component: () => interopDefault(import('@shell/pages/c/_cluster/monitoring/route-receiver/create.vue')),
         name:      'c-cluster-monitoring-route-receiver-create'
-      }, {
-        path:      '/c/:cluster/explorer/tools/pages/:page?',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/explorer/tools/pages/_page.vue')),
-        name:      'c-cluster-explorer-tools-pages-page'
       }, {
         path:      '/c/:cluster/auth/config/:id',
         component: () => interopDefault(import('@shell/pages/c/_cluster/auth/config/_id.vue')),
@@ -452,10 +448,6 @@ export default [
         path:      '/c/:cluster/manager/nodeDriver/:id',
         component: () => interopDefault(import('@shell/pages/c/_cluster/manager/drivers/nodeDriver/_id.vue')),
         name:      'c-cluster-manager-driver-nodedriver-id'
-      }, {
-        path:      '/c/:cluster/manager/pages/:page?',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/manager/pages/_page.vue')),
-        name:      'c-cluster-manager-pages-page'
       }, {
         path:      '/c/:cluster/monitoring/alertmanagerconfig/:alertmanagerconfigid',
         component: () => interopDefault(import('@shell/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/index.vue')),