Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Re-enable fetching applications after application import #1856

Merged
merged 3 commits into from
Apr 22, 2024
Merged

🐛 Re-enable fetching applications after application import #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d17e909
Re-enable fetching applications after application import
rszwajko Apr 17, 2024
f5a4ff6
Merge branch 'main' into refreshAfterImport
ibolton336 Apr 19, 2024
41a266b
Merge branch 'main' into refreshAfterImport
rszwajko Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 9 additions & 23 deletions client/src/app/pages/applications/applications-table/applications-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -498,8 +503,6 @@ export const ApplicationsTable: React.FC = () => {
isSelectionEnabled: true,
});

const queryClient = useQueryClient();

const {
currentPageItems,
numRenderedColumns,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -1168,7 +1154,7 @@ export const ApplicationsTable: React.FC = () => {
<ImportApplicationsForm
onSaved={() => {
setIsApplicationImportModalOpen(false);
fetchApplications();
setEndOfAppImportPeriod(dayjs().add(15, "s"));
rszwajko marked this conversation as resolved.
Show resolved Hide resolved
}}
/>
</Modal>
Expand Down
6 changes: 4 additions & 2 deletions client/src/app/queries/applications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
},
Expand Down
Loading