@rancher/shell 3.0.8-rc.6 → 3.0.8-rc.8

package/components/templates/plain.vue

@@ -15,6 +15,8 @@ import BrowserTabVisibility from '@shell/mixins/browser-tab-visibility';
 import Inactivity from '@shell/components/Inactivity';
 import { mapGetters } from 'vuex';
 import PromptModal from '@shell/components/PromptModal';
+import WindowManager from '@shell/components/nav/WindowManager';
+import { Layout } from '@shell/types/window-manager';
 
 export default {
 
@@ -30,7 +32,8 @@ export default {
     SlideInPanelManager,
     AwsComplianceBanner,
     AzureWarning,
-    Inactivity
+    Inactivity,
+    WindowManager
   },
 
   mixins: [Brand, BrowserTabVisibility],
@@ -40,6 +43,7 @@ export default {
       // Assume home pages have routes where the name is the key to use for string lookup
       name:             this.$route.name,
       noLocaleShortcut: process.env.dev || false,
+      layout:           Layout.plain,
     };
   },
 
@@ -97,6 +101,7 @@ export default {
           @shortkey="toggleNoneLocale()"
         />
       </main>
+      <WindowManager :layout="layout" />
     </div>
 
     <FixedBanner :footer="true" />
@@ -117,10 +122,10 @@ export default {
     flex-grow: 1;
 
     grid-template-areas:
-      "header"
-      "main";
+      "header header header"
+      "wm-vl  main   wm-vr";
 
-    grid-template-columns: auto;
+    grid-template-columns: var(--wm-vl-width, 0px) auto var(--wm-vr-width, 0px);
     grid-template-rows:    var(--header-height) auto;
 
     > HEADER {
@@ -128,6 +133,27 @@ export default {
     }
   }
 
+  .wm {
+    grid-area: wm;
+    overflow-y: hidden;
+    z-index: z-index('windowsManager');
+    position: relative;
+  }
+
+  .wm-vr {
+    grid-area: wm-vr;
+    overflow-y: hidden;
+    z-index: z-index('windowsManager');
+    position: relative;
+  }
+
+  .wm-vl {
+    grid-area: wm-vl;
+    overflow-y: hidden;
+    z-index: z-index('windowsManager');
+    position: relative;
+  }
+
   MAIN {
     grid-area: main;
     overflow: auto;

package/core/plugin-helpers.ts

@@ -195,6 +195,8 @@ export function getApplicableExtensionEnhancements<T>(
                 if (i < keyboardCombo.length - 1) {
                   if (key === 'meta') {
                     key = '\u2318';
+                  } else if (isMac && key === 'alt') {
+                    key = '⌥';
                   } else {
                     key = ucFirst(key);
                   }

package/edit/auth/__tests__/oidc.test.ts

@@ -221,5 +221,31 @@ describe('oidc.vue', () => {
       expect(issuer).toBe('');
       expect(endpoint).toBe('');
     });
+
+    it('custom claims fields should not appear in UI if Amazon cognito', async() => {
+      wrapper.vm.model.id = 'cognito';
+
+      const nameClaim = wrapper.find('[data-testid="input-name-claim"]');
+      const groupsClaim = wrapper.find('[data-testid="input-groups-claim"]');
+      const emailClaim = wrapper.find('[data-testid="input-email-claim"]');
+
+      expect(nameClaim.exists()).toBe(false);
+      expect(groupsClaim.exists()).toBe(false);
+      expect(emailClaim.exists()).toBe(false);
+    });
+
+    it('custom claims fields should appear in UI if genericoidc', async() => {
+      wrapper.vm.model.id = 'genericoidc';
+      wrapper.vm.addCustomClaims = true;
+      await nextTick();
+
+      const nameClaim = wrapper.find('[data-testid="input-name-claim"]');
+      const groupsClaim = wrapper.find('[data-testid="input-groups-claim"]');
+      const emailClaim = wrapper.find('[data-testid="input-email-claim"]');
+
+      expect(nameClaim.exists()).toBe(true);
+      expect(groupsClaim.exists()).toBe(true);
+      expect(emailClaim.exists()).toBe(true);
+    });
   });
 });

package/edit/auth/oidc.vue

@@ -442,12 +442,14 @@ export default {
           </div>
         </template>
 
-        <template v-if="addCustomClaims">
+        <!-- Custom Claims -->
+        <template v-if="addCustomClaims && isGenericOidc">
           <h4>{{ t('authConfig.oidc.customClaims.label') }}</h4>
           <div class="row mb-20">
             <div class="col span-6">
               <LabeledInput
                 v-model:value="model.nameClaim"
+                data-testid="input-name-claim"
                 :label="t(`authConfig.oidc.customClaims.nameClaim.label`)"
                 :mode="mode"
               />
@@ -455,6 +457,7 @@ export default {
             <div class="col span-6">
               <LabeledInput
                 v-model:value="model.groupsClaim"
+                data-testid="input-groups-claim"
                 :label="t(`authConfig.oidc.customClaims.groupsClaim.label`)"
                 :mode="mode"
               />
@@ -464,6 +467,7 @@ export default {
             <div class="col span-6">
               <LabeledInput
                 v-model:value="model.emailClaim"
+                data-testid="input-email-claim"
                 :label="t(`authConfig.oidc.customClaims.emailClaim.label`)"
                 :mode="mode"
               />

package/edit/provisioning.cattle.io.cluster/__tests__/Networking.test.ts

@@ -47,7 +47,7 @@ describe('component: RKE2Networking', () => {
     expect(dropdown.props('options')).toHaveLength(3);
   });
 
-  it('should show an error when an ipv6 pool is present and the user selects the ipv4-only stack preference', async() => {
+  it('should show an error when an ipv6 pool is present and the user selects the ipv4-only stack preference when creating a new cluster', async() => {
     const spec = { ...defaultSpec, rkeConfig: { ...defaultSpec.rkeConfig, networking: { stackPreference: 'ipv4' } } };
     const wrapper = mount(Networking, {
       propsData: {
@@ -129,4 +129,27 @@ describe('component: RKE2Networking', () => {
 
     expect(banner.exists()).toBe(false);
   });
+
+  it('should not automatically update stack preference or validate it when editing an existing cluster even if its set to ipv4 and the user appears to have ipv6 pools', async() => {
+    const spec = { ...defaultSpec, rkeConfig: { ...defaultSpec.rkeConfig, networking: { stackPreference: 'ipv4' } } };
+    const wrapper = mount(Networking, {
+      propsData: {
+        mode:             'edit',
+        value:            { spec },
+        selectedVersion:  { serverArgs: mockServerArgs },
+        hasSomeIpv6Pools: true,
+      },
+      global: {
+        mocks: {
+          ...defaultMocks,
+          $store: { getters: defaultGetters },
+        },
+      },
+    });
+
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.emitted('validationChanged')?.[0]?.[0]).toBe(true);
+    expect(wrapper.emitted('stack-preference-changed')).toBeUndefined();
+  });
 });

package/edit/provisioning.cattle.io.cluster/index.vue

@@ -163,9 +163,8 @@ export default {
     };
 
     this.extensions = this.$extension.getProviders(context);
-  },
 
-  data() {
+    // At this point, we know we definitely have the mgmt cluster, so we can access `isImported` and `isLocal`
     let subType = null;
 
     subType = this.$route.query[SUB_TYPE] || null;
@@ -176,6 +175,11 @@ export default {
     } else if (this.value.isLocal) {
       subType = LOCAL;
     }
+
+    this.subType = subType;
+  },
+
+  data() {
     const rkeType = this.$route.query[RKE_TYPE] || null;
     const chart = this.$route.query[CHART] || null;
     const isImport = this.realMode === _IMPORT;
@@ -184,7 +188,7 @@ export default {
       nodeDrivers:      [],
       kontainerDrivers: [],
       extensions:       [],
-      subType,
+      subType:          null,
       rkeType,
       chart,
       isImport,

package/edit/provisioning.cattle.io.cluster/rke2.vue

@@ -990,15 +990,16 @@ export default {
     },
 
     hasSomeIpv6Pools(neu) {
-      const stackPreference = this.localValue.spec.rkeConfig.networking.stackPreference;
+      if (this.isCreate && this.localValue.spec.rkeConfig.networking.stackPreference !== STACK_PREFS.IPV6) { // if stack pref is ipv6, the user has manually configured that and we shouldn't change it
+        if (neu) {
+          this.localValue.spec.rkeConfig.networking.stackPreference = STACK_PREFS.DUAL;
+
+          return;
+        }
 
-      if (neu && (stackPreference === STACK_PREFS.IPV4 || !stackPreference)) { // localValue.spec.rkeConfig.networking is initialized in the beforeCreate hook
-        this.localValue.spec.rkeConfig.networking.stackPreference = STACK_PREFS.DUAL;
-      } else if (stackPreference === STACK_PREFS.DUAL) {
         this.localValue.spec.rkeConfig.networking.stackPreference = STACK_PREFS.IPV4;
       }
     },
-
   },
 
   created() {
@@ -2256,6 +2257,7 @@ export default {
     handleTabChange(data) {
       this.activeTab = data;
     },
+
   }
 };
 </script>

package/edit/provisioning.cattle.io.cluster/tabs/networking/index.vue

@@ -2,7 +2,7 @@
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { Banner } from '@components/Banner';
 import { Checkbox } from '@components/Form/Checkbox';
-import { _EDIT, _VIEW } from '@shell/config/query-params';
+import { _EDIT, _VIEW, _CREATE } from '@shell/config/query-params';
 import ArrayList from '@shell/components/form/ArrayList';
 import ACE from '@shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
@@ -128,11 +128,12 @@ export default {
   methods: {
     // if ipv6 pools are detected, we enforce dual-stack or ipv6 stack prefs.
     // If ipv6 pools are not detected we don't know for sure they aren't there so we don't validate the input
+    // also not validating the input when editing existing clusters to ensure we don't prevent editing clusters using dual-stack VPCs provisioned before the ipv6 feature was added
     stackPreferenceValidator(val) {
       const value = val?.value || val;
       let isValid;
 
-      if (this.hasSomeIpv6Pools) {
+      if (this.hasSomeIpv6Pools && this.mode === _CREATE) {
         isValid = value !== STACK_PREFS.IPV4;
 
         return isValid ? null : this.t('cluster.rke2.stackPreference.errorNeedsIpv6');

package/edit/service.vue

@@ -272,10 +272,14 @@ export default {
 
     async loadPods() {
       try {
-        const hash = {
-          provClusters:     this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
-          harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
-        };
+        const hash = {};
+
+        if (this.$store.getters[`management/canList`](CAPI.RANCHER_CLUSTER)) {
+          hash.provClusters = this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
+        }
+        if (this.$store.getters[`management/canList`](HCI.HARVESTER_CONFIG)) {
+          hash.harvesterConfigs = this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG });
+        }
 
         await allHash(hash);
         this.updateMatchingPods();

package/machine-config/amazonec2.vue

@@ -55,7 +55,12 @@ export default {
     machinePools: {
       type:    Array,
       default: () => []
-    }
+    },
+
+    poolCreateMode: {
+      type:    Boolean,
+      default: true
+    },
   },
 
   async fetch() {
@@ -383,6 +388,7 @@ export default {
           :machine-pools="machinePools"
           :has-ipv6="hasIpv6"
           :disabled="disabled"
+          :is-new="poolCreateMode"
           @update:has-ipv6="e=>$emit('update:hasIpv6', e)"
           @validation-changed="e=>$emit('validationChanged',e)"
         />

package/machine-config/components/EC2Networking.vue

@@ -92,7 +92,12 @@ export default {
     machinePools: {
       type:    Array,
       default: () => []
-    }
+    },
+
+    isNew: {
+      type:    Boolean,
+      default: true
+    },
   },
 
   created() {
@@ -107,6 +112,10 @@ export default {
     } else if (this.vpcId) {
       this.enableIpv6 = !!vpcs.find((vpc) => vpc.VpcId === this.vpcId && vpc.Ipv6CidrBlockAssociationSet && !isEmpty(vpc.Ipv6CidrBlockAssociationSet));
     }
+
+    if (this.isNew && this.somePoolHasIpv6OrDual) {
+      this.enableIpv6 = true;
+    }
   },
 
   data() {
@@ -115,13 +124,13 @@ export default {
 
   watch: {
     region() {
-      if (this.isCreate) {
+      if (this.isNew) {
         this.updateNetwork();
       }
     },
 
     enableIpv6(neu) {
-      if (this.isCreate) {
+      if (this.isNew) {
         this.updateNetwork();
       }
       this.$emit('update:hasIpv6', neu);
@@ -144,16 +153,19 @@ export default {
       }
     },
 
-    allValid(neu) {
-      this.$emit('validationChanged', neu);
+    ipv6AddressOnly(neu) {
+      this.$emit('update:hasIpv6', neu);
+    },
+
+    allValid: {
+      handler(neu) {
+        this.$emit('validationChanged', neu);
+      },
+      immediate: true
     }
   },
 
   computed: {
-    isCreate() {
-      return this.mode === _CREATE;
-    },
-
     allNetworkOptions() {
       if ( !this.vpcInfo || !this.subnetInfo ) {
         return [];
@@ -266,14 +278,18 @@ export default {
       return opt && opt.hasIpv6 && !opt.hasIpv4;
     },
 
-    poolsInvalid() {
-      const hasIpv6 = !!this.machinePools.find((p) => {
-        return p.hasIpv6;
-      });
+    somePoolHasIpv6OrDual() {
+      return !!this.machinePools.find((p) => p.hasIpv6);
+    },
+
+    showIpv6Options() {
+      return this.mode === _CREATE || (this.isNew && this.somePoolHasIpv6OrDual) || this.enableIpv6;
+    },
 
-      const hasNotIpv6 = !!this.machinePools.find((p) => !p.hasIpv6);
+    poolsInvalid() {
+      const somePoolHasIpv4 = !!this.machinePools.find((p) => !p.hasIpv6);
 
-      return hasIpv6 && hasNotIpv6;
+      return this.somePoolHasIpv6OrDual && somePoolHasIpv4;
     },
 
     addressCountInvalid() {
@@ -335,7 +351,7 @@ export default {
     data-testid="amazonEc2__ipv6Warning"
   />
   <div
-    v-if="isCreate || enableIpv6"
+    v-if="showIpv6Options"
     class="row mb-20"
   >
     <div
@@ -344,7 +360,7 @@ export default {
     >
       <Checkbox
         v-model:value="enableIpv6"
-        :disabled="!isCreate"
+        :disabled="!isNew"
         :label="t('cluster.machineConfig.amazonEc2.enableIpv6.label')"
         data-testid="amazonEc2__enableIpv6"
         :mode="mode"
@@ -387,7 +403,7 @@ export default {
       class="col span-3"
     >
       <Checkbox
-        :disabled="!isCreate || !dualStackSelected"
+        :disabled="!isNew || !dualStackSelected"
         :value="ipv6AddressOnly"
         :label="t('cluster.machineConfig.amazonEc2.ipv6AddressOnly.label')"
         :mode="mode"
@@ -403,7 +419,7 @@ export default {
     <div class="col span-6">
       <Checkbox
         :value="httpProtocolIpv6==='enabled'"
-        :disabled="!isCreate"
+        :disabled="!isNew"
         :label="t('cluster.machineConfig.amazonEc2.httpProtocolIpv6.label')"
         data-testid="amazonEc2__enableIpv6"
         :mode="mode"
@@ -417,7 +433,7 @@ export default {
   >
     <div class="col span-3">
       <LabeledInput
-        :disabled="!isCreate"
+        :disabled="!isNew"
         min="1"
         :mode="mode"
         :value="ipv6AddressCount"
@@ -429,7 +445,7 @@ export default {
     </div>
     <div class="col span-9">
       <Checkbox
-        :disabled="!isCreate"
+        :disabled="!isNew"
         :value="enablePrimaryIpv6"
         :label="t('cluster.machineConfig.amazonEc2.enablePrimaryIpv6.label')"
         :mode="mode"

package/machine-config/components/__tests__/EC2Networking.test.ts

@@ -91,4 +91,58 @@ describe('component: EC2Networking', () => {
 
     expect(ipv6Warning.exists()).toBe(shouldShowError);
   });
+
+  it('should show ipv6 inputs and automatically check the enable ipv6 checkbox when adding a new pool if some other pool in the cluster is using ipv6 or dual stack', () => {
+    const wrapper = shallowMount(EC2Networking, {
+      ...defaultCreateSetup,
+      propsData: {
+        ...defaultCreateSetup.propsData,
+        machinePools: [{ hasIpv6: true }],
+      },
+    });
+
+    const ipv6AddressCountInput = wrapper.findComponent('[data-testid="amazonEc2__ipv6AddressCount"]');
+
+    expect(wrapper.vm.enableIpv6).toBe(true);
+    expect(ipv6AddressCountInput.exists()).toBe(true);
+  });
+
+  it('should not show ipv6 inputs or automatically check the enable ipv6 checkbox when adding a new pool to a cluster that does not have existing ipv6 or dual stack pools', () => {
+    const wrapper = shallowMount(EC2Networking, {
+      ...defaultCreateSetup,
+      propsData: {
+        ...defaultCreateSetup.propsData,
+        machinePools: [{ hasIpv6: false }],
+      },
+    });
+
+    const ipv6AddressCountInput = wrapper.findComponent('[data-testid="amazonEc2__ipv6AddressCount"]');
+
+    expect(wrapper.vm.enableIpv6).toBe(false);
+    expect(ipv6AddressCountInput.exists()).toBe(false);
+  });
+
+  it('should emit a validationChanged: false event when created with ipv6 enabled while some other pools have ipv6 disabled', async() => {
+    const wrapper = shallowMount(EC2Networking, {
+      ...defaultCreateSetup,
+      propsData: {
+        ...defaultCreateSetup.propsData,
+        machinePools: [{ hasIpv6: true }, { hasIpv6: false }],
+      },
+    });
+
+    expect(wrapper.emitted('validationChanged')?.[0][0]).toBe(false);
+  });
+
+  it('should emit a validationChanged: true event when created with ipv6 enabled while all other pools also have ipv6 enabled', async() => {
+    const wrapper = shallowMount(EC2Networking, {
+      ...defaultCreateSetup,
+      propsData: {
+        ...defaultCreateSetup.propsData,
+        machinePools: [{ hasIpv6: true }, { hasIpv6: true }],
+      },
+    });
+
+    expect(wrapper.emitted('validationChanged')?.[0][0]).toBe(true);
+  });
 });

package/mixins/__tests__/chart.test.ts

@@ -238,5 +238,26 @@ describe('chartMixin', () => {
         icon: 'icon-downgrade-alt',
       });
     });
+
+    it('should return "upgrade" action when upgrading from a pre-release to a stable version', () => {
+      const wrapper = mount(DummyComponent, {
+        data: () => ({
+          existing: { spec: { chart: { metadata: { version: '1.0.0-rc1' } } } },
+          version:  { version: '1.0.0' }
+        }),
+        global: {
+          mocks: {
+            $store: mockStore,
+            $route: { query: {} }
+          }
+        }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'upgrade',
+        tKey: 'upgrade',
+        icon: 'icon-upgrade-alt',
+      });
+    });
   });
 });

package/mixins/chart.js

@@ -10,7 +10,7 @@ import { NAME as MANAGER } from '@shell/config/product/manager';
 import { OPA_GATE_KEEPER_ID } from '@shell/pages/c/_cluster/gatekeeper/index.vue';
 import { formatSi, parseSi } from '@shell/utils/units';
 import { CAPI, CATALOG } from '@shell/config/types';
-import { isPrerelease, compare } from '@shell/utils/version';
+import { isPrerelease, compare, isUpgradeFromPreToStable } from '@shell/utils/version';
 import difference from 'lodash/difference';
 import { LINUX, APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import { clone } from '@shell/utils/object';
@@ -240,6 +240,12 @@ export default {
         };
       }
 
+      if (isUpgradeFromPreToStable(this.currentVersion, this.targetVersion)) {
+        return {
+          name: 'upgrade', tKey: 'upgrade', icon: 'icon-upgrade-alt'
+        };
+      }
+
       if (compare(this.currentVersion, this.targetVersion) < 0) {
         return {
           name: 'upgrade', tKey: 'upgrade', icon: 'icon-upgrade-alt'

package/models/provisioning.cattle.io.cluster.js

@@ -369,7 +369,11 @@ export default class ProvCluster extends SteveModel {
   }
 
   get mgmtClusterId() {
-    return this.status?.clusterName;
+    // when a cluster is created `this` instance isn't immediately updated with `status.clusterName`
+    // Workaround - Get fresh copy from the store
+    const pCluster = this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, this.id);
+
+    return this.status?.clusterName || pCluster?.status?.clusterName;
   }
 
   get mgmt() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.8-rc.6",
+  "version": "3.0.8-rc.8",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/c/_cluster/manager/hostedprovider/index.vue

@@ -160,6 +160,11 @@ export default {
       :type-display="t('providers.hosted.title')"
       :is-creatable="false"
     />
+    <Banner
+      color="warning"
+      :label="t('providers.hosted.warning')"
+      :closable="false"
+    />
     <Banner
       v-for="(err, i) in errors"
       :key="i"

package/pages/home.vue

@@ -7,6 +7,8 @@ import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue
 import { BadgeState } from '@components/BadgeState';
 import CommunityLinks from '@shell/components/CommunityLinks.vue';
 import SingleClusterInfo from '@shell/components/SingleClusterInfo.vue';
+import DynamicContentBanner from '@shell/components/DynamicContent/DynamicContentBanner.vue';
+import DynamicContentPanel from '@shell/components/DynamicContent/DynamicContentPanel.vue';
 import { mapGetters, mapState } from 'vuex';
 import { MANAGEMENT, CAPI, COUNT } from '@shell/config/types';
 import { NAME as MANAGER } from '@shell/config/product/manager';
@@ -47,6 +49,8 @@ export default defineComponent({
     SingleClusterInfo,
     TabTitle,
     ResourceTable,
+    DynamicContentBanner,
+    DynamicContentPanel,
   },
 
   mixins: [PageHeaderActions, Preset],
@@ -298,8 +302,11 @@ export default defineComponent({
         return Promise.resolve({});
       }
 
+      const promises = [];
+
       if ( this.canViewMgmtClusters ) {
-        this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
+        // This is the only one we need to block on (needed for the initial sort on mgmt name)
+        promises.push(this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER }));
       }
 
       if ( this.canViewMachine ) {
@@ -319,7 +326,7 @@ export default defineComponent({
         this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
       }
 
-      return Promise.resolve({});
+      return Promise.all(promises);
     },
 
     async fetchPageSecondaryResources({
@@ -609,6 +616,7 @@ export default defineComponent({
       pref-key="welcomeBanner"
       data-testid="home-banner-graphic"
     />
+    <DynamicContentBanner location="banner" />
     <IndentedPanel class="mt-20 mb-20">
       <div class="row home-panels">
         <div class="col main-panel">
@@ -935,7 +943,10 @@ export default defineComponent({
             </div>
           </div>
         </div>
-        <CommunityLinks class="col span-3 side-panel" />
+        <div class="col span-3 side-panel">
+          <CommunityLinks />
+          <DynamicContentPanel location="rhs" />
+        </div>
       </div>
     </IndentedPanel>
   </div>

package/pkg/dynamic-importer.lib.js

@@ -25,6 +25,10 @@ export function importDetail(name) {
   return () => undefined;
 }
 
+export function importDrawer(name) {
+  return () => undefined;
+}
+
 export function importEdit(name) {
   return () => undefined;
 }