@openshift-assisted/ui-lib 2.37.2 → 2.38.0

package/lib/ocm/services/ClustersService.ts

@@ -14,8 +14,14 @@ import omit from 'lodash-es/omit.js';
 import ClustersAPI from '../../common/api/assisted-service/ClustersAPI';
 import HostsService from './HostsService';
 import InfraEnvsService from './InfraEnvsService';
-import { AI_ASSISTED_MIGRATION_TAG, AI_UI_TAG } from '../../common/config/constants';
+import {
+  AI_ASSISTED_MIGRATION_TAG,
+  AI_CISCO_INTERSIGHT_TAG,
+  AI_UI_TAG,
+} from '../../common/config/constants';
 import { isInOcm } from '../../common/api/axiosClient';
+import { yamlContentAssistedMigration1, yamlContentAssistedMigration2 } from '../config';
+import jsYaml from 'js-yaml';
 
 const ClustersService = {
   findHost(hosts: Cluster['hosts'] = [], hostId: Host['id']) {
@@ -94,7 +100,12 @@ const ClustersService = {
   ): V2ClusterUpdateParams {
     const tags = clusterTags?.split(',') || <string[]>[];
     if (tags.includes(AI_UI_TAG)) {
-      delete params.tags;
+      if (params.tags && params.tags.includes(AI_CISCO_INTERSIGHT_TAG)) {
+        tags?.push(AI_CISCO_INTERSIGHT_TAG);
+        params.tags = tags?.join(',');
+      } else {
+        delete params.tags;
+      }
     } else {
       tags?.push(AI_UI_TAG);
       params.tags = tags?.join(',');
@@ -156,6 +167,32 @@ const ClustersService = {
       this.getUpdateManifestParams(existingManifest, updatedManifest),
     );
   },
+
+  //TO-DO: Assisted-Migration. Provisional code. Needs to be removed when MTV integration be finished
+  async createClusterManifestsForAssistedMigration(clusterId: Cluster['id']) {
+    const manifests: CustomManifestValues[] = [];
+
+    const parsedYaml1 = jsYaml.dump(yamlContentAssistedMigration1);
+    manifests.push({
+      folder: 'openshift',
+      filename: '0gitops.yaml',
+      manifestYaml: parsedYaml1,
+      created: true,
+    });
+
+    const parsedYaml2 = jsYaml.dump(yamlContentAssistedMigration2);
+    manifests.push({
+      folder: 'openshift',
+      filename: '1rolebindings.yaml',
+      manifestYaml: parsedYaml2,
+      created: true,
+    });
+
+    const promises = manifests.map((manifest) => {
+      return ClustersAPI.createCustomManifest(clusterId, this.transformFormViewManifest(manifest));
+    });
+    return Promise.all(promises);
+  },
 };
 
 export default ClustersService;

package/lib/ocm/services/OperatorsService.tsx

@@ -9,17 +9,20 @@ import {
   OPERATOR_NAME_MTV,
   OPERATOR_NAME_OPENSHIFT_AI,
   OPERATOR_NAME_OSC,
+  OPERATOR_NAME_NODE_FEATURE_DISCOVERY,
+  OPERATOR_NAME_NMSTATE,
+  OPERATOR_NAME_SERVERLESS,
+  OPERATOR_NAME_AUTHORINO,
+  OPERATOR_NAME_PIPELINES,
+  OPERATOR_NAME_SERVICEMESH,
+  OPERATOR_NAME_NVIDIA_GPU,
 } from '../../common';
 import { getOlmOperatorCreateParamsByName } from '../components/clusters/utils';
-import { getKeys } from '../../common/utils';
 import {
   Cluster,
   OperatorCreateParams,
 } from '@openshift-assisted/types/assisted-installer-service';
-
-const hasActiveOperators = (values: OperatorsValues) => {
-  return getKeys(values).some((operatorParam) => values[operatorParam]);
-};
+import OperatorsAPI from '../../common/api/assisted-service/OperatorsAPI';
 
 const OperatorsService = {
   getOLMOperators(values: OperatorsValues, cluster: Cluster): OperatorCreateParams[] {
@@ -41,11 +44,14 @@ const OperatorsService = {
     setOperator(OPERATOR_NAME_MTV, values.useMigrationToolkitforVirtualization);
     setOperator(OPERATOR_NAME_OPENSHIFT_AI, values.useOpenShiftAI);
     setOperator(OPERATOR_NAME_OSC, values.useOsc);
-
-    // TODO: remove following once the LSO option is exposed to the user
-    if (!hasActiveOperators(values)) {
-      setOperator(OPERATOR_NAME_LSO, false);
-    }
+    setOperator(OPERATOR_NAME_NODE_FEATURE_DISCOVERY, values.useNodeFeatureDiscovery);
+    setOperator(OPERATOR_NAME_NMSTATE, values.useNmstate);
+    setOperator(OPERATOR_NAME_LSO, values.useLso);
+    setOperator(OPERATOR_NAME_SERVERLESS, values.useServerless);
+    setOperator(OPERATOR_NAME_AUTHORINO, values.useAuthorino);
+    setOperator(OPERATOR_NAME_PIPELINES, values.usePipelines);
+    setOperator(OPERATOR_NAME_SERVICEMESH, values.useServicemesh);
+    setOperator(OPERATOR_NAME_NVIDIA_GPU, values.useNvidiaGpu);
 
     return Object.values(enabledOlmOperatorsByName);
   },
@@ -79,5 +85,10 @@ const OperatorsService = {
 
     return updates;
   },
+
+  async getSupportedOperators(): Promise<string[]> {
+    const { data: operators } = await OperatorsAPI.list();
+    return operators;
+  },
 };
 export default OperatorsService;

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.37.2",
-    "@openshift-assisted/types": "2.37.2",
+    "@openshift-assisted/locales": "2.38.0",
+    "@openshift-assisted/types": "2.38.0",
     "@openshift-console/dynamic-plugin-sdk": "0.0.3",
     "@patternfly/patternfly": "5.2.0",
     "@patternfly/react-code-editor": "5.2.0",
@@ -139,5 +139,5 @@
       ]
     }
   },
-  "version": "2.37.2"
+  "version": "2.38.0"
 }