Merge branch 'main' into mta2652

konveyor · Apr 22, 2024 · d268183 · d268183
2 parents fec8511 + 2f2db9f
commit d268183
Show file tree

Hide file tree

Showing 5 changed files with 247 additions and 321 deletions.
diff --git a/client/package.json b/client/package.json
@@ -25,12 +25,12 @@
     "@hookform/resolvers": "^2.9.11",
     "@hot-loader/react-dom": "^17.0.2",
     "@migtools/lib-ui": "^10.0.1",
-    "@patternfly/patternfly": "^5.0.2",
-    "@patternfly/react-charts": "^7.1.0",
-    "@patternfly/react-code-editor": "^5.1.0",
-    "@patternfly/react-core": "^5.1.0",
-    "@patternfly/react-table": "^5.1.0",
-    "@patternfly/react-tokens": "^5.1.0",
+    "@patternfly/patternfly": "5.2.1",
+    "@patternfly/react-charts": "7.2.2",
+    "@patternfly/react-code-editor": "5.2.3",
+    "@patternfly/react-core": "5.2.3",
+    "@patternfly/react-table": "5.2.4",
+    "@patternfly/react-tokens": "5.2.1",
     "@react-keycloak/web": "^3.4.0",
     "@tanstack/react-query": "^4.22.0",
     "@tanstack/react-query-devtools": "^4.22.0",
@@ -49,10 +49,8 @@
     "react-i18next": "^11.8.5",
     "react-markdown": "^8.0.7",
     "react-measure": "^2.5.2",
-    "react-monaco-editor": "0.51.0",
     "react-router-dom": "^5.2.0",
     "tinycolor2": "^1.6.0",
-    "typesafe-actions": "^5.1.0",
     "web-vitals": "^0.2.4",
     "xmllint": "^0.1.1",
     "yup": "^0.32.11"

diff --git a/client/src/app/layout/HeaderApp/tests/__snapshots__/HeaderApp.test.tsx.snap b/client/src/app/layout/HeaderApp/tests/__snapshots__/HeaderApp.test.tsx.snap
@@ -106,14 +106,6 @@ exports[`Test snapshot 1`] = `
                   </div>
                 </div>
               </div>
-              <div
-                class="pf-v5-c-toolbar__expandable-content"
-                id="pf-random-id-0-expandable-content-0"
-              >
-                <div
-                  class="pf-v5-c-toolbar__group"
-                />
-              </div>
             </div>
             <div
               class="pf-v5-c-toolbar__content pf-m-hidden"
@@ -230,14 +222,6 @@ exports[`Test snapshot 1`] = `
                 </div>
               </div>
             </div>
-            <div
-              class="pf-v5-c-toolbar__expandable-content"
-              id="pf-random-id-0-expandable-content-0"
-            >
-              <div
-                class="pf-v5-c-toolbar__group"
-              />
-            </div>
           </div>
           <div
             class="pf-v5-c-toolbar__content pf-m-hidden"

diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -66,7 +66,6 @@ import { checkAccess } from "@app/utils/rbac-utils";
 import WarningTriangleIcon from "@patternfly/react-icons/dist/esm/icons/warning-triangle-icon";
 
 // Hooks
-import { useQueryClient } from "@tanstack/react-query";
 import {
   deserializeFilterUrlParams,
   useLocalTableControls,
@@ -108,6 +107,7 @@ import { KebabDropdown } from "@app/components/KebabDropdown";
 import { useFetchArchetypes } from "@app/queries/archetypes";
 import { ApplicationFormModal } from "../components/application-form";
 import { ManageColumnsToolbar } from "./components/manage-columns-toolbar";
+import dayjs from "dayjs";
 
 export const ApplicationsTable: React.FC = () => {
   const { t } = useTranslation();
@@ -207,12 +207,17 @@ export const ApplicationsTable: React.FC = () => {
   const [reviewToDiscard, setReviewToDiscard] =
     React.useState<Application | null>(null);
 
+  const [endOfAppImportPeriod, setEndOfAppImportPeriod] = useState<dayjs.Dayjs>(
+    dayjs()
+  );
+
   const {
     data: applications,
     isFetching: isFetchingApplications,
     error: applicationsFetchError,
-    refetch: fetchApplications,
-  } = useFetchApplications(!hasActiveTasks);
+  } = useFetchApplications(() =>
+    hasActiveTasks || dayjs().isBefore(endOfAppImportPeriod) ? 5000 : false
+  );
 
   const { assessments, isFetching: isFetchingAssessments } =
     useFetchAssessments();
@@ -498,8 +503,6 @@ export const ApplicationsTable: React.FC = () => {
     isSelectionEnabled: true,
   });
 
-  const queryClient = useQueryClient();
-
   const {
     currentPageItems,
     numRenderedColumns,
@@ -559,10 +562,6 @@ export const ApplicationsTable: React.FC = () => {
     tasksWriteAccess = checkAccess(userScopes, tasksWriteScopes),
     reviewsWriteAccess = checkAccess(userScopes, reviewsWriteScopes);
 
-  const areAppsInWaves = selectedRows.some(
-    (application) => application.migrationWave !== null
-  );
-
   const importDropdownItems = importWriteAccess
     ? [
         <DropdownItem
@@ -1131,19 +1130,6 @@ export const ApplicationsTable: React.FC = () => {
           documentId={taskToView?.task}
           onClose={() => setTaskToView(undefined)}
         />
-        <Modal
-          isOpen={isApplicationImportModalOpen}
-          variant="medium"
-          title={t("dialog.title.importApplicationFile")}
-          onClose={() => setIsApplicationImportModalOpen((current) => !current)}
-        >
-          <ImportApplicationsForm
-            onSaved={() => {
-              setIsApplicationImportModalOpen(false);
-              fetchApplications();
-            }}
-          />
-        </Modal>
         <Modal
           isOpen={isDependenciesModalOpen}
           variant="medium"
@@ -1168,7 +1154,7 @@ export const ApplicationsTable: React.FC = () => {
           <ImportApplicationsForm
             onSaved={() => {
               setIsApplicationImportModalOpen(false);
-              fetchApplications();
+              setEndOfAppImportPeriod(dayjs().add(15, "s"));
             }}
           />
         </Modal>

diff --git a/client/src/app/queries/applications.ts b/client/src/app/queries/applications.ts
@@ -32,13 +32,15 @@ interface DownloadOptions {
   mimeType: MimeType;
 }
 
-export const useFetchApplications = (refetchDisabled: boolean = false) => {
+export const useFetchApplications = (
+  refetchInterval: number | false | (() => number | false) = 5000
+) => {
   const queryClient = useQueryClient();
   const { isLoading, error, refetch, data } = useQuery({
     initialData: [],
     queryKey: [ApplicationsQueryKey],
     queryFn: getApplications,
-    refetchInterval: !refetchDisabled ? 5000 : false,
+    refetchInterval: refetchInterval,
     onSuccess: () => {
       queryClient.invalidateQueries([assessmentsByItemIdQueryKey]);
     },