feature: add support for multi region param

mondaycom · May 27, 2024 · f5bd864 · f5bd864
1 parent c8bf7af
commit f5bd864
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/consts/urls.ts b/src/consts/urls.ts
@@ -1,6 +1,7 @@
 import { AppFeatureType } from 'src/types/services/app-features-service';
 import { LogType, LogsFilterCriteriaArguments } from 'types/commands/logs';
 import { AppId } from 'types/general';
+import { Region } from 'types/general/region';
 
 const BASE_APPS_URL = '/api/apps';
 const BASE_APP_VERSIONS_URL = '/api/app-versions';
@@ -48,13 +49,16 @@ export const getLogsStreamForAppVersionIdUrl = (
   appVersionId: number,
   logsType: LogType,
   logsFilterCriteria?: LogsFilterCriteriaArguments | null,
+  region?: Region,
 ): string => {
   const logsFilterCriteriaParams = logsFilterCriteria
     ? `&fromDate=${logsFilterCriteria.fromDate.getTime()}&toDate=${logsFilterCriteria.toDate.getTime()}&text=${encodeURIComponent(
         logsFilterCriteria.text || '',
       )}`
     : '';
-  return `${appVersionIdBaseUrl(appVersionId)}/logs?type=${logsType}${logsFilterCriteriaParams}`;
+  return `${appVersionIdBaseUrl(appVersionId)}/logs?type=${logsType}${logsFilterCriteriaParams}${
+    region ? `&region=${region}` : ''
+  }`;
 };
 
 export const listAppsUrl = (): string => {

diff --git a/src/services/notification-service.ts b/src/services/notification-service.ts
@@ -9,7 +9,6 @@ import { Region } from 'types/general/region';
 import { HttpMethodTypes } from 'types/services/api-service';
 import { ClientChannel } from 'types/services/notification-service';
 import logger from 'utils/logger';
-import { addRegionToQuery } from 'utils/region';
 import { appsUrlBuilder } from 'utils/urls-builder';
 
 export const logsStream = async (
@@ -19,13 +18,11 @@ export const logsStream = async (
   region?: Region,
 ): Promise<ClientChannel> => {
   try {
-    const logsStreamForUrl = getLogsStreamForAppVersionIdUrl(appVersionId, logsType, logsFilterCriteria);
+    const logsStreamForUrl = getLogsStreamForAppVersionIdUrl(appVersionId, logsType, logsFilterCriteria, region);
     const url = appsUrlBuilder(logsStreamForUrl);
     logger.debug(`fetching logs url: ${url}`);
-    const query = addRegionToQuery({}, region);
     const response = await execute<ClientChannel>(
       {
-        query,
         url,
         headers: { Accept: 'application/json' },
         method: HttpMethodTypes.GET,