Syncing latest changes from master for odf-console

.eslintrc.js

@@ -110,10 +110,7 @@ module.exports = {
         bundledDependencies: false,
       },
     ],
-    'jsx-a11y/anchor-is-valid': 'off',
-    'jsx-a11y/click-events-have-key-events': 'off',
-    'jsx-a11y/label-has-associated-control': 'off',
-    'jsx-a11y/no-static-element-interactions': 'off',
+    'jsx-a11y/label-has-associated-control': 'off', // Disabled due to false positives.
     'max-classes-per-file': 'off',
     'max-len': 'off',
     '@typescript-eslint/naming-convention': [

.github/workflows/frontend-build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20.16.0, 22]
+        node-version: [20.19.2, 22]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

Dockerfile.ci

@@ -1,4 +1,4 @@
-FROM docker.io/library/node:20.16.0 AS builder
+FROM docker.io/library/node:20.19.2 AS builder
 
 ARG PLUGIN=odf
 
@@ -14,7 +14,7 @@ RUN BUILD_SCRIPT=build; \
     NODE_OPTIONS="--max-old-space-size=1024" yarn "${BUILD_SCRIPT}" && \
     mv /app/plugins/${PLUGIN}/dist /dist
 
-FROM docker.io/library/node:20.16.0
+FROM docker.io/library/node:20.19.2
 
 RUN yarn global add http-server
 COPY --from=builder /dist /app

i18next-parser.config.js

@@ -4,10 +4,13 @@ module.exports = {
   locales: ['en'],
   namespaceSeparator: '~',
   reactNamespace: false,
-  defaultValue: function (_, _, key, _) {
+  defaultValue: function (_locale, _namespace, key, _value) {
     // The `useKeysAsDefaultValues` option is deprecated in favor of `defaultValue` option function arguments.
     // The `key` is used to set default value.
     return key;
   },
   defaultNamespace: 'plugin__odf-console',
+  sort: (a, b) => {
+    return a.localeCompare(b, 'en');
+  },
 };

package.json

@@ -64,33 +64,10 @@
     "*": "prettier --ignore-unknown --write",
     "**/package.json": "npx --yes [email protected]"
   },
-  "resolutions": {
-    "**/@typescript-eslint/typescript-estree/semver": "^7.7.1",
-    "**/cypress/semver": "^7.7.1",
-    "@babel/runtime": "^7.27.0",
-    "async": "^3.2.6",
-    "braces": "^3.0.3",
-    "cache-loader/loader-utils": "^1.4.2",
-    "cache-loader/loader-utils/json5": "^1.0.2",
-    "cross-spawn": "^7.0.6",
-    "eslint-plugin-import/tsconfig-paths/json5": "^1.0.2",
-    "loader-utils": "^2.0.4",
-    "micromatch": "^4.0.8",
-    "minimatch": "^3.0.5",
-    "minimist": "^1.2.8",
-    "nanoid": "^3.3.8",
-    "postcss": "^8.4.49",
-    "tough-cookie": "^4.1.3",
-    "underscore.string": "^3.3.6",
-    "undici": "^6.21.1",
-    "webpack": "^5.97.1",
-    "webpack-bundle-analyzer/ws": "^7.5.10",
-    "webpack-dev-server/express": "^4.21.0"
-  },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.667.0",
-    "@aws-sdk/lib-storage": "3.501.0",
-    "@aws-sdk/s3-request-presigner": "3.614.0",
+    "@aws-sdk/client-s3": "3.823.0",
+    "@aws-sdk/lib-storage": "3.823.0",
+    "@aws-sdk/s3-request-presigner": "3.823.0",
     "@openshift-console/dynamic-plugin-sdk": "1.8.0",
     "@openshift-console/dynamic-plugin-sdk-internal": "1.0.0",
     "@openshift-console/dynamic-plugin-sdk-webpack": "1.3.0",
@@ -106,105 +83,105 @@
     "cache-loader": "^4.1.0",
     "circular-dependency-plugin": "^5.2.2",
     "classnames": "^2.5.1",
-    "copy-webpack-plugin": "^12.0.2",
+    "copy-webpack-plugin": "^13.0.0",
     "css-loader": "^7.1.2",
     "file-loader": "^6.2.0",
-    "fork-ts-checker-webpack-plugin": "^9.0.2",
+    "fork-ts-checker-webpack-plugin": "^9.1.0",
     "fuzzysearch": "^1.0.3",
-    "i18next": "^24.2.2",
+    "i18next": "^25.2.1",
     "i18next-conv": "^15.1.1",
     "immer": "^10.1.1",
     "is-ip": "^5.0.1",
     "js-base64": "^3.7.7",
     "js-yaml": "^4.1.0",
     "lodash-es": "^4.17.21",
-    "luxon": "^3.5.0",
-    "mobx": "^6.13.6",
+    "luxon": "^3.6.1",
+    "mobx": "^6.13.7",
     "mobx-react-lite": "^4.1.0",
     "murmurhash-js": "^1.0.0",
     "react": "^17.0.1",
     "react-copy-to-clipboard": "5.x",
     "react-dnd": "^15.1.1",
     "react-dnd-html5-backend": "^15.1.2",
     "react-dom": "^17.0.1",
-    "react-dropzone": "^14.2.9",
+    "react-dropzone": "^14.3.8",
     "react-helmet": "^6.1.0",
-    "react-hook-form": "^7.42.1",
+    "react-hook-form": "^7.56.4",
     "react-i18next": "^11.11.4",
     "react-linkify": "^0.2.2",
     "react-redux": "7.2.2",
     "react-router-dom-v5-compat": "^6.28.2",
-    "react-tagsinput": "^3.19.0",
-    "react-virtualized-auto-sizer": "^1.0.24",
-    "react-window": "^1.8.10",
+    "react-tagsinput": "^3.20.3",
+    "react-virtualized-auto-sizer": "^1.0.26",
+    "react-window": "^1.8.11",
     "redux": "4.0.1",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.85.1",
+    "sass": "^1.89.0",
     "sass-loader": "^16.0.5",
-    "semver": "^6.3.1",
+    "semver": "^7.7.2",
     "style-loader": "^3.3.4",
-    "swr": "2.3.2",
+    "swr": "2.3.3",
     "thread-loader": "^4.0.4",
     "ts-loader": "^9.5.2",
-    "tsx": "^4.19.2",
+    "tsx": "^4.19.4",
     "typesafe-actions": "^5.1.0",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.3",
     "victory-core": "^37.3.6",
     "webpack": "^5.97.1",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^6.0.1",
     "yup": "^0.32.11"
   },
   "devDependencies": {
-    "@cypress/webpack-preprocessor": "^6.0.2",
+    "@cypress/webpack-preprocessor": "^6.0.4",
     "@discoveryjs/json-ext": "^0.6.3",
-    "@swc/core": "^1.10.11",
-    "@swc/jest": "^0.2.37",
+    "@swc/core": "^1.11.29",
+    "@swc/jest": "^0.2.38",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^12.1.5",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.6.1",
     "@types/jest": "^29.5.14",
     "@types/lodash-es": "^4.17.12",
-    "@types/luxon": "^3.4.2",
+    "@types/luxon": "^3.6.2",
     "@types/react-helmet": "^6.1.11",
     "@types/react-window": "^1.8.8",
-    "@typescript-eslint/eslint-plugin": "^8.12.2",
-    "@typescript-eslint/parser": "^8.17.0",
-    "cypress": "^14.0.0",
-    "cypress-multi-reporters": "^2.0.4",
+    "@typescript-eslint/eslint-plugin": "^8.32.1",
+    "@typescript-eslint/parser": "^8.32.1",
+    "cypress": "^14.4.0",
+    "cypress-multi-reporters": "^2.0.5",
     "eslint": "^8.57.1",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-chai-friendly": "^1.0.1",
-    "eslint-plugin-cypress": "^4.1.0",
+    "eslint-plugin-cypress": "^4.3.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^28.11.0",
+    "eslint-plugin-jest": "^28.12.0",
     "eslint-plugin-jest-dom": "^5.5.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-mobx": "^0.0.13",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-testing-library": "^7.0.0",
     "http-server": "^14.1.1",
     "husky": "^9.1.7",
     "i18next-parser": "^9.3.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "jest-html-reporter": "^3.10.2",
+    "jest-html-reporter": "^4.1.0",
     "jest-silent-reporter": "^0.6.0",
     "mocha-junit-reporter": "^2.2.1",
     "mochawesome": "^7.1.3",
     "mochawesome-merge": "^4.4.1",
-    "prettier": "^3.5.2",
-    "stylelint": "^16.14.1",
+    "prettier": "^3.5.3",
+    "stylelint": "^16.19.1",
     "stylelint-config-sass-guidelines": "^12.1.0",
-    "stylelint-config-standard": "^37.0.0",
-    "stylelint-order": "^6.0.4",
-    "webpack-dev-server": "^5.2.0"
+    "stylelint-config-standard": "^38.0.0",
+    "stylelint-order": "^7.0.0",
+    "webpack-dev-server": "^5.2.1"
   },
   "engines": {
-    "node": ">=20.x"
+    "node": ">=20.19.2"
   }
 }

packages/mco/components/discovered-application-wizard/utils/k8s-utils.ts

@@ -17,11 +17,25 @@ import {
   ObjectMetadata,
   k8sCreate,
 } from '@openshift-console/dynamic-plugin-sdk';
+import { IS_CG_ENABLED_ANNOTATION } from '../../../constants';
 import {
   EnrollDiscoveredApplicationState,
   ProtectionMethodType,
 } from './reducer';
 
+export const convertRecipeParamsToList = (
+  params: Record<string, string> = {}
+): Record<string, string[]> =>
+  Object.fromEntries(
+    Object.entries(params).map(([k, val]) => [
+      k.trim(),
+      val
+        .split(',')
+        .map((item) => item.trim())
+        .filter(Boolean),
+    ])
+  );
+
 export const getDRPCKindObj = (props: {
   name: string;
   preferredCluster: string;
@@ -31,18 +45,20 @@ export const getDRPCKindObj = (props: {
   k8sResourceReplicationInterval: string;
   recipeName?: string;
   recipeNamespace?: string;
+  recipeParameters?: Record<string, string[]>;
   k8sResourceLabelExpressions?: MatchExpression[];
   pvcLabelExpressions?: MatchExpression[];
   placementName: string;
-  recipeParameters?: Record<string, string[]>;
   labels?: ObjectMetadata['labels'];
+  annotations?: ObjectMetadata['annotations'];
 }): DRPlacementControlKind => ({
   apiVersion: getAPIVersionForModel(DRPlacementControlModel),
   kind: DRPlacementControlModel.kind,
   metadata: {
     name: props.name,
     namespace: DISCOVERED_APP_NS,
     ...(props.labels && { labels: props.labels }),
+    ...(props.annotations && { annotations: props.annotations }),
   },
   spec: {
     preferredCluster: props.preferredCluster,
@@ -105,8 +121,13 @@ export const createPromise = (
 ): Promise<K8sResourceKind>[] => {
   const { namespace, configuration, replication } = state;
   const { clusterName, namespaces, name } = namespace;
-  const { protectionMethod, recipe, resourceLabels } = configuration;
-  const { recipeName, recipeNamespace } = recipe;
+  const {
+    protectionMethod,
+    recipe,
+    resourceLabels,
+    isVolumeConsistencyEnabled,
+  } = configuration;
+  const { recipeName, recipeNamespace, recipeParameters } = recipe;
   const { k8sResourceLabelExpressions, pvcLabelExpressions } = resourceLabels;
   const { drPolicy, k8sResourceReplicationInterval } = replication;
   const namespaceList = namespaces.map(getName);
@@ -122,6 +143,13 @@ export const createPromise = (
     })
   );
 
+  let labels: ObjectMetadata['labels'];
+  const annotations = isVolumeConsistencyEnabled
+    ? {
+        [IS_CG_ENABLED_ANNOTATION]: 'true',
+      }
+    : undefined;
+
   promises.push(
     k8sCreate({
       model: DRPlacementControlModel,
@@ -132,11 +160,14 @@ export const createPromise = (
         protectionMethod,
         recipeName,
         recipeNamespace,
+        recipeParameters: convertRecipeParamsToList(recipeParameters),
         k8sResourceLabelExpressions,
         pvcLabelExpressions,
         drPolicyName: getName(drPolicy),
         k8sResourceReplicationInterval,
         placementName,
+        labels,
+        annotations,
       }),
     })
   );