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

🐛 Missing assessment tags #1459

Merged
merged 2 commits into from
Oct 11, 2023
Merged

🐛 Missing assessment tags #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
013da52
:bug: Criteria tags not being populated in edit archetype form
ibolton336 Oct 11, 2023
6a7b6e8
Merge branch 'main' into missing-assessment-tags
ibolton336 Oct 11, 2023
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
2 changes: 1 addition & 1 deletion client/src/app/pages/applications/components/application-form/application-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({

const manualTags: TagRef[] = useMemo(() => {
const rawManualTags: TagRef[] =
application?.tags?.filter((t) => t?.source ?? "" === "") ?? [];
application?.tags?.filter((t) => !t?.source) ?? [];
return dedupeArrayOfObjects<TagRef>(rawManualTags, "name");
}, [application?.tags]);

Expand Down
27 changes: 14 additions & 13 deletions client/src/app/pages/archetypes/components/archetype-detail-drawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ import {
} from "@patternfly/react-core";
import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";

import { Archetype, Tag } from "@app/api/models";
import { Archetype, Tag, TagRef } from "@app/api/models";
import { EmptyTextMessage } from "@app/components/EmptyTextMessage";
import { PageDrawerContent } from "@app/components/PageDrawerContext";
import { useFetchTagCategories } from "@app/queries/tags";

import "./archetype-detail-drawer.css";
import { dedupeArrayOfObjects } from "@app/utils/utils";

export interface IArchetypeDetailDrawerProps {
onCloseClick: () => void;
Expand All @@ -40,17 +41,17 @@ const ArchetypeDetailDrawer: React.FC<IArchetypeDetailDrawerProps> = ({
[tagCategories]
);

const archetypeTags =
archetype?.tags
?.filter((t) => t?.source ?? "" === "")
.map((ref) => tags.find((tag) => ref.id === tag.id))
.filter(Boolean) ?? [];
const manualTags: TagRef[] = useMemo(() => {
const rawManualTags: TagRef[] =
archetype?.tags?.filter((t) => !t?.source) ?? [];
return dedupeArrayOfObjects<TagRef>(rawManualTags, "name");
}, [archetype?.tags]);

const assessmentTags =
archetype?.tags
?.filter((t) => t?.source ?? "" !== "")
.map((ref) => tags.find((tag) => ref.id === tag.id))
.filter(Boolean) ?? [];
const assessmentTags: TagRef[] = useMemo(() => {
const rawAssessmentTags: TagRef[] =
archetype?.tags?.filter((t) => t?.source === "assessment") ?? [];
return dedupeArrayOfObjects<TagRef>(rawAssessmentTags, "name");
}, [archetype?.tags]);

return (
<PageDrawerContent
Expand Down Expand Up @@ -93,8 +94,8 @@ const ArchetypeDetailDrawer: React.FC<IArchetypeDetailDrawerProps> = ({
<DescriptionListGroup>
<DescriptionListTerm>{t("terms.tagsArchetype")}</DescriptionListTerm>
<DescriptionListDescription>
{archetypeTags.length > 0 ? (
<TagLabels tags={archetypeTags} />
{manualTags.length > 0 ? (
<TagLabels tags={manualTags} />
) : (
<EmptyTextMessage message={t("terms.none")} />
)}
Expand Down
27 changes: 19 additions & 8 deletions client/src/app/pages/archetypes/components/archetype-form/archetype-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import type {
Stakeholder,
StakeholderGroup,
Tag,
TagRef,
} from "@app/api/models";
import {
HookFormPFTextArea,
Expand All @@ -30,7 +31,11 @@ import {
useCreateArchetypeMutation,
useUpdateArchetypeMutation,
} from "@app/queries/archetypes";
import { duplicateNameCheck, getAxiosErrorMessage } from "@app/utils/utils";
import {
dedupeArrayOfObjects,
duplicateNameCheck,
getAxiosErrorMessage,
} from "@app/utils/utils";
import { useFetchTagCategories } from "@app/queries/tags";

import { useFetchStakeholderGroups } from "@app/queries/stakeholdergoups";
Expand Down Expand Up @@ -78,11 +83,17 @@ export const ArchetypeForm: React.FC<ArchetypeFormProps> = ({
onActionSuccess: onClose,
});

const archetypeTags =
archetype?.tags?.filter((t) => t?.source ?? "" === "") ?? [];
const manualTags: TagRef[] = useMemo(() => {
const rawManualTags: TagRef[] =
archetype?.tags?.filter((t) => !t?.source) ?? [];
return dedupeArrayOfObjects<TagRef>(rawManualTags, "name");
}, [archetype?.tags]);

const assessmentTags =
archetype?.tags?.filter((t) => t?.source ?? "" !== "") ?? [];
const assessmentTags: TagRef[] = useMemo(() => {
const rawAssessmentTags: TagRef[] =
archetype?.tags?.filter((t) => t?.source === "assessment") ?? [];
return dedupeArrayOfObjects<TagRef>(rawAssessmentTags, "name");
}, [archetype?.tags]);

const validationSchema = yup.object().shape({
name: yup
Expand Down Expand Up @@ -154,7 +165,7 @@ export const ArchetypeForm: React.FC<ArchetypeFormProps> = ({
comments: archetype?.comments || "",

criteria: archetype?.criteria?.map((tag) => tag.name).sort() ?? [],
tags: archetypeTags.map((tag) => tag.name).sort() ?? [],
tags: manualTags.map((tag) => tag.name).sort() ?? [],

stakeholders: archetype?.stakeholders?.map((sh) => sh.name).sort() ?? [],
stakeholderGroups:
Expand All @@ -167,14 +178,14 @@ export const ArchetypeForm: React.FC<ArchetypeFormProps> = ({
const onValidSubmit = (values: ArchetypeFormValues) => {
// Note: We need to manually retain the tags with source != "" in the payload
const tags = [...(tagsToRefs(values.tags) ?? []), ...assessmentTags];
const criteriaTags = tagsToRefs(values.criteria) ?? [];

const payload: New<Archetype> = {
name: values.name.trim(),
description: values.description?.trim() ?? "",
comments: values.comments?.trim() ?? "",

criteria: values.criteria
.map((tagName) => tags.find((tag) => tag.name === tagName))
.map((tagName) => criteriaTags.find((tag) => tag.name === tagName))
.filter(Boolean),

tags: values.tags
Expand Down
9 changes: 6 additions & 3 deletions client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,12 +566,15 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
);

useEffect(() => {
return () => {
if (assessment) {
const unlisten = history.listen((newLocation, action) => {
if (action === "PUSH" && assessment) {
handleCancelAssessment();
}
});
return () => {
unlisten();
};
}, [assessment]);
}, [history, assessment]);

const handleCancelAssessment = () => {
if (assessment) {
Expand Down
Loading