From ea5144192667369d4bc0ae81d4ba159a252860b6 Mon Sep 17 00:00:00 2001 From: Courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 13 Sep 2023 09:29:03 -0400 Subject: [PATCH 1/9] Updated header for hiding reports page commented out line 250-255 to hide page. --- frontend/src/components/Header.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 603360916..6a4643b1a 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -247,12 +247,12 @@ const HeaderNoCtx: React.FC = (props) => { exact: false }, { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, - { + /* { title: 'Reports', path: '/reports', users: ALL_USERS, exact: true - }, + },*/ { title: 'Scans', path: '/scans', From d927fb05c2eeb05fd905eb783e1dde9bffa15e5b Mon Sep 17 00:00:00 2001 From: Courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 13 Sep 2023 13:47:28 -0400 Subject: [PATCH 2/9] Updated header --- frontend/src/components/Header.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 6a4643b1a..b80c0d45f 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -247,7 +247,12 @@ const HeaderNoCtx: React.FC = (props) => { exact: false }, { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, +<<<<<<< Updated upstream /* { +======= + + { +>>>>>>> Stashed changes title: 'Reports', path: '/reports', users: ALL_USERS, From 01120dae3ff547349f644e451010b99243a534bb Mon Sep 17 00:00:00 2001 From: Courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 13 Sep 2023 14:05:02 -0400 Subject: [PATCH 3/9] updated 2237 ticket for hiding reports page --- frontend/src/components/Header.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index b80c0d45f..53fcc7ae1 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -247,17 +247,16 @@ const HeaderNoCtx: React.FC = (props) => { exact: false }, { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, -<<<<<<< Updated upstream - /* { -======= - + + /* + hiding reprts page until finished { ->>>>>>> Stashed changes title: 'Reports', path: '/reports', users: ALL_USERS, exact: true },*/ + { title: 'Scans', path: '/scans', From a5c7dbd7a9a03abc3c53f6b9d41b07240e370e28 Mon Sep 17 00:00:00 2001 From: Courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 13 Sep 2023 14:26:36 -0400 Subject: [PATCH 4/9] updated header (prettier) --- frontend/src/components/Header.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 53fcc7ae1..0f5fc195e 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -247,7 +247,7 @@ const HeaderNoCtx: React.FC = (props) => { exact: false }, { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, - + /* hiding reprts page until finished { @@ -256,7 +256,7 @@ const HeaderNoCtx: React.FC = (props) => { users: ALL_USERS, exact: true },*/ - + { title: 'Scans', path: '/scans', @@ -423,10 +423,11 @@ const HeaderNoCtx: React.FC = (props) => { ) { return options; } - return options.filter((option) => - option?.name - .toLowerCase() - .includes(state.inputValue.toLowerCase()) + return options.filter( + (option) => + option?.name + .toLowerCase() + .includes(state.inputValue.toLowerCase()) ); }} disableClearable From 9d6d5cf7590ac831994edf5ec3d2953644f49460 Mon Sep 17 00:00:00 2001 From: "Grayson, Matthew" Date: Mon, 18 Sep 2023 13:12:53 -0500 Subject: [PATCH 5/9] Fix linting errors. --- frontend/src/components/Header.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 0f5fc195e..be28f3807 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -423,11 +423,10 @@ const HeaderNoCtx: React.FC = (props) => { ) { return options; } - return options.filter( - (option) => - option?.name - .toLowerCase() - .includes(state.inputValue.toLowerCase()) + return options.filter((option) => + option?.name + .toLowerCase() + .includes(state.inputValue.toLowerCase()) ); }} disableClearable From 2c82f64fc5a33da1cd582df6384e89bd133281c9 Mon Sep 17 00:00:00 2001 From: "Grayson, Matthew" Date: Mon, 18 Sep 2023 15:43:18 -0500 Subject: [PATCH 6/9] Update snapshot to address 'header matches snapshot' test failure. --- .../__tests__/__snapshots__/header.spec.tsx.snap | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap b/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap index fc7e22fb6..c888d9875 100644 --- a/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap +++ b/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap @@ -60,17 +60,6 @@ exports[`Header component matches snapshot 1`] = ` Feeds -
- - Reports - -
Date: Mon, 18 Sep 2023 15:46:15 -0500 Subject: [PATCH 7/9] Mark pendingDomains as optional to address type error in testOrganization declaration. --- frontend/src/types/organization.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/types/organization.ts b/frontend/src/types/organization.ts index cf484f838..fe3f893a3 100644 --- a/frontend/src/types/organization.ts +++ b/frontend/src/types/organization.ts @@ -14,7 +14,7 @@ export interface Organization { tags: OrganizationTag[]; parent: Organization | null; children: Organization[]; - pendingDomains: PendingDomain[]; + pendingDomains?: PendingDomain[]; } export interface PendingDomain { From f4b933f7bbed206d4b1db494967537a76fb52130 Mon Sep 17 00:00:00 2001 From: "Grayson, Matthew" Date: Mon, 18 Sep 2023 16:06:28 -0500 Subject: [PATCH 8/9] Add pendingDomains to testOrganization; revert pendingDomains to being required in frontend/src/types/organization.ts. --- frontend/src/test-utils/organization.ts | 3 ++- frontend/src/types/organization.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/test-utils/organization.ts b/frontend/src/test-utils/organization.ts index fc58c03e0..60042b454 100644 --- a/frontend/src/test-utils/organization.ts +++ b/frontend/src/test-utils/organization.ts @@ -9,5 +9,6 @@ export const testOrganization = { granularScans: [], tags: [], parent: null, - children: [] + children: [], + pendingDomains: [] }; diff --git a/frontend/src/types/organization.ts b/frontend/src/types/organization.ts index fe3f893a3..cf484f838 100644 --- a/frontend/src/types/organization.ts +++ b/frontend/src/types/organization.ts @@ -14,7 +14,7 @@ export interface Organization { tags: OrganizationTag[]; parent: Organization | null; children: Organization[]; - pendingDomains?: PendingDomain[]; + pendingDomains: PendingDomain[]; } export interface PendingDomain { From d5d74bbd916603f34f4d60fef7c8fe52cbb36a62 Mon Sep 17 00:00:00 2001 From: courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:05:52 -0400 Subject: [PATCH 9/9] Update frontend/src/components/Header.tsx updating typo Co-authored-by: Ashwin Ramaswami --- frontend/src/components/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index be28f3807..badcb8f06 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -249,7 +249,7 @@ const HeaderNoCtx: React.FC = (props) => { { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, /* - hiding reprts page until finished + Hiding Reports page until finished { title: 'Reports', path: '/reports',