From 96b6bd7994c5933c1a7a8176a642e669bc1e44dc Mon Sep 17 00:00:00 2001 From: AyushRanjan Date: Fri, 24 Nov 2023 11:33:52 +0530 Subject: [PATCH 1/2] TP-48687 | url migrated --- src/Pages/Incidents/constants.ts | 6 +++--- src/Pages/Team/constants.ts | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Pages/Incidents/constants.ts b/src/Pages/Incidents/constants.ts index 4b564f7..229d68e 100644 --- a/src/Pages/Incidents/constants.ts +++ b/src/Pages/Incidents/constants.ts @@ -26,13 +26,13 @@ export const FETCH_HEADER_DETAILS = `${window?.config?.BASE_API_URL}/incidents/h export const UPDATE_INCIDENT = `${window?.config?.BASE_API_URL}/incidents`; -export const LINK_JIRA_INCIDENT = `${window?.config?.BASE_API_URL}/houston/link-jira-to-incident`; +export const LINK_JIRA_INCIDENT = `${window?.config?.BASE_API_URL}/link-jira-to-incident`; -export const UNLINK_JIRA_INCIDENT = `${window?.config?.BASE_API_URL}/houston/unlink-jira-from-incident`; +export const UNLINK_JIRA_INCIDENT = `${window?.config?.BASE_API_URL}/unlink-jira-from-incident`; export const SLACK_BASE_URL = 'https://go-navi.slack.com/'; export const FETCH_AUDIT_LOG = (incidentId: string): string => { - return `${window?.config?.BASE_API_URL}/houston/logs/incident/${incidentId}`; + return `${window?.config?.BASE_API_URL}/logs/incident/${incidentId}`; }; export interface ContentProps { diff --git a/src/Pages/Team/constants.ts b/src/Pages/Team/constants.ts index df52673..ecd23d4 100644 --- a/src/Pages/Team/constants.ts +++ b/src/Pages/Team/constants.ts @@ -1,6 +1,6 @@ export const FETCH_TEAM_DATA = `${window?.config?.BASE_API_URL}/teams`; -export const FETCH_ALL_BOTS_DATA = `${window?.config?.BASE_API_URL}/houston/bots`; -export const CREATE_TEAM = `${window?.config?.BASE_API_URL}/houston/teams/add`; +export const FETCH_ALL_BOTS_DATA = `${window?.config?.BASE_API_URL}/bots`; +export const CREATE_TEAM = `${window?.config?.BASE_API_URL}/teams/add`; export const FETCH_SINGLE_TEAM_DATA = (payload: string): string => { return `${window?.config?.BASE_API_URL}/teams/${payload}`; @@ -11,11 +11,11 @@ export const UPDATE_TEAM_DATA = (): string => { }; export const REMOVE_TEAM_MEMBER = (teamId: string, userId: string): string => { - return `${window?.config?.BASE_API_URL}/houston/teams/${teamId}/members/${userId}`; + return `${window?.config?.BASE_API_URL}/teams/${teamId}/members/${userId}`; }; export const MAKE_MANAGER = (teamId: string, userId: string): string => { - return `${window?.config?.BASE_API_URL}/houston/teams/${teamId}/manager/${userId}`; + return `${window?.config?.BASE_API_URL}/teams/${teamId}/manager/${userId}`; }; export const regularExpression = /^[a-zA-Z][a-zA-Z0-9_ -]{1,48}[a-zA-Z0-9]$/; From 2cce6073dd6ca68ee814eec35afa1b2cc8abf152 Mon Sep 17 00:00:00 2001 From: AyushRanjan Date: Mon, 27 Nov 2023 14:33:07 +0530 Subject: [PATCH 2/2] TP-48687 | api create helper funct added --- src/Pages/Dashboard/constants.ts | 7 +++++-- src/Pages/Incidents/constants.ts | 17 ++++++++++------- src/Pages/Severity/constants.ts | 10 +++++++--- src/Pages/Team/constants.ts | 18 +++++++++++------- src/services/globalUtils.ts | 4 ++++ 5 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/Pages/Dashboard/constants.ts b/src/Pages/Dashboard/constants.ts index 90ee12a..0675c03 100644 --- a/src/Pages/Dashboard/constants.ts +++ b/src/Pages/Dashboard/constants.ts @@ -1,4 +1,7 @@ import { returnFormattedDate } from './utils'; +import { createURL } from '@src/services/globalUtils'; + +const URL_PREFIX = createURL('/houston'); export const DashboardHeaderConstants = { title: 'Dashboard', @@ -6,10 +9,10 @@ export const DashboardHeaderConstants = { }; export const FETCH_INCIDENTS_DATA = (payload: string): string => { - return `${window?.config?.BASE_API_URL}/incidents?${payload}`; + return `${URL_PREFIX}/incidents?${payload}`; }; -export const FETCH_FILTER_CONFIG = `${window?.config?.BASE_API_URL}/filters`; +export const FETCH_FILTER_CONFIG = `${URL_PREFIX}/filters`; export const TimeSpan = [ { diff --git a/src/Pages/Incidents/constants.ts b/src/Pages/Incidents/constants.ts index 229d68e..91a6ce5 100644 --- a/src/Pages/Incidents/constants.ts +++ b/src/Pages/Incidents/constants.ts @@ -1,5 +1,6 @@ import exp from 'constants'; import { TeamsData } from '../Team/constants'; +import { createURL } from '@src/services/globalUtils'; export const IncidentConstants = { severity: 'SEVERITY', @@ -14,25 +15,27 @@ export const IncidentConstants = { incidentId: 'Incident Id', }; +const URL_PREFIX = createURL('/houston'); + export const FETCH_INCIDENT_DATA = (payload: any): string => { - return `${window?.config?.BASE_API_URL}/incidents/${payload}`; + return `${URL_PREFIX}/incidents/${payload}`; }; export const FETCH_PARTICIPANTS_DATA = (payload: string): string => { - return `${window?.config?.BASE_API_URL}/users?channel_id=${payload}`; + return `${URL_PREFIX}/users?channel_id=${payload}`; }; -export const FETCH_HEADER_DETAILS = `${window?.config?.BASE_API_URL}/incidents/header`; +export const FETCH_HEADER_DETAILS = `${URL_PREFIX}/incidents/header`; -export const UPDATE_INCIDENT = `${window?.config?.BASE_API_URL}/incidents`; +export const UPDATE_INCIDENT = `${URL_PREFIX}/incidents`; -export const LINK_JIRA_INCIDENT = `${window?.config?.BASE_API_URL}/link-jira-to-incident`; +export const LINK_JIRA_INCIDENT = `${URL_PREFIX}/link-jira-to-incident`; -export const UNLINK_JIRA_INCIDENT = `${window?.config?.BASE_API_URL}/unlink-jira-from-incident`; +export const UNLINK_JIRA_INCIDENT = `${URL_PREFIX}/unlink-jira-from-incident`; export const SLACK_BASE_URL = 'https://go-navi.slack.com/'; export const FETCH_AUDIT_LOG = (incidentId: string): string => { - return `${window?.config?.BASE_API_URL}/logs/incident/${incidentId}`; + return `${URL_PREFIX}/logs/incident/${incidentId}`; }; export interface ContentProps { diff --git a/src/Pages/Severity/constants.ts b/src/Pages/Severity/constants.ts index bc3cd7a..e22999a 100644 --- a/src/Pages/Severity/constants.ts +++ b/src/Pages/Severity/constants.ts @@ -1,6 +1,10 @@ -export const FETCH_SEVERITY_DATA = `${window?.config?.BASE_API_URL}/severities`; +import { createURL } from '@src/services/globalUtils'; -export const UPDATE_SEVERITY_DATA = `${window?.config?.BASE_API_URL}/severities`; +const URL_PREFIX = createURL('/houston'); + +export const FETCH_SEVERITY_DATA = `${URL_PREFIX}/severities`; + +export const UPDATE_SEVERITY_DATA = `${URL_PREFIX}/severities`; export interface SeverityFormProps { severityId: string; @@ -9,5 +13,5 @@ export interface SeverityFormProps { } export const FETCH_SINGLE_SEVERITY_DATA = (payload: string): string => { - return `${window?.config?.BASE_API_URL}/severities/${payload}`; + return `${URL_PREFIX}/severities/${payload}`; }; diff --git a/src/Pages/Team/constants.ts b/src/Pages/Team/constants.ts index ecd23d4..c8f5aa7 100644 --- a/src/Pages/Team/constants.ts +++ b/src/Pages/Team/constants.ts @@ -1,21 +1,25 @@ -export const FETCH_TEAM_DATA = `${window?.config?.BASE_API_URL}/teams`; -export const FETCH_ALL_BOTS_DATA = `${window?.config?.BASE_API_URL}/bots`; -export const CREATE_TEAM = `${window?.config?.BASE_API_URL}/teams/add`; +import { createURL } from '@src/services/globalUtils'; + +const URL_PREFIX = createURL('/houston'); + +export const FETCH_TEAM_DATA = `${URL_PREFIX}/teams`; +export const FETCH_ALL_BOTS_DATA = `${URL_PREFIX}/bots`; +export const CREATE_TEAM = `${URL_PREFIX}/teams/add`; export const FETCH_SINGLE_TEAM_DATA = (payload: string): string => { - return `${window?.config?.BASE_API_URL}/teams/${payload}`; + return `${URL_PREFIX}/teams/${payload}`; }; export const UPDATE_TEAM_DATA = (): string => { - return `${window?.config?.BASE_API_URL}/teams`; + return `${URL_PREFIX}/teams`; }; export const REMOVE_TEAM_MEMBER = (teamId: string, userId: string): string => { - return `${window?.config?.BASE_API_URL}/teams/${teamId}/members/${userId}`; + return `${URL_PREFIX}/teams/${teamId}/members/${userId}`; }; export const MAKE_MANAGER = (teamId: string, userId: string): string => { - return `${window?.config?.BASE_API_URL}/teams/${teamId}/manager/${userId}`; + return `${URL_PREFIX}/teams/${teamId}/manager/${userId}`; }; export const regularExpression = /^[a-zA-Z][a-zA-Z0-9_ -]{1,48}[a-zA-Z0-9]$/; diff --git a/src/services/globalUtils.ts b/src/services/globalUtils.ts index aba8063..52980a8 100644 --- a/src/services/globalUtils.ts +++ b/src/services/globalUtils.ts @@ -53,3 +53,7 @@ export const handleCopyClick = (textToCopy: string): void => { toast.error('Failed to copy URL to clipboard'); }); }; + +export const createURL = (endpoint: string): string => { + return `${window?.config?.BASE_API_URL}${endpoint}`; +};