feat: created getUrlKeyParam util function

shesha-io · Jul 13, 2023 · aca9eb0 · aca9eb0
1 parent 51d1044
commit aca9eb0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/shesha-reactjs/src/providers/dataTable/repository/urlRepository.tsx b/shesha-reactjs/src/providers/dataTable/repository/urlRepository.tsx
@@ -20,6 +20,7 @@ import { IConfigurableColumnsProps } from 'providers/datatableColumnsConfigurato
 import { IMetadataDispatcherActionsContext } from 'providers/metadataDispatcher/contexts';
 import { IEntityEndpointsEvaluator, useModelApiHelper } from 'components/configurableForm/useActionEndpoint';
 import { IUseMutateResponse, useMutate } from 'hooks/useMutate';
+import { getUrlKeyParam } from 'utils';
 
 export interface IWithUrlRepositoryArgs {
   getListUrl: string;
@@ -97,8 +98,9 @@ const createRepository = (args: ICreateUrlRepositoryArgs): IUrlRepository => {
 
   const fetch = (payload: IGetListDataPayload): Promise<ITableDataInternalResponse> => {
     const getDataPayload = convertPayload(payload);
+    const key = getUrlKeyParam(getListUrl);
 
-    const getDataUrl = `${backendUrl}${getListUrl}?${qs.stringify(getDataPayload)}`;
+    const getDataUrl = `${backendUrl}${getListUrl}${key}${qs.stringify(getDataPayload)}`;
 
     return axios({
       url: getDataUrl,

diff --git a/shesha-reactjs/src/utils/index.ts b/shesha-reactjs/src/utils/index.ts
@@ -204,3 +204,5 @@ export const evaluateDynamicFilters = async (
 
   return convertedFilters;
 };
+
+export const getUrlKeyParam = (url: string = ''): '?' | '&' => (url?.includes('?') ? '&' : '?');