From 591a2309691740b6f2be64dadfdaef24c23603ea Mon Sep 17 00:00:00 2001 From: Daniel <79996555+daniel-cy-lu@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:13:55 -0500 Subject: [PATCH 1/3] add space comma in fields that are in array format. Issue with element strings showing up on summary table with no space resolved --- .../pages/program-entity/ProgramCardsLayout/util.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/components/pages/program-entity/ProgramCardsLayout/util.tsx b/components/pages/program-entity/ProgramCardsLayout/util.tsx index aff6838cf..7e6a87415 100644 --- a/components/pages/program-entity/ProgramCardsLayout/util.tsx +++ b/components/pages/program-entity/ProgramCardsLayout/util.tsx @@ -21,12 +21,13 @@ import sqonBuilder from 'sqon-builder'; import type { ProgramSummaryQuery } from '../types'; export const createProgramSummaryData = (programSummaryQuery: ProgramSummaryQuery) => { + console.log('programSummaryQuery!!!!', programSummaryQuery); return { 'Program Shortname': programSummaryQuery?.shortName || '', 'Full Program Name': programSummaryQuery?.name || '', Description: programSummaryQuery?.description || '', - Countries: programSummaryQuery?.countries || '', - 'Primary Sites': programSummaryQuery?.primarySites || '', + Countries: programSummaryQuery?.countries?.join(', ') || '', + 'Primary Sites': programSummaryQuery?.primarySites?.join(', ') || '', Website: programSummaryQuery.website ? ( Date: Thu, 30 Nov 2023 16:24:47 -0500 Subject: [PATCH 2/3] remove console --- .husky/pre-commit | 4 ---- .husky/pre-push | 5 ----- components/pages/program-entity/ProgramCardsLayout/util.tsx | 1 - 3 files changed, 10 deletions(-) delete mode 100755 .husky/pre-commit delete mode 100755 .husky/pre-push diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index eb6801c73..000000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - -npx --no pretty-quick@^2.0.1 --staged diff --git a/.husky/pre-push b/.husky/pre-push deleted file mode 100755 index 0258a6776..000000000 --- a/.husky/pre-push +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - -npm run graphql-codegen -npm run type-check diff --git a/components/pages/program-entity/ProgramCardsLayout/util.tsx b/components/pages/program-entity/ProgramCardsLayout/util.tsx index 7e6a87415..f6984b2c1 100644 --- a/components/pages/program-entity/ProgramCardsLayout/util.tsx +++ b/components/pages/program-entity/ProgramCardsLayout/util.tsx @@ -21,7 +21,6 @@ import sqonBuilder from 'sqon-builder'; import type { ProgramSummaryQuery } from '../types'; export const createProgramSummaryData = (programSummaryQuery: ProgramSummaryQuery) => { - console.log('programSummaryQuery!!!!', programSummaryQuery); return { 'Program Shortname': programSummaryQuery?.shortName || '', 'Full Program Name': programSummaryQuery?.name || '', From c07891cf9762bbe948aac9f31e4841ed9b8ccd60 Mon Sep 17 00:00:00 2001 From: Daniel <79996555+daniel-cy-lu@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:13:25 -0500 Subject: [PATCH 3/3] add back husky folder --- .husky/pre-commit | 4 ++++ .husky/pre-push | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 .husky/pre-commit create mode 100644 .husky/pre-push diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100644 index 000000000..732b4598d --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" + +npx --no pretty-quick@^2.0.1 --staged \ No newline at end of file diff --git a/.husky/pre-push b/.husky/pre-push new file mode 100644 index 000000000..c042ab33a --- /dev/null +++ b/.husky/pre-push @@ -0,0 +1,5 @@ +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" + +npm run graphql-codegen +npm run type-check \ No newline at end of file