Merge pull request #296 from glekner/yarn-classic

switch back to yarn classic

Dockerfile

@@ -2,7 +2,7 @@ FROM node:16 AS build
 
 COPY . /usr/src/app
 WORKDIR /usr/src/app
-RUN yarn install && yarn build
+RUN yarn install --ignore-engines && yarn build
 
 FROM nginxinc/nginx-unprivileged
 

Dockerfile.ci

@@ -2,7 +2,7 @@ FROM node:16 AS build
 
 COPY . /usr/src/app
 WORKDIR /usr/src/app
-RUN yarn install && yarn build
+RUN yarn install --ignore-engines && yarn build
 
 FROM nginxinc/nginx-unprivileged
 

package.json

@@ -52,6 +52,7 @@
     "@patternfly/react-catalog-view-extension": "^4.43.15",
     "@patternfly/react-charts": "^6.55.16",
     "@patternfly/react-core": "4.198.19",
+    "@patternfly/react-icons": "^4.53.16",
     "@patternfly/react-table": "^4.67.19",
     "@types/byte-size": "^8.1.0",
     "byte-size": "^8.1.0",
@@ -90,9 +91,8 @@
     "@types/jest": "^27.0.3",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "^16.11.12",
-    "@types/react": "^17.0.37",
+    "@types/react": "^17.0.40",
     "@types/react-router-dom": "5.x",
-    "@types/webpack-dev-server": "^4.5.0",
     "@typescript-eslint/eslint-plugin": "^5.14.0",
     "@typescript-eslint/parser": "^5.14.0",
     "copy-webpack-plugin": "^6.4.1",
@@ -133,7 +133,7 @@
     "webpack-dev-server": "^4.7.4"
   },
   "resolutions": {
-    "webpack": "^5.68.0"
-  },
-  "packageManager": "[email protected]"
+    "webpack": "^5.68.0",
+    "@types/react": "17.0.40"
+  }
 }

src/utils/components/AnnotationsModal/AnnotationsModal.tsx

@@ -21,8 +21,9 @@ export const AnnotationsModal: React.FC<{
 }> = ({ obj, isOpen, onSubmit, onClose }) => {
   const { t } = useKubevirtTranslation();
 
-  const [annotations, setAnnotations] =
-    React.useState<{ [id: number]: { [key: string]: string } }>();
+  const [annotations, setAnnotations] = React.useState<{
+    [id: number]: { [key: string]: string };
+  }>();
 
   const onAnnotationAdd = () => {
     const keys = new Set([...Object.keys(annotations)]);

src/utils/resources/vmi/utils/pod.ts

@@ -5,7 +5,7 @@ import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
  * Get if the pod is in a ready status
  * @date 4/10/2022 - 8:13:37 AM
  *
- * @param {*} pod
+ * @param {*} pod - The pod to check
  * @returns {boolean}
  */
 export const isPodReady = (pod): boolean =>
@@ -15,8 +15,8 @@ export const isPodReady = (pod): boolean =>
  * Get the vmi pod
  * @date 4/10/2022 - 8:13:37 AM
  *
- * @param {V1VirtualMachineInstance} vmi
- * @param {K8sResourceCommon[]} pods
+ * @param {V1VirtualMachineInstance} vmi - The vmi to check
+ * @param {K8sResourceCommon[]} pods - The pods to check
  * @returns {*}
  */
 export const getVMIPod = (vmi: V1VirtualMachineInstance, pods: K8sResourceCommon[]) => {

src/views/virtualmachines/details/tabs/snapshots/components/modal/RestoreModal.tsx

@@ -1,8 +1,10 @@
 import * as React from 'react';
 
-import { V1alpha1VirtualMachineSnapshot } from '@kubevirt-ui/components/node_modules/@kubevirt-ui/kubevirt-api/kubevirt';
 import VirtualMachineRestoreModel from '@kubevirt-ui/kubevirt-api/console/models/VirtualMachineRestoreModel';
-import { V1alpha1VirtualMachineRestore } from '@kubevirt-ui/kubevirt-api/kubevirt';
+import {
+  V1alpha1VirtualMachineRestore,
+  V1alpha1VirtualMachineSnapshot,
+} from '@kubevirt-ui/kubevirt-api/kubevirt';
 import TabModal from '@kubevirt-utils/components/TabModal/TabModal';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
 import { k8sCreate } from '@openshift-console/dynamic-plugin-sdk';

test-cypress.sh

@@ -3,10 +3,10 @@
 set -eExuo pipefail
 
 # Install dependencies.
-yarn install
+yarn install --ignore-engines
 
 # Add mochawesome-report-generator
-yarn add global mochawesome-report-generator
+yarn add global mochawesome-report-generator --ignore-engines
 
 while getopts g:s: flag
 do

test-prow-e2e.sh

@@ -140,10 +140,10 @@ export BRIDGE_BASE_ADDRESS
 export NO_COLOR=1
 
 # Install dependencies.
-yarn install
+yarn install --ignore-engines
 
 # Add mochawesome-report-generator
-yarn add global mochawesome-report-generator
+yarn add global mochawesome-report-generator --ignore-engines
 
 # Run tests.
 yarn run test-cypress-headless