Merge pull request #225 from atlassian/ARC-2723-share-modal-part-1

Arc 2723 share modal part 1
atlassian · Dec 13, 2023 · 5fc6243 · 5fc6243
2 parents ba0a4d4 + 2d45ea6
commit 5fc6243
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -8,7 +8,7 @@ interface Context {
 }
 
 const redirectFromGetStarted = async (): Promise<string> => {
-	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
@@ -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<string> => {
 	return req.context.cloudId;
 });
 
-resolver.define('redirectFromGetStarted', async (req): Promise<RedirectFromGetStarted> => {
+resolver.define('fetchAppData', async (req): Promise<FetchAppDataProps> => {
 	await adminPermissionCheck(req);
 	internalMetrics.counter(metricResolverEmitter.generateNewSecretForServer).incr();
-	return redirectFromGetStarted(req);
+	return fetchAppData(req);
 });
 
 export default resolver.getDefinitions();
diff --git a/...c/utils/redirect-from-get-started.test.ts → app/src/utils/fetch-app-data.test.ts b/...c/utils/redirect-from-get-started.test.ts → app/src/utils/fetch-app-data.test.ts
@@ -1,7 +1,7 @@
-import { redirectFromGetStarted, RedirectFromGetStarted } from './redirect-from-get-started';
+import { fetchAppData, FetchAppDataProps } from './fetch-app-data';
 
 describe('redirectFromGetStarted', () => {
-    it('should return the expected RedirectFromGetStarted object', () => {
+    it('should return the expected FetchAppData object', () => {
         const mockRequest = {
             context: {
                 siteUrl: 'https://testjira.com',
@@ -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,

diff --git a/app/src/utils/redirect-from-get-started.ts → app/src/utils/fetch-app-data.ts b/app/src/utils/redirect-from-get-started.ts → app/src/utils/fetch-app-data.ts
@@ -1,13 +1,13 @@
 import { extractAppIdFromLocalId } from './extract-app-id-from-local-id';
 
-export type RedirectFromGetStarted = {
+export type FetchAppDataProps = {
     siteUrl: string,
     appId: string,
     environmentId: string,
     moduleKey: string
 };
 
-const redirectFromGetStarted = (request: any): RedirectFromGetStarted => {
+const fetchAppData = (request: any): FetchAppDataProps => {
     const {
         localId,
         siteUrl,
@@ -24,4 +24,4 @@ const redirectFromGetStarted = (request: any): RedirectFromGetStarted => {
     };
 };
 
-export { redirectFromGetStarted };
+export { fetchAppData };