@rancher/shell 0.1.0 → 0.1.1

package/edit/networking.k8s.io.ingress/Rule.vue

@@ -1,6 +1,6 @@
 <script>
 import RulePath from '@shell/edit/networking.k8s.io.ingress/RulePath';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import { random32 } from '@shell/utils/string';
 
 export default {
@@ -19,6 +19,15 @@ export default {
     ingress: {
       type:     Object,
       required: true
+    },
+    rules: {
+      default: () => ({
+        requestHost:   [],
+        path:        [],
+        port:        [],
+        target:      []
+      }),
+      type: Object,
     }
   },
   data() {
@@ -41,10 +50,30 @@ export default {
       } else {
         delete out.host;
       }
-      this.$emit('input', out);
+
+      this.$nextTick(() => {
+        if ((this.paths?.length === 1 && this.pathObjectIsEmpty(this.paths[0])) || this.paths?.length === 0) {
+          delete out.http;
+        }
+        this.$emit('input', out);
+      });
+    },
+    pathObjectIsEmpty(pathObject) {
+      const servicePort = Number.parseInt(pathObject.servicePort) || pathObject.servicePort;
+      const serviceName = pathObject.serviceName;
+      const path = pathObject.path;
+      const pathType = pathObject.pathType;
+
+      if (!servicePort && !serviceName && !path && pathType === 'Prefix') {
+        return true;
+      }
+
+      return false;
     },
     addPath(ev) {
-      ev.preventDefault();
+      if (ev) {
+        ev.preventDefault();
+      }
       this.paths = [...this.paths, { id: random32(1) }];
       this.$nextTick(() => {
         if (this.$refs.paths && this.$refs.paths.length > 0) {
@@ -52,6 +81,7 @@ export default {
 
           path.focus();
         }
+        this.update();
       });
     },
     removePath(idx) {
@@ -59,12 +89,16 @@ export default {
 
       neu.splice(idx, 1);
       this.paths = neu;
+      this.update();
     },
     removeRule() {
       this.$emit('remove');
     },
     focus() {
       this.$refs.host.focus();
+    },
+    makePathKey(i) {
+      return JSON.stringify(this.paths[i]);
     }
   },
 };
@@ -79,10 +113,11 @@ export default {
           v-model="host"
           :label="t('ingress.rules.requestHost.label')"
           :placeholder="t('ingress.rules.requestHost.placeholder')"
+          :rules="rules.requestHost"
           @input="update"
         />
       </div>
-      <div id="host" class="col span-5"></div>
+      <div id="spacer" class="col span-5"></div>
     </div>
     <div class="rule-path-headings row">
       <div class="col" :class="{'span-6': ingress.showPathType, 'span-4': !ingress.showPathType}">
@@ -96,15 +131,16 @@ export default {
       </div>
       <div class="col" />
     </div>
-    <template v-for="(_, i) in paths">
+    <template v-for="(path, i) in paths">
       <RulePath
         ref="paths"
-        :key="i"
+        :key="path.id"
         v-model="paths[i]"
         class="row mb-10"
         :rule-mode="ruleMode"
         :service-targets="serviceTargets"
         :ingress="ingress"
+        :rules="{path: rules.path, port: rules.port, target: rules.target}"
         @remove="(e) => removePath(i)"
         @input="update"
       />

package/edit/networking.k8s.io.ingress/RulePath.vue

@@ -1,6 +1,6 @@
 <script>
 import InputWithSelect from '@shell/components/form/InputWithSelect';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import Select from '@shell/components/form/Select';
 import { get, set } from '@shell/utils/object';
 import debounce from 'lodash/debounce';
@@ -23,6 +23,14 @@ export default {
     ingress: {
       type:     Object,
       required: true
+    },
+    rules: {
+      default: () => ({
+        path:        [],
+        port:        [],
+        target:      []
+      }),
+      type: Object,
     }
   },
   data() {
@@ -52,14 +60,14 @@ export default {
       return service?.ports || [];
     },
     serviceTargetStatus() {
-      const serviceName = this.serviceName.label || this.serviceName;
+      const serviceName = this.serviceName?.label || this.serviceName;
       const isValueAnOption = !serviceName || this.serviceTargets.find(target => serviceName === target.value);
 
       return isValueAnOption ? null : 'warning';
     },
     serviceTargetTooltip() {
       return this.serviceTargetStatus === 'warning' ? this.t('ingress.rules.target.doesntExist') : null;
-    }
+    },
   },
   created() {
     this.queueUpdate = debounce(this.update, 500);
@@ -70,7 +78,7 @@ export default {
       const servicePort = Number.parseInt(this.servicePort) || this.servicePort;
       const serviceName = this.serviceName.label || this.serviceName;
       const out = {
-        backend: {}, path: this.path, pathType: this.pathType
+        id: this.value.id, backend: {}, path: this.path, pathType: this.pathType
       };
 
       set(out.backend, this.ingress.servicePortPath, servicePort);
@@ -85,6 +93,10 @@ export default {
     },
     focus() {
       this.$refs.first.focus();
+    },
+    remove(ev) {
+      ev.preventDefault();
+      this.$emit('remove');
     }
   }
 };
@@ -100,6 +112,7 @@ export default {
         :select-value="value.pathType"
         :text-value="value.path"
         :searchable="false"
+        :text-rules="rules.path"
         @input="queueUpdatePathTypeAndPath"
       />
     </div>
@@ -124,7 +137,9 @@ export default {
       <LabeledInput
         v-if="portOptions.length === 0"
         v-model="servicePort"
+        class="fullHeightInput"
         :placeholder="t('ingress.rules.port.placeholder')"
+        :rules="rules.port"
         @input="queueUpdate"
       />
       <Select
@@ -132,15 +147,24 @@ export default {
         v-model="servicePort"
         :options="portOptions"
         :placeholder="t('ingress.rules.port.placeholder')"
+        :rules="rules.port"
         @input="queueUpdate"
       />
     </div>
-    <button class="btn btn-sm role-link col" @click="$emit('remove')">
+    <button class="btn btn-sm role-link col" @click="remove">
       {{ t('ingress.rules.removePath') }}
     </button>
   </div>
 </template>
 <style lang="scss" scoped>
+.labeled-input ::v-deep, ::v-deep .labeled-input {
+  padding: 0 !important;
+  height: 100%;
+  input.no-label {
+    height: calc($input-height - 2px);
+    padding: 10px;
+  }
+}
 .rule-path ::v-deep {
   .col {
     height: $input-height;

package/edit/networking.k8s.io.ingress/Rules.vue

@@ -32,6 +32,16 @@ export default {
       type:    Array,
       default: () => []
     },
+
+    rules: {
+      default: () => ({
+        requestHost:   [],
+        path:        [],
+        port:        [],
+        target:      []
+      }),
+      type: Object,
+    }
   },
 
   async fetch() {
@@ -126,6 +136,7 @@ export default {
           v-model="props.row.value"
           :service-targets="serviceTargets"
           :ingress="value"
+          :rules="rules"
         />
       </template>
     </ArrayListGrouped>

package/edit/networking.k8s.io.ingress/index.vue

@@ -1,21 +1,25 @@
 <script>
 import { allHash } from '@shell/utils/promise';
-import { SECRET, SERVICE } from '@shell/config/types';
+import { SECRET, SERVICE, INGRESS_CLASS } from '@shell/config/types';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import CreateEditView from '@shell/mixins/create-edit-view';
+import FormValidation from '@shell/mixins/form-validation';
 import Tab from '@shell/components/Tabbed/Tab';
 import CruResource from '@shell/components/CruResource';
 import Labels from '@shell/components/form/Labels';
+import Error from '@shell/components/form/Error';
 import Tabbed from '@shell/components/Tabbed';
 import { get, set } from '@shell/utils/object';
 import { SECRET_TYPES as TYPES } from '@shell/config/secret';
 import DefaultBackend from './DefaultBackend';
 import Certificates from './Certificates';
 import Rules from './Rules';
+import IngressClass from './IngressClass';
 
 export default {
   name:       'CRUIngress',
   components: {
+    IngressClass,
     Certificates,
     CruResource,
     DefaultBackend,
@@ -23,9 +27,10 @@ export default {
     NameNsDescription,
     Rules,
     Tab,
-    Tabbed
+    Tabbed,
+    Error
   },
-  mixins: [CreateEditView],
+  mixins: [CreateEditView, FormValidation],
   props:  {
     value: {
       type:    Object,
@@ -40,17 +45,91 @@ export default {
   },
   async fetch() {
     const hash = await allHash({
-      secrets:  this.$store.dispatch('cluster/findAll', { type: SECRET }),
-      services: this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      secrets:        this.$store.dispatch('cluster/findAll', { type: SECRET }),
+      services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      ingressClasses: this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }),
     });
 
     this.allServices = hash.services;
     this.allSecrets = hash.secrets;
+    this.allIngressClasses = hash.ingressClasses;
   },
   data() {
-    return { allSecrets: [], allServices: [] };
+    return {
+      allSecrets:        [],
+      allServices:       [],
+      allIngressClasses: [],
+      fvFormRuleSets:    [
+        {
+          path: 'metadata.name', rules: ['required', 'hostname'], translationKey: 'nameNsDescription.name.label'
+        },
+        {
+          path: 'spec.rules.host', rules: ['hostname'], translationKey: 'ingress.rules.requestHost.label'
+        },
+        {
+          path: 'spec.rules.http.paths.path', rules: ['absolutePath'], translationKey: 'ingress.rules.path.label'
+        },
+        {
+          path: 'spec.rules.http.paths.backend.service.port.number', rules: ['required'], translationKey: 'ingress.rules.port.label'
+        },
+        {
+          path: 'spec.rules.http.paths.backend.service.name', rules: ['required'], translationKey: 'ingress.rules.target.label'
+        },
+        { path: 'spec', rules: ['backEndOrRules'] },
+        {
+          path: 'spec.defaultBackend.service.name', rules: ['required'], translationKey: 'ingress.defaultBackend.targetService.label'
+        },
+        {
+          path: 'spec.defaultBackend.service.port.number', rules: ['required', 'requiredInt', 'portNumber'], translationKey: 'ingress.defaultBackend.port.label'
+        },
+        { path: 'spec.tls.hosts', rules: ['required', 'hostname'] }
+      ],
+      fvReportedValidationPaths: ['spec.rules.http.paths.backend.service.port.number', 'spec.rules.http.paths.path', 'spec.rules.http.paths.backend.service.name']
+    };
   },
   computed: {
+    fvExtraRules() {
+      const backEndOrRules = (spec) => {
+        const { rules = [], defaultBackend } = spec;
+
+        const validRules = rules.length > 0;
+        const validDefaultBackend = !!defaultBackend?.service;
+
+        if (!validRules && !validDefaultBackend) {
+          return this.t('ingress.rulesOrBackendSpecified');
+        }
+      };
+
+      return { backEndOrRules };
+    },
+    tabErrors() {
+      return {
+        rules:          this.fvGetPathErrors(['spec.rules.host', 'spec.rules.http.paths.path', 'spec.rules.http.paths.backend.service.port.number', 'spec.rules.http.paths.backend.service.name'])?.length > 0,
+        defaultBackend: this.fvGetPathErrors(['spec.defaultBackend.service.name', 'spec.defaultBackend.service.port.number'])?.length > 0
+      };
+    },
+    rulesPathRules() {
+      return {
+        requestHost: this.fvGetAndReportPathRules('spec.rules.host'),
+        path:        this.fvGetAndReportPathRules('spec.rules.http.paths.path'),
+        port:        this.fvGetAndReportPathRules('spec.rules.http.paths.backend.service.port.number'),
+        target:      this.fvGetAndReportPathRules('spec.rules.http.paths.backend.service.name'),
+
+      };
+    },
+    defaultBackendPathRules() {
+      const rulesExist = (this.value?.spec?.rules || []).length > 0;
+      const defaultBackendExist = !!this.value?.spec?.defaultBackend?.service;
+
+      if (!rulesExist || defaultBackendExist) {
+        return {
+          name: this.fvGetAndReportPathRules('spec.defaultBackend.service.name'),
+          port: this.fvGetAndReportPathRules('spec.defaultBackend.service.port.number'),
+        };
+      }
+
+      return { name: [], port: [] };
+    },
     serviceTargets() {
       return this.filterByCurrentResourceNamespace(this.allServices)
         .map(service => ({
@@ -69,6 +148,12 @@ export default {
         return id.slice(id.indexOf('/') + 1);
       });
     },
+    ingressClasses() {
+      return this.allIngressClasses.map(ingressClass => ({
+        label: ingressClass.metadata.name,
+        value: ingressClass.metadata.name,
+      }));
+    },
   },
   created() {
     this.$set(this.value, 'spec', this.value.spec || {});
@@ -109,8 +194,8 @@ export default {
     :mode="mode"
     :resource="value"
     :subtypes="[]"
-    :validation-passed="true"
-    :errors="errors"
+    :validation-passed="fvFormIsValid"
+    :errors="fvUnreportedValidationErrors"
     @error="e=>errors = e"
     @finish="save"
     @cancel="done"
@@ -118,19 +203,23 @@ export default {
     <NameNsDescription
       v-if="!isView"
       :value="value"
+      :rules="{name: fvGetAndReportPathRules('metadata.name'), namespace: fvGetAndReportPathRules('metadata.namespace'), description: []}"
       :mode="mode"
       :register-before-hook="registerBeforeHook"
     />
-
+    <Error :value="value.spec" :rules="fvGetAndReportPathRules('spec')" as-banner />
     <Tabbed :side-tabs="true">
-      <Tab :label="firstTabLabel" name="rules" :weight="3">
-        <Rules v-model="value" :mode="mode" :service-targets="serviceTargets" :certificates="certificates" />
+      <Tab :label="firstTabLabel" name="rules" :weight="4" :error="tabErrors.rules">
+        <Rules v-model="value" :mode="mode" :service-targets="serviceTargets" :certificates="certificates" :rules="rulesPathRules" />
+      </Tab>
+      <Tab :label="t('ingress.defaultBackend.label')" name="default-backend" :weight="3" :error="tabErrors.defaultBackend">
+        <DefaultBackend v-model="value" :service-targets="serviceTargets" :mode="mode" :rules="defaultBackendPathRules" />
       </Tab>
-      <Tab :label="t('ingress.defaultBackend.label')" name="default-backend" :weight="2">
-        <DefaultBackend v-model="value" :service-targets="serviceTargets" :mode="mode" />
+      <Tab v-if="!isView" :label="t('ingress.certificates.label')" name="certificates" :weight="2">
+        <Certificates v-model="value" :mode="mode" :certificates="certificates" :rules="{host: fvGetAndReportPathRules('spec.tls.hosts')}" />
       </Tab>
-      <Tab v-if="!isView" :label="t('ingress.certificates.label')" name="certificates" :weight="1">
-        <Certificates v-model="value" :mode="mode" :certificates="certificates" />
+      <Tab :label="t('ingress.ingressClass.label')" name="ingress-class" :weight="1">
+        <IngressClass v-model="value" :mode="mode" :ingress-classes="ingressClasses" />
       </Tab>
       <Tab
         v-if="!isView"

package/edit/networking.k8s.io.networkpolicy/PolicyRulePort.vue

@@ -1,6 +1,6 @@
 <script>
 
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { _EDIT } from '@shell/config/query-params';
 

package/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue

@@ -1,13 +1,13 @@
 <script>
 
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { _EDIT } from '@shell/config/query-params';
 import MatchExpressions from '@shell/components/form/MatchExpressions';
 import { convert, matching, simplify } from '@shell/utils/selector';
 import { POD } from '@shell/config/types';
 import ArrayList from '@shell/components/form/ArrayList';
-import Banner from '@shell/components/Banner';
+import { Banner } from '@components/Banner';
 import throttle from 'lodash/throttle';
 import { isValidCIDR } from '@shell/utils/validators/cidr';
 

package/edit/networking.k8s.io.networkpolicy/index.vue

@@ -5,11 +5,11 @@ import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Tab from '@shell/components/Tabbed/Tab';
 import Tabbed from '@shell/components/Tabbed';
 import CruResource from '@shell/components/CruResource';
-import Banner from '@shell/components/Banner';
+import { Banner } from '@components/Banner';
 import Labels from '@shell/components/form/Labels';
 import { NAMESPACE, POD } from '@shell/config/types';
 import { convert, matching, simplify } from '@shell/utils/selector';
-import Checkbox from '@shell/components/form/Checkbox';
+import { Checkbox } from '@components/Form/Checkbox';
 import { addObject, removeObject } from '@shell/utils/array';
 import MatchExpressions from '@shell/components/form/MatchExpressions';
 import PolicyRules from '@shell/edit/networking.k8s.io.networkpolicy/PolicyRules';

package/edit/persistentvolume/index.vue

@@ -9,7 +9,7 @@ import MatchExpressions from '@shell/components/form/MatchExpressions';
 import Tab from '@shell/components/Tabbed/Tab';
 import Tabbed from '@shell/components/Tabbed';
 import NodeAffinity from '@shell/components/form/NodeAffinity';
-import Checkbox from '@shell/components/form/Checkbox';
+import { Checkbox } from '@components/Form/Checkbox';
 import uniq from 'lodash/uniq';
 import UnitInput from '@shell/components/form/UnitInput';
 import { NODE, PVC, STORAGE_CLASS } from '@shell/config/types';

package/edit/persistentvolume/plugins/awsElasticBlockStore.vue

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: { LabeledInput, RadioGroup },

package/edit/persistentvolume/plugins/azureDisk.vue

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: { LabeledInput, RadioGroup },

package/edit/persistentvolume/plugins/azureFile.vue

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: { LabeledInput, RadioGroup },

package/edit/persistentvolume/plugins/cephfs.vue

@@ -1,11 +1,11 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 import ArrayList from '@shell/components/form/ArrayList';
 
 export default {
-  components: {
-    ArrayList, LabeledInput, RadioGroup
+  components: {
+    ArrayList, LabeledInput, RadioGroup
   },
   props:      {
     value:      {

package/edit/persistentvolume/plugins/cinder.vue

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: { LabeledInput, RadioGroup },

package/edit/persistentvolume/plugins/csi.vue

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 import KeyValue from '@shell/components/form/KeyValue';
 
 export default {

package/edit/persistentvolume/plugins/fc.vue

@@ -1,11 +1,11 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 import ArrayList from '@shell/components/form/ArrayList';
 
 export default {
-  components: {
-    ArrayList, LabeledInput, RadioGroup
+  components: {
+    ArrayList, LabeledInput, RadioGroup
   },
   props:      {
     value:      {

package/edit/persistentvolume/plugins/flexVolume.vue

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 import KeyValue from '@shell/components/form/KeyValue';
 
 export default {

package/edit/persistentvolume/plugins/flocker.vue

@@ -1,5 +1,5 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 
 export default {
   components: { LabeledInput },

package/edit/persistentvolume/plugins/gcePersistentDisk.vue

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: { LabeledInput, RadioGroup },

package/edit/persistentvolume/plugins/glusterfs.vue

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: { RadioGroup, LabeledInput },

package/edit/persistentvolume/plugins/hostPath.vue

@@ -1,5 +1,5 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 
 export default {

package/edit/persistentvolume/plugins/iscsi.vue

@@ -1,11 +1,11 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 import ArrayList from '@shell/components/form/ArrayList';
 
 export default {
-  components: {
-    ArrayList, LabeledInput, RadioGroup
+  components: {
+    ArrayList, LabeledInput, RadioGroup
   },
   props:      {
     value:      {

package/edit/persistentvolume/plugins/local.vue

@@ -1,5 +1,5 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 
 export default {
   components: { LabeledInput },

package/edit/persistentvolume/plugins/longhorn.vue

@@ -1,7 +1,7 @@
 <script>
 import KeyValue from '@shell/components/form/KeyValue';
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 import { _CREATE } from '@shell/config/query-params';
 import { LONGHORN_DRIVER } from '@shell/models/persistentvolume';
 

package/edit/persistentvolume/plugins/nfs.vue

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: { LabeledInput, RadioGroup },