Fix deprecation tests, replace react-router-hash-link, prevent depden…

…abot from react-router-dom v7 (#5355) * fixup ReactFragment->ReactNode * replace react-router-hash-link with a hash link toc links still scroll with react-router 7 * fix deprecation tests reloading after the click was needed before the ui started waiting for the task to finish but now the ui does wait, and reloads when it is done .. but if the test reloads first, it stops waiting and won't reload when done * dependabot: prevent lingui major in 4.9, 4.10; prevent react-router-dom v7 * npm audit fix
ansible · Dec 13, 2024 · 4d920c5 · 4d920c5
1 parent 56fa260
commit 4d920c5
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 47 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -29,8 +29,15 @@ updates:
           - 'react-dom'
     ignore:
       - dependency-name: '@patternfly/*'
-        update-types: ['version-update:semver-major']
-      - dependency-name: 'eslint'
+        update-types:
+          - 'version-update:semver-major'
+      - dependency-name: 'react'
+        update-types:
+          - 'version-update:semver-major'
+      - dependency-name: 'react-dom'
+        update-types:
+          - 'version-update:semver-major'
+      - dependency-name: 'react-router-dom'
         update-types:
           - 'version-update:semver-major'
       - dependency-name: 'monaco-editor'
@@ -46,9 +53,6 @@ updates:
           - 'version-update:semver-major'
           - 'version-update:semver-minor'
           - 'version-update:semver-patch'
-      - dependency-name: 'typescript-eslint'
-        update-types:
-          - 'version-update:semver-major'
 
   - package-ecosystem: 'npm'
     directory: '/'
@@ -78,19 +82,41 @@ updates:
         patterns:
           - 'react'
           - 'react-dom'
-          - '@types/react'
-          - '@types/react-dom'
     ignore:
       - dependency-name: '@lingui/*'
-        update-types: ['version-update:semver-major']
+        update-types:
+          - 'version-update:semver-major'
       - dependency-name: '@patternfly/*'
-        update-types: ['version-update:semver-major']
-      - dependency-name: '@types/*'
-        update-types: ['version-update:semver-major']
+        update-types:
+          - 'version-update:semver-major'
+      - dependency-name: 'eslint'
+        update-types:
+          - 'version-update:semver-major'
       - dependency-name: 'react'
-        update-types: ['version-update:semver-major']
+        update-types:
+          - 'version-update:semver-major'
       - dependency-name: 'react-dom'
-        update-types: ['version-update:semver-major']
+        update-types:
+          - 'version-update:semver-major'
+      - dependency-name: 'react-router-dom'
+        update-types:
+          - 'version-update:semver-major'
+      - dependency-name: 'monaco-editor'
+        update-types:
+          - 'version-update:semver-major'
+          - 'version-update:semver-minor'
+      - dependency-name: 'react-monaco-editor'
+        update-types:
+          - 'version-update:semver-major'
+          - 'version-update:semver-minor'
+      - dependency-name: 'sass'
+        update-types:
+          - 'version-update:semver-major'
+          - 'version-update:semver-minor'
+          - 'version-update:semver-patch'
+      - dependency-name: 'typescript-eslint'
+        update-types:
+          - 'version-update:semver-major'
 
   - package-ecosystem: 'npm'
     directory: '/'
@@ -120,16 +146,14 @@ updates:
         patterns:
           - 'react'
           - 'react-dom'
-          - '@types/react'
-          - '@types/react-dom'
     ignore:
       - dependency-name: '@lingui/*'
         update-types:
           - 'version-update:semver-major'
       - dependency-name: '@patternfly/*'
         update-types:
           - 'version-update:semver-major'
-      - dependency-name: '@types/*'
+      - dependency-name: 'eslint'
         update-types:
           - 'version-update:semver-major'
       - dependency-name: 'react'
@@ -138,11 +162,25 @@ updates:
       - dependency-name: 'react-dom'
         update-types:
           - 'version-update:semver-major'
+      - dependency-name: 'react-router-dom'
+        update-types:
+          - 'version-update:semver-major'
+      - dependency-name: 'monaco-editor'
+        update-types:
+          - 'version-update:semver-major'
+          - 'version-update:semver-minor'
+      - dependency-name: 'react-monaco-editor'
+        update-types:
+          - 'version-update:semver-major'
+          - 'version-update:semver-minor'
       - dependency-name: 'sass'
         update-types:
           - 'version-update:semver-major'
           - 'version-update:semver-minor'
           - 'version-update:semver-patch'
+      - dependency-name: 'typescript-eslint'
+        update-types:
+          - 'version-update:semver-major'
 
   # npm in test/
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,8 +27,7 @@
     "react-dom": "^18.3.1",
     "react-markdown": "^9.0.1",
     "react-monaco-editor": "^0.55.0",
-    "react-router-dom": "^6.26.2",
-    "react-router-hash-link": "^2.4.3"
+    "react-router-dom": "^6.26.2"
   },
   "devDependencies": {
     "@babel/core": "^7.26.0",

diff --git a/src/containers/collection-detail/collection-docs.tsx b/src/containers/collection-detail/collection-docs.tsx
@@ -3,7 +3,6 @@ import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclam
 import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
 import React, { Component, type RefObject, createRef } from 'react';
 import { Link } from 'react-router-dom';
-import { HashLink } from 'react-router-hash-link';
 import { type CollectionVersionSearch } from 'src/api';
 import {
   Alert,
@@ -191,7 +190,7 @@ class CollectionDocs extends Component<RouteProps, IBaseCollectionState> {
                       this.renderDocLink(name, href, collection, params)
                     }
                     renderTableOfContentsLink={(title, section) => (
-                      <HashLink to={'#' + section}>{title}</HashLink>
+                      <a href={'#' + section}>{title}</a>
                     )}
                     renderWarning={(text) => (
                       <Alert isInline variant='warning' title={text} />

diff --git a/src/containers/execution-environment-detail/execution-environment-detail-activities.tsx b/src/containers/execution-environment-detail/execution-environment-detail-activities.tsx
@@ -1,7 +1,7 @@
 import { Trans, t } from '@lingui/macro';
 import { Button, Flex, FlexItem } from '@patternfly/react-core';
 import { Table, Tbody, Td, Tr } from '@patternfly/react-table';
-import React, { Component, type ReactFragment } from 'react';
+import React, { Component, type ReactNode } from 'react';
 import { Link } from 'react-router-dom';
 import { ActivitiesAPI } from 'src/api';
 import {
@@ -18,7 +18,7 @@ import './execution-environment-detail.scss';
 
 interface IState {
   loading: boolean;
-  activities: { created: string; action: ReactFragment }[];
+  activities: { created: string; action: ReactNode }[];
   redirect: string;
   page: number;
 }

diff --git a/test/cypress/e2e/collections/collection-upload.js b/test/cypress/e2e/collections/collection-upload.js
@@ -119,16 +119,15 @@ describe('Collection Upload Tests', () => {
 
   it('should deprecate let user deprecate and undeprecate collections', () => {
     cy.login();
+
     cy.visit(`${uiPrefix}namespaces/testspace`);
     cy.get('[data-cy=collection-kebab]').first().click();
     cy.contains('Deprecate').click();
-    cy.visit(`${uiPrefix}namespaces/testspace`);
     cy.contains('DEPRECATED');
 
     cy.visit(`${uiPrefix}namespaces/testspace`);
     cy.get('[data-cy=collection-kebab]').first().click();
     cy.contains('Undeprecate').click();
-    cy.visit(`${uiPrefix}namespaces/testspace`);
     cy.contains('DEPRECATED').should('not.exist');
   });
 });
diff --git a/test/cypress/e2e/namespaces/namespace-detail.js b/test/cypress/e2e/namespaces/namespace-detail.js
@@ -32,9 +32,6 @@ describe('Namespace detail screen', () => {
     ).click();
     cy.contains('.body ul a', 'Deprecate').click();
 
-    // Reload the page
-    cy.visit(`${uiPrefix}namespaces/namespace_detail_test`);
-
     cy.get('[data-cy="CollectionListItem"]:first').contains('DEPRECATED');
   });