diff --git a/app/jenkins-for-jira-ui/src/api/redirectFromGetStarted.test.ts b/app/jenkins-for-jira-ui/src/api/redirectFromGetStarted.test.ts index 6f55cd3c..643f0903 100644 --- a/app/jenkins-for-jira-ui/src/api/redirectFromGetStarted.test.ts +++ b/app/jenkins-for-jira-ui/src/api/redirectFromGetStarted.test.ts @@ -16,7 +16,7 @@ describe('redirectFromGetStarted', () => { (invoke as jest.Mock).mockResolvedValue(contextData); await redirectFromGetStarted(); - expect(invoke).toHaveBeenCalledWith('redirectFromGetStarted'); + expect(invoke).toHaveBeenCalledWith('fetchAppData'); expect(router.navigate).toHaveBeenCalledWith( `${contextData.siteUrl}/jira/settings/apps/${contextData.appId}/${contextData.environmentId}/` ); @@ -33,7 +33,7 @@ describe('redirectFromGetStarted', () => { (invoke as jest.Mock).mockResolvedValue(contextData); await redirectFromGetStarted(); - expect(invoke).toHaveBeenCalledWith('redirectFromGetStarted'); + expect(invoke).toHaveBeenCalledWith('fetchAppData'); expect(router.navigate).not.toHaveBeenCalledWith( `${contextData.siteUrl}/jira/settings/apps/${contextData.appId}/${contextData.environmentId}/` ); diff --git a/app/jenkins-for-jira-ui/src/api/redirectFromGetStarted.ts b/app/jenkins-for-jira-ui/src/api/redirectFromGetStarted.ts index 7992369a..3d88e96f 100644 --- a/app/jenkins-for-jira-ui/src/api/redirectFromGetStarted.ts +++ b/app/jenkins-for-jira-ui/src/api/redirectFromGetStarted.ts @@ -8,7 +8,7 @@ interface Context { } const redirectFromGetStarted = async (): Promise => { - const context: Context = await invoke('redirectFromGetStarted'); + const context: Context = await invoke('fetchAppData'); const { siteUrl, appId, diff --git a/app/src/resolvers.ts b/app/src/resolvers.ts index 2c2badfd..f1579cc3 100644 --- a/app/src/resolvers.ts +++ b/app/src/resolvers.ts @@ -12,7 +12,7 @@ import { deleteDeployments } from './jira-client/delete-deployments'; import { adminPermissionCheck } from './check-permissions'; import { metricResolverEmitter } from './common/metric-names'; import { generateNewSecret } from './storage/generate-new-secret'; -import { RedirectFromGetStarted, redirectFromGetStarted } from './utils/redirect-from-get-started'; +import { FetchAppDataProps, fetchAppData } from './utils/fetch-app-data'; import { fetchFeatureFlag } from './config/feature-flags'; const resolver = new Resolver(); @@ -82,10 +82,10 @@ resolver.define('fetchCloudId', async (req): Promise => { return req.context.cloudId; }); -resolver.define('redirectFromGetStarted', async (req): Promise => { +resolver.define('fetchAppData', async (req): Promise => { await adminPermissionCheck(req); internalMetrics.counter(metricResolverEmitter.generateNewSecretForServer).incr(); - return redirectFromGetStarted(req); + return fetchAppData(req); }); export default resolver.getDefinitions(); diff --git a/app/src/utils/fetch-app-data.test.ts b/app/src/utils/fetch-app-data.test.ts index b9d4a13f..623eba4e 100644 --- a/app/src/utils/fetch-app-data.test.ts +++ b/app/src/utils/fetch-app-data.test.ts @@ -1,4 +1,4 @@ -import { redirectFromGetStarted, RedirectFromGetStarted } from './redirect-from-get-started'; +import { fetchAppData, FetchAppDataProps } from './fetch-app-data'; describe('redirectFromGetStarted', () => { it('should return the expected RedirectFromGetStarted object', () => { @@ -12,14 +12,14 @@ describe('redirectFromGetStarted', () => { }, }; - const result: RedirectFromGetStarted = redirectFromGetStarted(mockRequest); + const result: FetchAppDataProps = fetchAppData(mockRequest); const { siteUrl, appId, environmentId, moduleKey } = mockRequest.context; - const expected: RedirectFromGetStarted = { + const expected: FetchAppDataProps = { siteUrl, appId, environmentId,