sort cancer types alphabetically

bprize15 · bprize15 · commit bb968344ffc2 · 2024-05-30T10:42:30.000-04:00
diff --git a/src/main/webapp/app/components/tabs/CurationHistoryTab.tsx b/src/main/webapp/app/components/tabs/CurationHistoryTab.tsx
@@ -73,7 +73,7 @@ const CurationHistoryTab = observer(({ historyData, getUsers, users, historyTabS
 
   useEffect(() => {
     async function fetchAllDrugs() {
-      const drugs = await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: 'id,asc' });
+      const drugs = await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: ['id,asc'] });
       setDrugList(drugs['data']);
     }
 
diff --git a/src/main/webapp/app/components/tabs/ReviewHistoryTab.tsx b/src/main/webapp/app/components/tabs/ReviewHistoryTab.tsx
@@ -24,7 +24,7 @@ function ReviewHistoryTab({ firebaseDb, drugList, getDrugs }: StoreProps) {
   }, []);
 
   useEffect(() => {
-    getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: 'id,asc' });
+    getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: ['id,asc'] });
   }, []);
 
   function handleDownload() {
diff --git a/src/main/webapp/app/pages/curation/CurationPage.tsx b/src/main/webapp/app/pages/curation/CurationPage.tsx
@@ -56,7 +56,7 @@ export const CurationPage = (props: ICurationPageProps) => {
 
   useEffect(() => {
     props.searchGeneEntities({ query: hugoSymbolParam, exact: true });
-    props.getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: 'id,asc' });
+    props.getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: ['id,asc'] });
     return () => {
       props.setOpenMutationCollapsibleIndex(null);
     };
diff --git a/src/main/webapp/app/pages/curation/list/TherapiesList.tsx b/src/main/webapp/app/pages/curation/list/TherapiesList.tsx
@@ -60,7 +60,7 @@ const TherapiesList = ({
               treatmentIndex,
               treatment,
             };
-          })
+          }),
         );
       }, []);
 
@@ -113,7 +113,7 @@ const TherapiesList = ({
         onConfirm={async (newTreatment, newDrugs) => {
           try {
             await Promise.all(newDrugs.map(drug => createDrug(drug)));
-            await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: 'id,asc' });
+            await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: ['id,asc'] });
             await addTreatment(`${tisPath}/${tisLength - 1}/treatments`, newTreatment);
           } catch (error) {
             notifyError(error);
diff --git a/src/main/webapp/app/shared/select/CancerTypeSelect.tsx b/src/main/webapp/app/shared/select/CancerTypeSelect.tsx
@@ -72,9 +72,14 @@ const CancerTypeSelect: React.FunctionComponent<ICancerTypeSelectProps> = props
     let result = undefined;
     let options = [];
     if (searchWord) {
-      result = await props.searchCancerTypes({ query: searchWord, page: page - 1, size: ITEMS_PER_PAGE, sort: DEFAULT_SORT_PARAMETER });
+      result = await props.searchCancerTypes({
+        query: searchWord,
+        page: page - 1,
+        size: ITEMS_PER_PAGE,
+        sort: ['subtype,ASC', 'mainType,ASC'],
+      });
     } else {
-      result = await props.getCancerTypes({ page: page - 1, size: ITEMS_PER_PAGE, sort: 'id,ASC' });
+      result = await props.getCancerTypes({ page: page - 1, size: ITEMS_PER_PAGE, sort: ['subtype,ASC', 'mainType,ASC'] });
     }
 
     options = getAllCancerTypesOptions(result.data);
diff --git a/src/main/webapp/app/shared/select/DrugSelect.tsx b/src/main/webapp/app/shared/select/DrugSelect.tsx
@@ -49,7 +49,7 @@ const DrugSelect: React.FunctionComponent<IDrugSelectProps> = props => {
     }
 
     async function fetchAllDrugs() {
-      const drugs: IDrug[] = (await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: sortParameter }))?.['data'];
+      const drugs: IDrug[] = (await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: [sortParameter] }))?.['data'];
       setDrugOptions(getDrugSelectOptionsFromDrugs(drugs));
     }
 
diff --git a/src/main/webapp/app/shared/select/GeneSelect.tsx b/src/main/webapp/app/shared/select/GeneSelect.tsx
@@ -30,9 +30,9 @@ const GeneSelect = (props: IGeneSelectProps) => {
     let result = undefined;
     let options: GeneSelectOption[] = [];
     if (searchWord) {
-      result = await searchGenes({ query: searchWord, page: page - 1, size: ITEMS_PER_PAGE, sort: sortParamter });
+      result = await searchGenes({ query: searchWord, page: page - 1, size: ITEMS_PER_PAGE, sort: [sortParamter] });
     } else {
-      result = await getGenes({ page: page - 1, size: ITEMS_PER_PAGE, sort: sortParamter });
+      result = await getGenes({ page: page - 1, size: ITEMS_PER_PAGE, sort: [sortParamter] });
     }
 
     options = result?.data?.map((entity: IGene) => ({
diff --git a/src/main/webapp/app/shared/table/OncoKBAsyncTable.tsx b/src/main/webapp/app/shared/table/OncoKBAsyncTable.tsx
@@ -3,12 +3,13 @@ import ReactTable, { TableProps } from 'react-table';
 import { Col, Input, Row } from 'reactstrap';
 import { ASC, DESC, ITEMS_PER_PAGE } from 'app/shared/util/pagination.constants';
 import { debouncedSearchWithPagination } from '../util/pagination-crud-store';
+import { IQueryParams, ISearchParams } from '../util/jhipster-types';
 
 /* eslint-disable @typescript-eslint/ban-types */
 export interface IOncoKBAsyncTableProps<T> extends Partial<TableProps<T>> {
   initialPaginationState: PaginationState<T>;
-  searchEntities: ({ query, page, size, sort }) => void;
-  getEntities: ({ page, size, sort }) => void;
+  searchEntities: ({ query, page, size, sort }: ISearchParams) => void;
+  getEntities: ({ page, size, sort }: IQueryParams) => void;
   totalItems: number;
   loading?: boolean;
   fixedHeight?: boolean;
@@ -28,17 +29,19 @@ export const OncoKBAsyncTable = <T extends object>(props: IOncoKBAsyncTableProps
   useEffect(() => {
     if (searchKeyword) {
       debouncedSearchWithPagination(
-        searchKeyword,
-        paginationState.activePage - 1,
-        props.pageSize,
-        `${paginationState.sort as string},${paginationState.order}`,
-        props.searchEntities
+        {
+          query: searchKeyword,
+          page: paginationState.activePage - 1,
+          size: props.pageSize,
+          sort: [`${paginationState.sort as string},${paginationState.order}`],
+        },
+        props.searchEntities,
       );
     } else {
       props.getEntities({
         page: paginationState.activePage - 1,
         size: pageSize,
-        sort: `${paginationState.sort as string},${paginationState.order}`,
+        sort: [`${paginationState.sort as string},${paginationState.order}`],
       });
     }
   }, [paginationState.activePage, paginationState.order, paginationState.sort, pageSize, searchKeyword]);
diff --git a/src/main/webapp/app/shared/util/infinite-scroll-crud-store.ts b/src/main/webapp/app/shared/util/infinite-scroll-crud-store.ts
@@ -3,11 +3,16 @@ import { IRootStore } from 'app/stores';
 import BaseCrudStore from './base-crud-store';
 import { action, observable, makeObservable } from 'mobx';
 import { loadMoreDataWhenScrolled, parseHeaderForLinks } from 'react-jhipster';
+import { parseSort } from './utils';
 
 export class InfiniteScrollCrudStore<T> extends BaseCrudStore<T> {
   public links: { [key: string]: number } = { last: 0 };
 
-  constructor(protected rootStore: IRootStore, protected apiUrl: string, protected settings = { clearOnUnobserved: false }) {
+  constructor(
+    protected rootStore: IRootStore,
+    protected apiUrl: string,
+    protected settings = { clearOnUnobserved: false },
+  ) {
     super(rootStore, apiUrl, settings);
 
     makeObservable(this, {
@@ -26,7 +31,7 @@ export class InfiniteScrollCrudStore<T> extends BaseCrudStore<T> {
   }
 
   *getAll({ page, size, sort }) {
-    this.lastUrl = `${this.apiUrl}${sort ? `?page=${page}&size=${size}&sort=${sort}` : ''}`;
+    this.lastUrl = `${this.apiUrl}${sort ? `?page=${page}&size=${size}${parseSort(sort)}` : ''}`;
     return yield* this.getAllFromLastUrl();
   }
 
diff --git a/src/main/webapp/app/shared/util/jhipster-types.ts b/src/main/webapp/app/shared/util/jhipster-types.ts
@@ -9,7 +9,7 @@ export interface IQueryParams {
   query?: string;
   page?: number;
   size?: number;
-  sort?: string;
+  sort?: string[];
 }
 
 export interface ISearchParams extends IQueryParams {
diff --git a/src/main/webapp/app/shared/util/pagination-crud-store.ts b/src/main/webapp/app/shared/util/pagination-crud-store.ts
@@ -2,13 +2,14 @@ import axios, { AxiosResponse } from 'axios';
 import { IRootStore } from 'app/stores';
 import BaseCrudStore from 'app/shared/util/base-crud-store';
 import _ from 'lodash';
-import { ICrudSearchAction } from 'app/shared/util/jhipster-types';
+import { ICrudSearchAction, ISearchParams } from 'app/shared/util/jhipster-types';
 import { ENTITY_TYPE } from 'app/config/constants/constants';
 import { getEntityResourcePath } from 'app/shared/util/RouteUtils';
 import { computed, makeObservable } from 'mobx';
+import { parseSort } from './utils';
 
 export const debouncedSearchWithPagination = _.debounce(
-  (query: string, page, size, sort, searchEntities) => {
+  ({ query, page, size, sort }: ISearchParams, searchEntities) => {
     if (query && query.length > 2) {
       return searchEntities({
         query,
@@ -21,18 +22,22 @@ export const debouncedSearchWithPagination = _.debounce(
     }
   },
   1000,
-  { leading: true }
+  { leading: true },
 );
 
 export class PaginationCrudStore<T> extends BaseCrudStore<T> {
   searchEntities: ICrudSearchAction<T> = this.updateHandler(this.getSearch);
 
-  constructor(protected rootStore: IRootStore, protected entityType: ENTITY_TYPE, protected settings = { clearOnUnobserved: false }) {
+  constructor(
+    protected rootStore: IRootStore,
+    protected entityType: ENTITY_TYPE,
+    protected settings = { clearOnUnobserved: false },
+  ) {
     super(rootStore, getEntityResourcePath(entityType), settings);
   }
 
   *getAll({ page, size, sort }) {
-    this.lastUrl = `${this.apiUrl}${sort ? `?page=${page}&size=${size}&sort=${sort}` : ''}`;
+    this.lastUrl = `${this.apiUrl}${sort ? `?page=${page}&size=${size}${parseSort(sort)}` : ''}`;
     return yield* this.getAllFromLastUrl();
   }
 
@@ -43,9 +48,9 @@ export class PaginationCrudStore<T> extends BaseCrudStore<T> {
     return result;
   }
 
-  *getSearch({ query, exact, page, size, sort }) {
+  *getSearch({ query, exact, page, size, sort }: ISearchParams) {
     let url = `${this.apiUrl}/search?query=${query}${page ? `&page=${page}` : ''}${size ? `&size=${size}` : ''}${
-      sort ? `&sort=${sort}` : ''
+      sort ? parseSort(sort) : ''
     }`;
     if (exact !== undefined) {
       url = `${url}&exact=${exact}`;
diff --git a/src/main/webapp/app/shared/util/utils.tsx b/src/main/webapp/app/shared/util/utils.tsx
@@ -16,6 +16,7 @@ import { IDrug } from 'app/shared/model/drug.model';
 import { IRule } from 'app/shared/model/rule.model';
 import { INTEGER_REGEX, REFERENCE_LINK_REGEX, SINGLE_NUCLEOTIDE_POS_REGEX, UUID_REGEX } from 'app/config/constants/regex';
 import { ProteinExonDTO } from 'app/shared/api/generated/curation';
+import { IQueryParams } from './jhipster-types';
 
 export const getCancerTypeName = (cancerType: ICancerType | CancerType, omitCode = false): string => {
   if (!cancerType) return '';
@@ -375,3 +376,7 @@ export function getExonRanges(exons: ProteinExonDTO[]) {
 export function isUuid(str: string) {
   return UUID_REGEX.test(str);
 }
+
+export const parseSort = (sort: IQueryParams['sort']) => {
+  return sort.map(sortMethod => `&sort=${sortMethod}`).join('');
+};

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ const CurationHistoryTab = observer(({ historyData, getUsers, users, historyTabS`
`73`	`73`
`74`	`74`	`useEffect(() => {`
`75`	`75`	`async function fetchAllDrugs() {`
`76`		`- const drugs = await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: 'id,asc' });`
	`76`	`+ const drugs = await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: ['id,asc'] });`
`77`	`77`	`setDrugList(drugs['data']);`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ const DrugSelect: React.FunctionComponent<IDrugSelectProps> = props => {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`async function fetchAllDrugs() {`
`52`		`- const drugs: IDrug[] = (await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: sortParameter }))?.['data'];`
	`52`	`+ const drugs: IDrug[] = (await getDrugs({ page: 0, size: GET_ALL_DRUGS_PAGE_SIZE, sort: [sortParameter] }))?.['data'];`
`53`	`53`	`setDrugOptions(getDrugSelectOptionsFromDrugs(drugs));`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export interface IQueryParams {`
`9`	`9`	`query?: string;`
`10`	`10`	`page?: number;`
`11`	`11`	`size?: number;`
`12`		`- sort?: string;`
	`12`	`+ sort?: string[];`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`export interface ISearchParams extends IQueryParams {`