OCPNETUI-179: Migrate to @openshift/api-types

.eslintrc.json

@@ -64,7 +64,7 @@
     ],
     "react/display-name": "off",
     "react/prop-types": "off",
-    "simple-import-sort/exports": "error",
+    "simple-import-sort/exports": "off",
     "simple-import-sort/imports": [
       "warn",
       {

package.json

@@ -29,7 +29,6 @@
     "shared-modules:sync": "./scripts/align-shared-modules.sh"
   },
   "dependencies": {
-    "@kubevirt-ui/kubevirt-api": "^1.4.2",
     "@openshift-console/dynamic-plugin-sdk": "4.19.1",
     "@openshift-console/dynamic-plugin-sdk-internal": "4.19.0",
     "@patternfly/quickstarts": "6.4.0",
@@ -78,6 +77,7 @@
   },
   "devDependencies": {
     "@cypress/webpack-preprocessor": "^5.15.5",
+    "@openshift/api-types": "1.0.0",
     "@openshift-console/dynamic-plugin-sdk-webpack": "4.19.0",
     "@openshift/dynamic-plugin-sdk-webpack": "4.0.2",
     "@types/js-yaml": "^4.0.9",

src/templates/ingress.ts

@@ -1,4 +1,4 @@
-import { IngressModel } from '@kubevirt-ui/kubevirt-api/console';
+import { IngressModel } from '@utils/models';
 
 export const IngressYAMLTemplates = `
 apiVersion: ${IngressModel.apiGroup}/${IngressModel.apiVersion}

src/templates/nads.ts

@@ -1,4 +1,4 @@
-import NetworkAttachmentDefinitionModel from '@kubevirt-ui/kubevirt-api/console/models/NetworkAttachmentDefinitionModel';
+import { NetworkAttachmentDefinitionModel } from '@utils/models';
 
 export const NetworkAttachmentDefinitionsYAMLTemplates = `
 apiVersion: ${NetworkAttachmentDefinitionModel.apiGroup}/${NetworkAttachmentDefinitionModel.apiVersion}

src/templates/route.ts

@@ -1,4 +1,4 @@
-import { RouteModel } from '@kubevirt-ui/kubevirt-api/console';
+import { RouteModel } from '@utils/models';
 
 export const RouteYAMLTemplates = `
 apiVersion: ${RouteModel.apiGroup}/${RouteModel.apiVersion}

src/templates/service.ts

@@ -1,4 +1,4 @@
-import { ServiceModel } from '@kubevirt-ui/kubevirt-api/console';
+import { ServiceModel } from '@utils/models';
 
 export const ServiceYAMLTemplates = `
 apiVersion: ${ServiceModel.apiVersion}

src/utils/hooks/useClusterNetworkFeatures.ts

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 
-import { ConfigMapModel, modelToGroupVersionKind } from '@kubevirt-ui/kubevirt-api/console';
 import { K8sResourceKind, useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
+import { ConfigMapModel, getGroupVersionKindForModel } from '@utils/models';
 
 const networkConfigMapName = 'openshift-network-features';
 const networkConfigMapNamespace = 'openshift-config-managed';
@@ -37,7 +37,7 @@ export const useClusterNetworkFeatures = (): [ClusterNetworkFeatures, boolean] =
   const [featuresLoaded, setFeaturesLoaded] = useState(false);
 
   const [config, configLoaded] = useK8sWatchResource<K8sResourceKind>({
-    groupVersionKind: modelToGroupVersionKind(ConfigMapModel),
+    groupVersionKind: getGroupVersionKindForModel(ConfigMapModel),
     name: networkConfigMapName,
     namespace: networkConfigMapNamespace,
   });

src/utils/models/index.ts

@@ -1,6 +1,12 @@
+export * from './k8sModels';
 export * from './network-policy';
-import { modelToGroupVersionKind, modelToRef } from '@kubevirt-ui/kubevirt-api/console';
+
+import { getGroupVersionKindForModel } from '@openshift-console/dynamic-plugin-sdk';
 import { K8sModel } from '@openshift-console/dynamic-plugin-sdk';
+import { getReferenceForModel } from '@utils/resources/shared';
+
+export { getGroupVersionKindForModel } from '@openshift-console/dynamic-plugin-sdk';
+export { getReferenceForModel } from '@utils/resources/shared';
 
 export const QuickStartModel: K8sModel = {
   abbr: 'CQS',
@@ -76,8 +82,8 @@ export const UserDefinedNetworkModel: K8sModel = {
 };
 
 export const UserDefinedNetworkModelGroupVersionKind =
-  modelToGroupVersionKind(UserDefinedNetworkModel);
-export const UserDefinedNetworkModelRef = modelToRef(UserDefinedNetworkModel);
+  getGroupVersionKindForModel(UserDefinedNetworkModel);
+export const UserDefinedNetworkModelRef = getReferenceForModel(UserDefinedNetworkModel);
 
 export const ClusterUserDefinedNetworkModel: K8sModel = {
   abbr: 'CUDN',
@@ -96,7 +102,52 @@ export const ClusterUserDefinedNetworkModel: K8sModel = {
   plural: 'clusteruserdefinednetworks',
 };
 
-export const ClusterUserDefinedNetworkModelGroupVersionKind = modelToGroupVersionKind(
+export const ClusterUserDefinedNetworkModelGroupVersionKind = getGroupVersionKindForModel(
+  ClusterUserDefinedNetworkModel,
+);
+export const ClusterUserDefinedNetworkModelRef = getReferenceForModel(
   ClusterUserDefinedNetworkModel,
 );
-export const ClusterUserDefinedNetworkModelRef = modelToRef(ClusterUserDefinedNetworkModel);
+
+export const NetworkAttachmentDefinitionModelGroupVersionKind = getGroupVersionKindForModel(
+  // Avoid circular: import directly
+  {
+    abbr: 'NAD',
+    apiGroup: 'k8s.cni.cncf.io',
+    apiVersion: 'v1',
+    kind: 'NetworkAttachmentDefinition',
+    label: 'Network Attachment Definition',
+    labelPlural: 'Network Attachment Definitions',
+    plural: 'network-attachment-definitions',
+  },
+);
+
+export const NetworkAttachmentDefinitionModelRef = getReferenceForModel({
+  abbr: 'NAD',
+  apiGroup: 'k8s.cni.cncf.io',
+  apiVersion: 'v1',
+  kind: 'NetworkAttachmentDefinition',
+  label: 'Network Attachment Definition',
+  labelPlural: 'Network Attachment Definitions',
+  plural: 'network-attachment-definitions',
+});
+
+export const SriovNetworkNodePolicyModelRef = getReferenceForModel({
+  abbr: 'SRNNPM',
+  apiGroup: 'sriovnetwork.openshift.io',
+  apiVersion: 'v1',
+  kind: 'SriovNetworkNodePolicy',
+  label: 'SriovNetworkNodePolicy',
+  labelPlural: 'SriovNetworkNodePolicies',
+  plural: 'sriovnetworknodepolicies',
+});
+
+export const HyperConvergedModelRef = getReferenceForModel({
+  abbr: 'HC',
+  apiGroup: 'hco.kubevirt.io',
+  apiVersion: 'v1beta1',
+  kind: 'HyperConverged',
+  label: 'HyperConverged',
+  labelPlural: 'HyperConvergeds',
+  plural: 'hyperconvergeds',
+});

src/utils/models/k8sModels.ts

@@ -0,0 +1,180 @@
+import { K8sModel } from '@openshift-console/dynamic-plugin-sdk';
+
+const NS = 'plugin__networking-console-plugin';
+
+export const ServiceModel: K8sModel = {
+  abbr: 'S',
+  apiVersion: 'v1',
+  id: 'service',
+  kind: 'Service',
+  label: 'Service',
+  labelKey: `${NS}~Service`,
+  labelPlural: 'Services',
+  labelPluralKey: `${NS}~Services`,
+  namespaced: true,
+  plural: 'services',
+};
+
+export const PodModel: K8sModel = {
+  abbr: 'P',
+  apiVersion: 'v1',
+  id: 'pod',
+  kind: 'Pod',
+  label: 'Pod',
+  labelKey: `${NS}~Pod`,
+  labelPlural: 'Pods',
+  labelPluralKey: `${NS}~Pods`,
+  namespaced: true,
+  plural: 'pods',
+};
+
+export const NamespaceModel: K8sModel = {
+  abbr: 'NS',
+  apiVersion: 'v1',
+  id: 'namespace',
+  kind: 'Namespace',
+  label: 'Namespace',
+  labelKey: `${NS}~Namespace`,
+  labelPlural: 'Namespaces',
+  labelPluralKey: `${NS}~Namespaces`,
+  plural: 'namespaces',
+};
+
+export const ProjectModel: K8sModel = {
+  abbr: 'PR',
+  apiGroup: 'project.openshift.io',
+  apiVersion: 'v1',
+  id: 'project',
+  kind: 'Project',
+  label: 'Project',
+  labelKey: `${NS}~Project`,
+  labelPlural: 'Projects',
+  labelPluralKey: `${NS}~Projects`,
+  plural: 'projects',
+};
+
+export const ProjectRequestModel: K8sModel = {
+  abbr: '',
+  apiGroup: 'project.openshift.io',
+  apiVersion: 'v1',
+  id: 'projectrequest',
+  kind: 'ProjectRequest',
+  label: 'ProjectRequest',
+  labelKey: `${NS}~ProjectRequest`,
+  labelPlural: 'ProjectRequests',
+  labelPluralKey: `${NS}~ProjectRequests`,
+  plural: 'projectrequests',
+};
+
+export const IngressModel: K8sModel = {
+  abbr: 'I',
+  apiGroup: 'networking.k8s.io',
+  apiVersion: 'v1',
+  id: 'ingress',
+  kind: 'Ingress',
+  label: 'Ingress',
+  labelKey: `${NS}~Ingress`,
+  labelPlural: 'Ingresses',
+  labelPluralKey: `${NS}~Ingresses`,
+  namespaced: true,
+  plural: 'ingresses',
+};
+
+export const RouteModel: K8sModel = {
+  abbr: 'RT',
+  apiGroup: 'route.openshift.io',
+  apiVersion: 'v1',
+  id: 'route',
+  kind: 'Route',
+  label: 'Route',
+  labelKey: `${NS}~Route`,
+  labelPlural: 'Routes',
+  labelPluralKey: `${NS}~Routes`,
+  namespaced: true,
+  plural: 'routes',
+};
+
+export const ConfigMapModel: K8sModel = {
+  abbr: 'CM',
+  apiVersion: 'v1',
+  id: 'configmap',
+  kind: 'ConfigMap',
+  label: 'ConfigMap',
+  labelKey: `${NS}~ConfigMap`,
+  labelPlural: 'ConfigMaps',
+  labelPluralKey: `${NS}~ConfigMaps`,
+  namespaced: true,
+  plural: 'configmaps',
+};
+
+export const NetworkPolicyModel: K8sModel = {
+  abbr: 'NP',
+  apiGroup: 'networking.k8s.io',
+  apiVersion: 'v1',
+  id: 'networkpolicy',
+  kind: 'NetworkPolicy',
+  label: 'NetworkPolicy',
+  labelKey: `${NS}~NetworkPolicy`,
+  labelPlural: 'NetworkPolicies',
+  labelPluralKey: `${NS}~NetworkPolicies`,
+  namespaced: true,
+  plural: 'networkpolicies',
+};
+
+export const NetworkAttachmentDefinitionModel: K8sModel = {
+  abbr: 'NAD',
+  apiGroup: 'k8s.cni.cncf.io',
+  apiVersion: 'v1',
+  crd: true,
+  id: 'network-attachment-definition',
+  kind: 'NetworkAttachmentDefinition',
+  label: 'Network Attachment Definition',
+  labelKey: `${NS}~Network Attachment Definition`,
+  labelPlural: 'Network Attachment Definitions',
+  labelPluralKey: `${NS}~Network Attachment Definitions`,
+  legacyPluralURL: true,
+  namespaced: true,
+  plural: 'network-attachment-definitions',
+};
+
+export const SriovNetworkNodePolicyModel: K8sModel = {
+  abbr: 'SRNNPM',
+  apiGroup: 'sriovnetwork.openshift.io',
+  apiVersion: 'v1',
+  crd: true,
+  id: 'sriov-network-node-policy',
+  kind: 'SriovNetworkNodePolicy',
+  label: 'SriovNetworkNodePolicy',
+  labelKey: `${NS}~SriovNetworkNodePolicy`,
+  labelPlural: 'SriovNetworkNodePolicies',
+  labelPluralKey: `${NS}~SriovNetworkNodePolicies`,
+  namespaced: true,
+  plural: 'sriovnetworknodepolicies',
+};
+
+export const SecretModel: K8sModel = {
+  abbr: 'S',
+  apiVersion: 'v1',
+  id: 'secret',
+  kind: 'Secret',
+  label: 'Secret',
+  labelKey: `${NS}~Secret`,
+  labelPlural: 'Secrets',
+  labelPluralKey: `${NS}~Secrets`,
+  namespaced: true,
+  plural: 'secrets',
+};
+
+export const HyperConvergedModel: K8sModel = {
+  abbr: 'HC',
+  apiGroup: 'hco.kubevirt.io',
+  apiVersion: 'v1beta1',
+  crd: true,
+  kind: 'HyperConverged',
+  label: 'HyperConverged',
+  labelKey: `${NS}~HyperConverged`,
+  labelPlural: 'HyperConvergeds',
+  labelPluralKey: `${NS}~HyperConvergeds`,
+  namespaced: true,
+  plural: 'hyperconvergeds',
+};