revert changes from #1417 (#1424)

Signed-off-by: Valerii Svydenko <[email protected]>

Author: svor

packages/dashboard-backend/src/devworkspaceClient/services/__tests__/serverConfigApi.spec.ts

@@ -211,13 +211,13 @@ describe('Server Config API Service', () => {
 
   describe('Hide editors by name array', () => {
     test('getting showDeprecated value', () => {
-      const res = serverConfigService.getHideEditorsById(buildCustomResource());
+      const res = serverConfigService.gеtHideEditorsById(buildCustomResource());
       expect(res).toEqual([]);
     });
     test('getting hideByName value', () => {
       process.env['CHE_HIDE_EDITORS_BY_ID'] =
         'che-incubator/che-idea-server/latest, che-incubator/che-idea-server/next';
-      const res = serverConfigService.getHideEditorsById(buildCustomResource());
+      const res = serverConfigService.gеtHideEditorsById(buildCustomResource());
       expect(res).toEqual([
         'che-incubator/che-idea-server/latest',
         'che-incubator/che-idea-server/next',

packages/dashboard-backend/src/devworkspaceClient/services/serverConfigApi.ts

@@ -290,7 +290,7 @@ export class ServerConfigApiService implements IServerConfigApi {
     return value === 'true';
   }
 
-  getHideEditorsById(cheCustomResource: CheClusterCustomResource): string[] {
+  gеtHideEditorsById(cheCustomResource: CheClusterCustomResource): string[] {
     const value = getEnvVarValue('CHE_HIDE_EDITORS_BY_ID', cheCustomResource);
     if (!value) {
       return [];

packages/dashboard-backend/src/devworkspaceClient/types/index.ts

@@ -410,7 +410,7 @@ export interface IServerConfigApi {
   /**
    * Returns the hideEditorsById value
    */
-  getHideEditorsById(cheCustomResource: CheClusterCustomResource): string[];
+  gеtHideEditorsById(cheCustomResource: CheClusterCustomResource): string[];
 
   /**
    * Returns the Machine (hardware) type.

packages/dashboard-backend/src/routes/api/helpers/__mocks__/getDevWorkspaceClient.ts

@@ -201,7 +201,7 @@ export const getDevWorkspaceClient = jest.fn(
         getAdvancedAuthorization: _cheCustomResource => stubAdvancedAuthorization,
         getAllowedSourceUrls: _cheCustomResource => stubAllowedSourceUrls,
         getShowDeprecatedEditors: _cheCustomResource => stubShowDeprecatedEditors,
-        getHideEditorsById: _cheCustomResource => stubHideEditorsById,
+        gеtHideEditorsById: _cheCustomResource => stubHideEditorsById,
       } as IServerConfigApi,
       devworkspaceApi: {
         create: (_devworkspace, _namespace) =>

packages/dashboard-backend/src/routes/api/serverConfig.ts

@@ -51,7 +51,7 @@ export function registerServerConfigRoute(instance: FastifyInstance) {
       const allowedSourceUrls = serverConfigApi.getAllowedSourceUrls(cheCustomResource);
       const axiosRequestTimeout = serverConfigApi.getAxiosRequestTimeout();
       const showDeprecated = serverConfigApi.getShowDeprecatedEditors(cheCustomResource);
-      const hideById = serverConfigApi.getHideEditorsById(cheCustomResource);
+      const hideById = serverConfigApi.gеtHideEditorsById(cheCustomResource);
 
       const serverConfig: api.IServerConfig = {
         containerBuild,

packages/dashboard-frontend/src/components/ImportFromGit/helpers.ts

@@ -21,7 +21,7 @@ import {
 } from '@/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getGitRemotes';
 import { buildFactoryLoaderPath } from '@/preload/main';
 import { FactoryLocationAdapter } from '@/services/factory-location-adapter';
-import { REVISION_ATTR } from '@/services/helpers/factoryFlow/buildFactoryParams';
+import { REVISION } from '@/services/helpers/factoryFlow/buildFactoryParams';
 
 const BR_NAME_REGEX = /^[0-9A-Za-z-./_]{1,256}$/;
 
@@ -144,7 +144,7 @@ function setBranchToAzureDevOpsLocation(location: string, branch: string | undef
 
 export function setBranchToLocation(location: string, branch: string | undefined): string {
   if (!FactoryLocationAdapter.isHttpLocation(location)) {
-    return branch ? `${location}?${REVISION_ATTR}=${branch}` : location;
+    return branch ? `${location}?revision=${branch}` : location;
   }
   const url = new URL(location);
   const pathname = url.pathname.replace(/^\//, '').replace(/\/$/, '');
@@ -281,7 +281,7 @@ export function getGitRepoOptionsFromLocation(location: string): {
       console.log(`Unable to get branch from '${location}'.${common.helpers.errors.getMessage(e)}`);
     }
   } else if (!FactoryLocationAdapter.isHttpLocation(location)) {
-    gitBranch = searchParams.get(REVISION_ATTR) || undefined;
+    gitBranch = searchParams.get(REVISION) || undefined;
   }
   return { location, gitBranch, remotes, devfilePath, hasSupportedGitService };
 }
@@ -404,7 +404,7 @@ export function setGitRepoOptionsToLocation(
     state.gitBranch = newOptions.gitBranch;
   }
   if (!FactoryLocationAdapter.isHttpLocation(location) && newOptions.gitBranch) {
-    searchParams.set(REVISION_ATTR, newOptions.gitBranch);
+    searchParams.set(REVISION, newOptions.gitBranch);
   }
   // update the location with the new gitBranch value
   let searchParamsStr = decodeURIComponent(searchParamsToString(searchParams));

packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/__tests__/getProjectFromLocation.spec.ts

@@ -93,8 +93,7 @@ describe('FactoryLoaderContainer/getProjectFromLocation', () => {
             origin: 'https://github.com/test/rest-repo.git',
           },
         },
-        // Project name now correctly extracts repo name instead of commit hash
-        name: 'rest-repo',
+        name: 'a4f1949c33ddab5f66c19c27a844af1c46aa0820',
       });
     });
   });