fix(sub source): Display submission source as OneMAC for legacy and m…

…icro, blank for all else (#282) * fix(sub source): Display submission source as OneMAC for legacy and mako records, blank for all else * Add submission source to filters
Enterprise-CMCS · Dec 31, 2023 · b0b61f8 · b0b61f8
1 parent 58ac10a
commit b0b61f8
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 12 deletions.
diff --git a/src/packages/shared-types/onemac.ts b/src/packages/shared-types/onemac.ts
@@ -35,6 +35,7 @@ export const transformOnemac = (id: string) => {
       additionalInformation: data.additionalInformation,
       submitterEmail: data.submitterEmail,
       submitterName: data.submitterName === "-- --" ? null : data.submitterName,
+      origin: "OneMAC",
       rais: {} as {
         [key: number]: {
           requestedDate?: string;

diff --git a/src/packages/shared-types/onemacLegacy.ts b/src/packages/shared-types/onemacLegacy.ts
@@ -33,7 +33,7 @@ export const transformOnemacLegacy = (id: string) => {
       additionalInformation: data.additionalInformation,
       submitterEmail: data.submitterEmail,
       submitterName: data.submitterName === "-- --" ? null : data.submitterName,
-      origin: "oneMAC",
+      origin: "OneMAC",
       rais: {} as {
         [key: number]: {
           requestedDate?: string;

diff --git a/src/services/ui/src/components/Opensearch/Filtering/consts.ts b/src/services/ui/src/components/Opensearch/Filtering/consts.ts
@@ -68,6 +68,14 @@ const SPA_FILTER_GROUP = (isCms: boolean): FilterGroup => {
       type: "terms",
       value: [],
     },
+    "origin.keyword": {
+      label: "Submission Source",
+      field: "origin.keyword",
+      component: "multiSelect",
+      prefix: "must",
+      type: "terms",
+      value: [],
+    },
   };
 };
 
@@ -129,6 +137,14 @@ const WAIVER_FILTER_GROUP = (isCms: boolean): FilterGroup => {
       type: "terms",
       value: [],
     },
+    "origin.keyword": {
+      label: "Submission Source",
+      field: "origin.keyword",
+      component: "multiSelect",
+      prefix: "must",
+      type: "terms",
+      value: [],
+    },
   };
 };
 

diff --git a/src/services/ui/src/components/Opensearch/useOpensearch.ts b/src/services/ui/src/components/Opensearch/useOpensearch.ts
@@ -111,6 +111,12 @@ export const useOsAggregate = () => {
             type: "terms",
             size: 1000,
           },
+          {
+            field: "origin.keyword",
+            name: "origin.keyword",
+            type: "terms",
+            size: 10,
+          },
         ],
         filters: DEFAULT_FILTERS[props.queryKey[0]].filters || [],
         pagination: { number: 0, size: 1 },

diff --git a/src/services/ui/src/pages/dashboard/Lists/spas/consts.tsx b/src/services/ui/src/pages/dashboard/Lists/spas/consts.tsx
@@ -56,9 +56,6 @@ export const useSpaTableColumns = (): OsTableColumn[] => {
       label: "Submission Source",
       visible: false,
       cell: (data) => {
-        if (data.origin?.toLowerCase() === "onemac") {
-          return "OneMAC";
-        }
         return data.origin;
       },
     },

diff --git a/src/services/ui/src/pages/dashboard/Lists/waivers/consts.tsx b/src/services/ui/src/pages/dashboard/Lists/waivers/consts.tsx
@@ -64,9 +64,6 @@ export const useWaiverTableColumns = (): OsTableColumn[] => {
       label: "Submission Source",
       visible: false,
       cell: (data) => {
-        if (data.origin?.toLowerCase() === "onemac") {
-          return "OneMAC";
-        }
         return data.origin;
       },
     },

diff --git a/src/services/ui/src/pages/detail/setup/spa.tsx b/src/services/ui/src/pages/detail/setup/spa.tsx
@@ -78,11 +78,7 @@ export const submissionDetails = (
   },
   {
     label: "Submission Source",
-    value: (
-      <p className="text-lg">
-        {data?.origin?.toLowerCase() === "onemac" ? "OneMAC" : BLANK_VALUE}
-      </p>
-    ),
+    value: <p className="text-lg">{data?.origin || BLANK_VALUE}</p>,
     canView: () => true,
   },
   {