Apply Git branch dropdown select

build/dockerfiles/Dockerfile

@@ -40,7 +40,7 @@ RUN /dashboard/airgap.sh -i /dashboard/packages/devfile-registry/air-gap/index.j
 
 FROM docker.io/node:18.19.1-alpine3.19
 
-RUN apk --no-cache add curl
+RUN apk --no-cache add curl git
 
 ENV FRONTEND_LIB=/dashboard/packages/dashboard-frontend/lib/public
 ENV BACKEND_LIB=/dashboard/packages/dashboard-backend/lib

packages/common/src/dto/api/index.ts

@@ -90,6 +90,10 @@ export interface IGitConfig {
   };
 }
 
+export interface IGitBranches {
+  branches: string[];
+}
+
 export interface IWorkspacesDefaultPlugins {
   editor: string;
   plugins: string[];

packages/dashboard-backend/src/app.ts

@@ -33,6 +33,7 @@ import { registerDockerConfigRoutes } from '@/routes/api/dockerConfig';
 import { registerEditorsRoutes } from '@/routes/api/editors';
 import { registerEventsRoutes } from '@/routes/api/events';
 import { registerGettingStartedSamplesRoutes } from '@/routes/api/gettingStartedSample';
+import { registerGitBranchesRoute } from '@/routes/api/gitBranches';
 import { registerGitConfigRoutes } from '@/routes/api/gitConfig';
 import { getDevWorkspaceClient } from '@/routes/api/helpers/getDevWorkspaceClient';
 import { getServiceAccountToken } from '@/routes/api/helpers/getServiceAccountToken';
@@ -119,6 +120,8 @@ export default async function buildApp(server: FastifyInstance): Promise<unknown
 
     registerUserProfileRoute(server),
 
+    registerGitBranchesRoute(server),
+
     registerDataResolverRoute(server),
 
     registerDevworkspaceResourcesRoute(server),

packages/dashboard-backend/src/constants/schemas.ts

@@ -273,6 +273,16 @@ export const namespacedSchema: JSONSchema7 = {
   required: ['namespace'],
 };
 
+export const gitBranchSchema: JSONSchema7 = {
+  type: 'object',
+  properties: {
+    url: {
+      type: 'string',
+    },
+  },
+  required: ['url'],
+};
+
 export const namespacedKubeConfigSchema: JSONSchema7 = {
   type: 'object',
   properties: {

packages/dashboard-backend/src/devworkspaceClient/services/helpers/__mocks__/exec.ts

@@ -0,0 +1,15 @@
+/*
+ * 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
+ */
+
+export async function run<T>(exec: () => Promise<T>): Promise<T> {
+  return exec();
+}

packages/dashboard-backend/src/devworkspaceClient/services/helpers/exec.ts

@@ -10,6 +10,8 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
+import { ChildProcessWithoutNullStreams } from 'node:child_process';
+
 import { helpers } from '@eclipse-che/common';
 import { spawn } from 'child_process';
 import { stringify } from 'querystring';
@@ -123,9 +125,10 @@ export async function exec(
   return { stdOut, stdError };
 }
 
-export function run(cmd: string, args?: string[]): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const command = spawn(cmd, args);
+export function run(cmd: string, args?: string[], timeOut?: number): Promise<string> {
+  let command: ChildProcessWithoutNullStreams;
+  const promise: Promise<string> = new Promise((resolve, reject) => {
+    command = spawn(cmd, args);
     let result = '';
     command.stdout.on('data', data => {
       result += data.toString();
@@ -137,4 +140,17 @@ export function run(cmd: string, args?: string[]): Promise<string> {
       reject(err);
     });
   });
+  if (timeOut && timeOut > 0) {
+    const timeoutPromise: Promise<string> = new Promise((_, reject) => {
+      setTimeout(() => {
+        if (command && command.exitCode == null) {
+          command.kill();
+          reject(new Error('Timeout exceeded'));
+        }
+      }, timeOut);
+    });
+    return Promise.race([promise, timeoutPromise]);
+  } else {
+    return promise;
+  }
 }

packages/dashboard-backend/src/models/restParams.ts

@@ -42,6 +42,10 @@ export interface IEditorsDevfileParams {
   'che-editor': string;
 }
 
+export interface IUrlParams {
+  url: string;
+}
+
 // --- Namespaced Params ---
 export interface INamespacedParams {
   namespace: string;

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

@@ -0,0 +1,50 @@
+/*
+ * 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 { FastifyInstance } from 'fastify';
+
+import { baseApiPath } from '@/constants/config';
+import { setup, teardown } from '@/utils/appBuilder';
+
+jest.mock('../helpers/getDevWorkspaceClient.ts');
+jest.mock('../helpers/getServiceAccountToken.ts');
+const response =
+  'c9440b0ca811e5d8e7abeee8467e1219d5ca4cb6\trefs/heads/master ' +
+  '0fa45f3539ca69615d0ccd8e0277fb7f12ee7715\trefs/heads/new/branch ' +
+  '42c6289f142a5589f206425d812d0b125ab87990\trefs/heads/newBranch ' +
+  '0e647bc78ac310d96251d581e5498b1503729e87\trefs/tags/test ' +
+  'fb3a99a405876f16e2dcb231a061d5a3f735b2aa\trefs/pull/809/head';
+jest.mock('@/devworkspaceClient/services/helpers/exec', () => {
+  return {
+    run: async () => response,
+  };
+});
+
+describe('GitBranches Route', () => {
+  let app: FastifyInstance;
+  const url = 'url';
+
+  beforeEach(async () => {
+    app = await setup();
+  });
+
+  afterEach(() => {
+    teardown(app);
+  });
+
+  test('GET ${baseApiPath}/gitbranches:url', async () => {
+    const res = await app.inject().get(`${baseApiPath}/gitbranches/${url}`);
+
+    expect(res.statusCode).toEqual(200);
+    expect(res.json()).toEqual({ branches: ['master', 'new/branch', 'newBranch', 'test'] });
+  });
+});

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

@@ -0,0 +1,34 @@
+/*
+ * 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 { FastifyInstance, FastifyRequest } from 'fastify';
+
+import { baseApiPath } from '@/constants/config';
+import { gitBranchSchema } from '@/constants/schemas';
+import { restParams } from '@/models';
+import { getBranches } from '@/services/gitClient';
+import { getSchema } from '@/services/helpers';
+
+const tags = ['GitBranches'];
+
+export function registerGitBranchesRoute(instance: FastifyInstance) {
+  instance.register(async server => {
+    server.get(
+      `${baseApiPath}/gitbranches/:url`,
+      getSchema({ tags, params: gitBranchSchema }),
+      async function (request: FastifyRequest) {
+        const { url } = request.params as restParams.IUrlParams;
+        return getBranches(url);
+      },
+    );
+  });
+}

packages/dashboard-backend/src/services/gitClient/index.ts

@@ -0,0 +1,34 @@
+/*
+ * 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 { api } from '@eclipse-che/common';
+
+import { run } from '@/devworkspaceClient/services/helpers/exec';
+
+export async function getBranches(url: string): Promise<api.IGitBranches | undefined> {
+  try {
+    return new Promise((resolve, reject) => {
+      run(`git`, ['ls-remote', '--refs', url], 1000)
+        .then(result => {
+          resolve({
+            branches: result
+              .split(' ')
+              .filter(b => b.indexOf('refs/heads/') > 0 || b.indexOf('refs/tags/') > 0)
+              .map(b => b.replace(new RegExp('.*\\trefs/((heads)|(tags))/'), '')),
+          });
+        })
+        .catch(err => reject(err));
+    });
+  } catch (error) {
+    return undefined;
+  }
+}

packages/dashboard-frontend/src/components/ImportFromGit/RepoOptionsAccordion/GitRepoOptions/GitBranchField/__mocks__/index.tsx → packages/dashboard-frontend/src/components/ImportFromGit/RepoOptionsAccordion/GitRepoOptions/GitBranchDropdown/__mocks__/index.tsx

@@ -12,9 +12,9 @@
 
 import React from 'react';
 
-import { Props } from '@/components/ImportFromGit/RepoOptionsAccordion/GitRepoOptions/GitBranchField';
+import { Props } from '@/components/ImportFromGit/RepoOptionsAccordion/GitRepoOptions/GitBranchDropdown';
 
-export class GitBranchField extends React.PureComponent<Props> {
+export class GitBranchDropdown extends React.PureComponent<Props> {
   public render() {
     const { gitBranch, onChange } = this.props;
 

packages/dashboard-frontend/src/components/ImportFromGit/RepoOptionsAccordion/GitRepoOptions/GitBranchDropdown/__tests__/__snapshots__/index.spec.tsx.snap

@@ -0,0 +1,78 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GitBranchDropdown snapshot 1`] = `
+<div
+  className="pf-c-form__group"
+>
+  <div
+    className="pf-c-form__group-label"
+  >
+    <label
+      className="pf-c-form__label"
+    >
+      <span
+        className="pf-c-form__label-text"
+      >
+        Git Branch
+      </span>
+    </label>
+
+  </div>
+  <div
+    className="pf-c-form__group-control"
+  >
+    <div
+      className="pf-c-dropdown selector"
+      data-ouia-component-id="OUIA-Generated-Dropdown-1"
+      data-ouia-component-type="PF4/Dropdown"
+      data-ouia-safe={true}
+      onChange={[Function]}
+    >
+      <button
+        aria-expanded={false}
+        aria-haspopup={false}
+        aria-label="Git Branch"
+        className="pf-c-dropdown__toggle"
+        data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+        data-ouia-component-type="PF4/DropdownToggle"
+        data-ouia-safe={true}
+        disabled={false}
+        id="toggle-initial-selection"
+        onClick={[Function]}
+        onKeyDown={[Function]}
+        type="button"
+      >
+        <span
+          className="pf-c-dropdown__toggle-icon"
+        >
+          <svg
+            aria-hidden={true}
+            aria-labelledby={null}
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style={
+              {
+                "verticalAlign": "-0.125em",
+              }
+            }
+            viewBox="0 0 320 512"
+            width="1em"
+          >
+            <path
+              d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+            />
+          </svg>
+        </span>
+      </button>
+    </div>
+    <div
+      aria-live="polite"
+      className="pf-c-form__helper-text pf-m-error"
+      id="undefined-helper"
+    >
+      No branch found. Please check the Git repository URL.
+    </div>
+  </div>
+</div>
+`;