Skip to content

Commit

Permalink
Merge branch 'main' into chore/1241-replace-deprecated-pf-dropdown
Browse files Browse the repository at this point in the history
  • Loading branch information
@gitdallas
gitdallas authored Sep 21, 2023
2 parents dc13a83 + bac5ce1 commit 30c240e
Show file tree
Hide file tree
Showing 19 changed files with 428 additions and 263 deletions.
7 changes: 5 additions & 2 deletions client/public/locales/en/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
},
"composed": {
"add": "Add {{what}}",
"new": "New {{what}}",
"applicationAssessment": "Application assessment",
"applicationInventory": "Application inventory",
"businessCriticality": "Business criticality (1=low, 10=high)",
Expand Down Expand Up @@ -170,12 +171,14 @@
"noDataAvailableTitle": "No data available",
"noResultsFoundBody": "No results match the filter criteria. Remove all filters or clear all filters to show results.",
"noResultsFoundTitle": "No results found",
"overrideAssessmentDescription": "The archetype for {{what}} already has an assessment.",
"overrideAssessmentConfirmation": "Do you want to create a dedicated assessment for this application?",
"overrideAssessmentDescription": "The application {{name}} already is associated with archetypes: {{what}}.",
"overrideAssessmentConfirmation": "Do you want to create a dedicated assessment for this application and override the inherited archetype assessment(s)?",
"overrideReviewConfirmation": "This application has already been reviewed. Do you want to continue?",
"reasonForError": "The reported reason for the error:",
"reviewInstructions": "Use this section to provide your assessment of the possible migration/modernization plan and effort estimation.",
"savingSelection": "Saving selection",
"selectedBecauseArchetypeTags": "Selected because the archetype's tags include {{tags}}",
"selectedBecauseAppOrArchetypeTags": "Selected because the application or archetype's tags include {{tags}}",
"selectOwnerFromStakeholdersList": "Select owner from list of stakeholders",
"suggestedAdoptionPlanHelpText": "The suggested approach to migration based on effort, priority, and dependencies.",
"taskInProgressForTags": "A new analysis is in-progress. Tags may be updated upon completion.",
Expand Down
7 changes: 7 additions & 0 deletions client/src/app/Paths.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ export enum Paths {
archetypesAssessment = "/archetypes/assessment/:assessmentId",
applicationsAssessment = "/applications/assessment/:assessmentId",
applicationAssessmentActions = "/applications/assessment-actions/:applicationId",
viewArchetypes = "/applications/view-archetypes/:applicationId/archetypes/:archetypeId",
archetypeAssessmentActions = "/archetypes/assessment-actions/:archetypeId",
applicationAssessmentSummary = "/applications/assessment-summary/:assessmentId",
archetypeAssessmentSummary = "/archetypes/assessment-summary/:assessmentId",
applicationsReview = "/applications/:applicationId/review",
archetypeReview = "/archetypes/:archetypeId/review",
applicationsAnalysis = "/applications/analysis",
archetypes = "/archetypes",
controls = "/controls",
Expand Down Expand Up @@ -57,6 +59,11 @@ export interface AssessmentActionsRoute {
archetypeId?: string;
}

export interface ViewArchetypesRoute {
applicationId?: string;
archetypeId?: string;
}

export interface ReviewRoute {
applicationId?: string;
archetypeId?: string;
Expand Down
14 changes: 14 additions & 0 deletions client/src/app/Routes.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ const Questionnaire = lazy(
() => import("./pages/assessment-management/questionnaire/questionnaire-page")
);

const ViewArchetypes = lazy(
() =>
import("./pages/assessment/components/view-archetypes/view-archetypes-page")
);
const AssessmentActions = lazy(
() =>
import(
Expand Down Expand Up @@ -86,6 +90,11 @@ export const devRoutes: IRoute[] = [
comp: Assessment,
exact: false,
},
{
path: Paths.archetypeReview,
comp: Review,
exact: false,
},
{
path: Paths.applicationsReview,
comp: Review,
Expand All @@ -101,6 +110,11 @@ export const devRoutes: IRoute[] = [
comp: AssessmentActions,
exact: false,
},
{
path: Paths.viewArchetypes,
comp: ViewArchetypes,
exact: false,
},
{
path: Paths.applicationAssessmentSummary,
comp: AssessmentSummary,
Expand Down
3 changes: 3 additions & 0 deletions client/src/app/api/models.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ export interface Review {
workPriority: number;
comments?: string;
application?: Ref;
archetype?: Ref;
}

export interface ApplicationDependency {
Expand Down Expand Up @@ -682,6 +683,7 @@ export interface Answer {
mitigation?: string;
applyTags?: CategorizedTag[];
autoAnswerFor?: CategorizedTag[];
autoAnswered?: boolean;
selected?: boolean;
}
export interface Thresholds {
Expand Down Expand Up @@ -752,4 +754,5 @@ export interface Archetype {
stakeholderGroups?: Ref[];
applications?: Ref[];
assessments?: Ref[];
review?: Ref;
}
135 changes: 83 additions & 52 deletions ...rc/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ import { useQueryClient } from "@tanstack/react-query";
import { useLocalTableControls } from "@app/hooks/table-controls";

// Queries
import { Application, Assessment, Task } from "@app/api/models";
import { Application, Assessment, Ref, Task } from "@app/api/models";
import {
ApplicationsQueryKey,
useBulkDeleteApplicationMutation,
useFetchApplications,
} from "@app/queries/applications";
import { useFetchTasks } from "@app/queries/tasks";
import { useDeleteAssessmentMutation } from "@app/queries/assessments";
import { useDeleteReviewMutation, useFetchReviews } from "@app/queries/reviews";
import { useDeleteReviewMutation } from "@app/queries/reviews";
import { useFetchIdentities } from "@app/queries/identities";
import { useFetchTagCategories } from "@app/queries/tags";

Expand All @@ -86,6 +86,7 @@ import { ImportApplicationsForm } from "../components/import-applications-form";
import { ConditionalRender } from "@app/components/ConditionalRender";
import { NoDataEmptyState } from "@app/components/NoDataEmptyState";
import { ConditionalTooltip } from "@app/components/ConditionalTooltip";
import { getAssessmentsByItemId } from "@app/api/rest";

export const ApplicationsTable: React.FC = () => {
const { t } = useTranslation();
Expand All @@ -106,28 +107,17 @@ export const ApplicationsTable: React.FC = () => {
const createUpdateApplications =
saveApplicationModalState !== "create" ? saveApplicationModalState : null;

const [applicationToCopyAssessmentFrom, setApplicationToCopyAssessmentFrom] =
React.useState<Application | null>(null);

const isCopyAssessmentModalOpen = applicationToCopyAssessmentFrom !== null;

const [isAssessModalOpen, setAssessModalOpen] = React.useState(false);
const [archetypeRefsToOverride, setArchetypeRefsToOverride] = React.useState<
Ref[] | null
>(null);

const [
applicationToCopyAssessmentAndReviewFrom,
setCopyAssessmentAndReviewModalState,
] = React.useState<Application | null>(null);

const isCopyAssessmentAndReviewModalOpen =
applicationToCopyAssessmentAndReviewFrom !== null;
const [applicationToAssess, setApplicationToAssess] =
React.useState<Application | null>(null);

const [applicationDependenciesToManage, setApplicationDependenciesToManage] =
React.useState<Application | null>(null);
const isDependenciesModalOpen = applicationDependenciesToManage !== null;

const [applicationToAssess, setApplicationToAssess] =
React.useState<Application | null>(null);

const [assessmentToEdit, setAssessmentToEdit] =
React.useState<Assessment | null>(null);

Expand Down Expand Up @@ -156,9 +146,6 @@ export const ApplicationsTable: React.FC = () => {
refetch: fetchApplications,
} = useFetchApplications();

//TODO: check if any archetypes match this application here
const matchingArchetypes = [];

const onDeleteApplicationSuccess = (appIDCount: number) => {
pushNotification({
title: t("toastr.success.applicationDeleted", {
Expand Down Expand Up @@ -401,12 +388,6 @@ export const ApplicationsTable: React.FC = () => {
selectionState: { selectedItems: selectedRows },
} = tableControls;

const {
reviews,
isFetching: isFetchingReviews,
fetchError: fetchErrorReviews,
} = useFetchReviews();

const [isApplicationImportModalOpen, setIsApplicationImportModalOpen] =
React.useState(false);

Expand Down Expand Up @@ -460,19 +441,56 @@ export const ApplicationsTable: React.FC = () => {
: [];
const dropdownItems = [...importDropdownItems, ...applicationDeleteDropdown];

const assessSelectedApp = (application: Application) => {
// if application/archetype has an assessment, ask if user wants to override it
if (matchingArchetypes.length) {
setAssessModalOpen(true);
setApplicationToAssess(application);
const handleNavToAssessment = (application: Application) => {
application?.id &&
history.push(
formatPath(Paths.applicationAssessmentActions, {
applicationId: application?.id,
})
);
};

const handleNavToViewArchetypes = (application: Application) => {
application?.id &&
archetypeRefsToOverride?.length &&
history.push(
formatPath(Paths.viewArchetypes, {
applicationId: application?.id,
archetypeId: archetypeRefsToOverride[0].id,
})
);
};

const assessSelectedApp = async (application: Application) => {
setApplicationToAssess(application);

if (application?.archetypes?.length) {
for (const archetypeRef of application.archetypes) {
try {
const assessments = await getAssessmentsByItemId(
true,
archetypeRef.id
);

if (assessments && assessments.length > 0) {
setArchetypeRefsToOverride(application.archetypes);
break;
} else {
handleNavToAssessment(application);
}
} catch (error) {
console.error(
`Error fetching archetype with ID ${archetypeRef.id}:`,
error
);
pushNotification({
title: t("terms.error"),
variant: "danger",
});
}
}
} else {
application?.id &&
history.push(
formatPath(Paths.applicationAssessmentActions, {
applicationId: application?.id,
})
);
setApplicationToAssess(null);
handleNavToAssessment(application);
}
};
const reviewSelectedApp = (application: Application) => {
Expand Down Expand Up @@ -858,23 +876,36 @@ export const ApplicationsTable: React.FC = () => {
}}
/>
<ConfirmDialog
title={t("dialog.title.newAssessment")}
title={t("composed.new", {
what: t("terms.assessment").toLowerCase(),
})}
alertMessage={t("message.overrideAssessmentDescription", {
what:
archetypeRefsToOverride
?.map((archetypeRef) => archetypeRef.name)
.join(", ") || "Archetype name",
})}
message={t("message.overrideAssessmentConfirmation")}
titleIconVariant={"warning"}
isOpen={isAssessModalOpen}
message={t("message.overrideArchetypeConfirmation")}
isOpen={archetypeRefsToOverride !== null}
confirmBtnVariant={ButtonVariant.primary}
confirmBtnLabel={t("actions.accept")}
confirmBtnLabel={t("actions.override")}
cancelBtnLabel={t("actions.cancel")}
onCancel={() => setApplicationToAssess(null)}
onClose={() => setApplicationToAssess(null)}
onConfirm={() => {
customActionLabel={t("actions.viewArchetypes")}
onCancel={() => setArchetypeRefsToOverride(null)}
onClose={() => setArchetypeRefsToOverride(null)}
onCustomAction={() => {
applicationToAssess &&
history.push(
formatPath(Paths.applicationAssessmentActions, {
applicationId: applicationToAssess?.id,
})
);
setApplicationToAssess(null);
handleNavToViewArchetypes(applicationToAssess);
}}
onConfirm={() => {
history.push(
formatPath(Paths.applicationAssessmentActions, {
applicationId: activeRowItem?.id,
})
);
setArchetypeRefsToOverride(null);
applicationToAssess && handleNavToAssessment(applicationToAssess);
}}
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ...pplications/components/application-detail-drawer/application-detail-drawer-assessment.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
ApplicationDetailDrawer,
IApplicationDetailDrawerProps,
} from "./application-detail-drawer";
import { useGetReviewByAppId } from "@app/queries/reviews";
import { useFetchReviewById } from "@app/queries/reviews";

export interface IApplicationDetailDrawerAssessmentProps
extends Pick<IApplicationDetailDrawerProps, "application" | "onCloseClick"> {
Expand All @@ -32,7 +32,7 @@ export const ApplicationDetailDrawerAssessment: React.FC<
> = ({ application, onCloseClick, task }) => {
const { t } = useTranslation();

const { review: appReview } = useGetReviewByAppId(application?.id || "");
const { review: appReview } = useFetchReviewById(application?.review?.id);
const notYetReviewed = (
<EmptyTextMessage message={t("terms.notYetReviewed")} />
);
Expand Down
22 changes: 9 additions & 13 deletions client/src/app/pages/archetypes/archetypes-page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,19 +185,6 @@ const Archetypes: React.FC = () => {
setArchetypeToAssess(null);
}
};
const reviewSelectedArchetype = (archetype: Archetype) => {
//TODO: Review archetype
// if (application.review) {
// setReviewToEdit(application.id);
// } else {
// history.push(
// formatPath(Paths.applicationsReview, {
// applicationId: application.id,
// })
// );
// }
};

return (
<>
<PageSection variant={PageSectionVariants.light}>
Expand Down Expand Up @@ -309,6 +296,15 @@ const Archetypes: React.FC = () => {
onClick: () =>
assessSelectedArchetype(archetype),
},
{
title: t("actions.review"),
onClick: () =>
history.push(
formatPath(Paths.archetypeReview, {
archetypeId: archetype.id,
})
),
},
{
title: t("actions.edit"),
onClick: () => setArchetypeToEdit(archetype),
Expand Down
6 changes: 3 additions & 3 deletions ...c/app/pages/assessment-management/import-questionnaire-form/import-questionnaire-form.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ export const ImportQuestionnaireForm: React.FC<
name="yamlFile"
label={t("terms.uploadYamlFile")}
fieldId="yamlFile"
helperText={t("dialog.uploadYamlFile")}
helperText={t("dialog.message.uploadYamlFile")}
renderInput={({ field: { onChange, name }, fieldState: { error } }) => (
<FileUpload
id={`${name}-file-upload`}
name={name}
value={filename}
filename={filename}
filenamePlaceholder={t("dialog.dragAndDropFile")}
filenamePlaceholder={t("dialog.message.dragAndDropFile")}
dropzoneProps={{
accept: {
"text/yaml": [".yml", ".yaml"],
Expand All @@ -151,7 +151,7 @@ export const ImportQuestionnaireForm: React.FC<
if (currentFile.file.size > 1000000) {
methods.setError(name, {
type: "custom",
message: t("dialog.maxFileSize"),
message: t("dialog.message.maxFileSize"),
});
}
setIsFileRejected(true);
Expand Down
Loading

0 comments on commit 30c240e

Please sign in to comment.