fixup! Apply Git branch dropdown select

Author: vinokurig

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

@@ -15,7 +15,7 @@ import { FastifyInstance, FastifyRequest } from 'fastify';
 import { baseApiPath } from '@/constants/config';
 import { gitBranchSchema } from '@/constants/schemas';
 import { restParams } from '@/models';
-import { getBranches } from '@/routes/api/helpers/getGitBranches';
+import { getBranches } from '@/services/gitClient';
 import { getSchema } from '@/services/helpers';
 
 const tags = ['GitBranches'];

packages/dashboard-backend/src/routes/api/helpers/getGitBranches.ts renamed to packages/dashboard-backend/src/services/gitClient/index.ts

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2018-2025 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+
+import mockAxios from 'axios';
+
+import { fetchGitBranches } from '@/services/backend-client/gitBranchesApi';
+import SessionStorageService, { SessionStorageKey } from '@/services/session-storage';
+
+describe('fetch git branches', () => {
+  const mockSessionStorageServiceGet = jest.fn();
+  const mockSessionStorageServiceUpdate = jest.fn();
+  const mockDateNow = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    SessionStorageService.update = mockSessionStorageServiceUpdate;
+    SessionStorageService.get = mockSessionStorageServiceGet;
+    Date.now = mockDateNow;
+  });
+
+  it('should get branches from storage', async () => {
+    const time = 1555555555555;
+    const elapsedTime = 59 * 60 * 1000;
+    mockDateNow.mockReturnValue(time + elapsedTime);
+    const storageData = { url: { branches: ['branch1', 'branch2'], lastFetched: time } };
+    mockSessionStorageServiceGet.mockReturnValue(JSON.stringify(storageData));
+
+    const response = await fetchGitBranches('url');
+
+    expect(response.branches).toEqual(storageData.url.branches);
+  });
+
+  it('should set branches to storage', async () => {
+    const mockGet = mockAxios.get as jest.Mock;
+    const branches = ['branch1', 'branch2'];
+    mockGet.mockResolvedValue({ data: { branches } });
+    mockDateNow.mockReturnValue(0);
+
+    await fetchGitBranches('url');
+    expect(mockSessionStorageServiceUpdate).toHaveBeenCalledWith(
+      SessionStorageKey.GIT_BRANCHES,
+      JSON.stringify({
+        url: { branches, lastFetched: 0 },
+      }),
+    );
+  });
+});

packages/dashboard-frontend/src/services/backend-client/__tests__/gitBranchesApi.spec.ts

@@ -14,17 +14,74 @@ import common, { api } from '@eclipse-che/common';
 
 import { AxiosWrapper } from '@/services/axios-wrapper/axiosWrapper';
 import { dashboardBackendPrefix } from '@/services/backend-client/const';
+import SessionStorageService, { SessionStorageKey } from '@/services/session-storage';
+
+const EXPIRATION_TIME_FOR_STORED_BRANCHES = 60 * 60 * 1000; // expiration time in milliseconds
 
 /**
  * Returns object with git branches list.
  */
 export async function fetchGitBranches(url: string): Promise<api.IGitBranches> {
   const requestUrl = `${dashboardBackendPrefix}/gitbranches/${encodeURIComponent(url)}`;
   try {
+    const branchesFromStorage = getBranchesFromStorage(url);
+    if (branchesFromStorage) {
+      return { branches: branchesFromStorage } as api.IGitBranches;
+    }
     const response =
       await AxiosWrapper.createToRetryMissedBearerTokenError().get<api.IGitBranches>(requestUrl);
-    return response.data;
+    const data = response.data;
+    setGitBranchesToStorage(url, data.branches);
+    return data;
   } catch (e) {
     throw new Error(`Failed to fetch git branches. ${common.helpers.errors.getMessage(e)}`);
   }
 }
+
+function getBranchesFromStorage(url: string): string[] | undefined {
+  const branches = SessionStorageService.get(SessionStorageKey.GIT_BRANCHES);
+  if (typeof branches !== 'string') {
+    return undefined;
+  }
+  try {
+    const branchesObj = JSON.parse(branches);
+    if (!branchesObj[url]?.lastFetched || !branchesObj[url]?.branches) {
+      return undefined;
+    }
+    const timeElapsed = Date.now() - branchesObj[url]?.lastFetched;
+    if (timeElapsed > EXPIRATION_TIME_FOR_STORED_BRANCHES) {
+      return undefined;
+    }
+    return branchesObj[url]?.branches;
+  } catch (e) {
+    return undefined;
+  }
+}
+
+function setGitBranchesToStorage(url: string, branches: string[]): void {
+  const gitBranches = SessionStorageService.get(SessionStorageKey.GIT_BRANCHES);
+  let gitBranchesObj: {
+    [url: string]: {
+      branches: string[];
+      lastFetched: number;
+    };
+  };
+  if (typeof gitBranches === 'string') {
+    try {
+      gitBranchesObj = JSON.parse(gitBranches);
+    } catch (e) {
+      gitBranchesObj = {};
+    }
+  } else {
+    gitBranchesObj = {};
+  }
+  gitBranchesObj[url] = {
+    branches,
+    lastFetched: Date.now(),
+  };
+  try {
+    SessionStorageService.update(SessionStorageKey.GIT_BRANCHES, JSON.stringify(gitBranchesObj));
+  } catch (e) {
+    // noop
+  }
+}

packages/dashboard-frontend/src/services/backend-client/gitBranchesApi.ts

@@ -14,6 +14,7 @@ export enum SessionStorageKey {
   PRIVATE_FACTORY_RELOADS = 'private-factory-reloads-number',
   ORIGINAL_LOCATION_PATH = 'original-location-path',
   EXTERNAL_REGISTRIES = 'external-registries',
+  GIT_BRANCHES = 'git-branches',
 }
 
 export default class SessionStorageService {