feat: updated API call in client

packages/gitlab-backend/src/processor/processor.ts

@@ -38,7 +38,7 @@ export class GitlabFillerProcessor implements CatalogProcessor {
  ): Promise<Entity> {
  if (
  location.type === 'url' &&
- // To make annotation constants
+ // TODO: make annotation constants
  !entity.metadata.annotations?.['gitlab.com/project-id'] &&
  !entity.metadata.annotations?.['gitlab.com/project-slug'] &&
  this.allowedKinds.has(entity.kind.toLowerCase()) &&

packages/gitlab/src/api/GitlabCIApi.ts

@@ -30,10 +30,14 @@ export interface IssuesSummary {
  getIssuesData: IssueObject[];
 }
 
-export const GitlabCIApiRef = createApiRef<GitlabCIApi>({
+export const GitlabCIApiRef = createApiRef<GitlabCIBuilder>({
  id: 'plugin.gitlabci.service',
 });
 
+export type GitlabCIBuilder = {
+ build(gitlabInstance: string): GitlabCIApi;
+};
+
 export type GitlabCIApi = {
  getPipelineSummary(projectID: string): Promise<PipelineSummary | undefined>;
  getContributorsSummary(

packages/gitlab/src/api/GitlabCIClient.ts

@@ -20,32 +20,55 @@ import {
 export class GitlabCIClient implements GitlabCIApi {
  discoveryApi: DiscoveryApi;
  baseUrl: string;
- proxyPath: string;
  codeOwnersPath: string;
+ gitlabInstance: string;
 
- constructor({
+ private constructor({
  discoveryApi,
  baseUrl = 'https://gitlab.com/',
- proxyPath,
  codeOwnersPath,
+ gitlabInstance,
  }: {
  discoveryApi: DiscoveryApi;
  baseUrl?: string;
- proxyPath?: string;
  codeOwnersPath?: string;
+ gitlabInstance: string;
  }) {
  this.discoveryApi = discoveryApi;
  this.baseUrl = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`;
- this.proxyPath = proxyPath || '/gitlabci';
  this.codeOwnersPath = codeOwnersPath || 'CODEOWNERS';
+ this.gitlabInstance = gitlabInstance;
+ }
+
+ static setupAPI({
+ discoveryApi,
+ baseUrl = 'https://gitlab.com/',
+ codeOwnersPath,
+ }: {
+ discoveryApi: DiscoveryApi;
+ baseUrl?: string;
+ codeOwnersPath?: string;
+ }) {
+ return {
+ build: (gitlabInstance: string) =>
+ new GitlabCIClient({
+ discoveryApi,
+ baseUrl,
+ codeOwnersPath,
+ gitlabInstance,
+ }),
+ };
  }
 
  protected async callApi<T>(
  path: string,
  query: { [key in string]: any }
  ): Promise<T | null> {
- const apiUrl = `${await this.discoveryApi.getBaseUrl('proxy')}${
- this.proxyPath
+ //const apiUrl = `${await this.discoveryApi.getBaseUrl('proxy')}${
+ // this.proxyPath
+ //}`;
+ const apiUrl = `${await this.discoveryApi.getBaseUrl('gitlab')}/${
+ this.gitlabInstance
  }`;
  const response = await fetch(
  `${apiUrl}/${path}?${new URLSearchParams(query).toString()}`

packages/gitlab/src/components/gitlabAppData.tsx

@@ -68,10 +68,12 @@ export const gitlabAppData = () => {
 export const gitlabAppSlug = () => {
  const { entity } = useEntity();
 
- const project_slug =
+ const data =
  entity.metadata.annotations?.[GITLAB_ANNOTATION_PROJECT_SLUG] ?? '';
 
- return { project_slug };
+ const [project_slug, gitlab_instance] = data.split('@').reverse();
+
+ return { project_slug, gitlab_instance };
 };
 
 export const gitlabCodeOwnerPath = () => {

packages/gitlab/src/components/widgets/IssuesTable/IssuesTable.tsx

@@ -56,9 +56,9 @@ export const DenseTable = ({
 
 export const IssuesTable = ({}) => {
  const { project_id } = gitlabAppData();
- const { project_slug } = gitlabAppSlug();
+ const { project_slug, gitlab_instance } = gitlabAppSlug();
 
- const GitlabCIAPI = useApi(GitlabCIApiRef);
+ const GitlabCIAPI = useApi(GitlabCIApiRef).build(gitlab_instance || '0');
 
  const { value, loading, error } = useAsync(async (): Promise<{
  data: IssueObject[];

packages/gitlab/src/components/widgets/LanguagesCard/LanguagesCard.tsx

@@ -47,9 +47,10 @@ export const LanguagesCard = ({}) => {
  const classes = useStyles();
  let barWidth = 0;
  let languageTitle = new String();
- const GitlabCIAPI = useApi(GitlabCIApiRef);
  const { project_id } = gitlabAppData();
- const { project_slug } = gitlabAppSlug();
+ const { project_slug, gitlab_instance } = gitlabAppSlug();
+
+ const GitlabCIAPI = useApi(GitlabCIApiRef).build(gitlab_instance || '0');
 
  const { value, loading, error } = useAsync(async (): Promise<Language> => {
  const projectDetails: any = await GitlabCIAPI.getProjectDetails(

packages/gitlab/src/components/widgets/MergeRequestStats/MergeRequestStats.tsx

@@ -57,9 +57,9 @@ const MergeRequestStats = (props: Props) => {
  const [count, setCount] = useState<number>(20);
  const classes = useStyles();
  const { project_id } = gitlabAppData();
- const { project_slug } = gitlabAppSlug();
+ const { project_slug, gitlab_instance } = gitlabAppSlug();
 
- const GitlabCIAPI = useApi(GitlabCIApiRef);
+ const GitlabCIAPI = useApi(GitlabCIApiRef).build(gitlab_instance || '0');
  const mergeStat: MergeRequestStatsCount = {
  avgTimeUntilMerge: 0,
  closedCount: 0,

packages/gitlab/src/components/widgets/MergeRequestsTable/MergeRequestsTable.tsx

@@ -46,9 +46,9 @@ export const DenseTable = ({ mergeRequests }: any) => {
 
 export const MergeRequestsTable = ({}) => {
  const { project_id } = gitlabAppData();
- const { project_slug } = gitlabAppSlug();
+ const { project_slug, gitlab_instance } = gitlabAppSlug();
 
- const GitlabCIAPI = useApi(GitlabCIApiRef);
+ const GitlabCIAPI = useApi(GitlabCIApiRef).build(gitlab_instance || '0');
 
  const { value, loading, error } = useAsync(async (): Promise<
  MergeRequest[]

packages/gitlab/src/components/widgets/PeopleCard/PeopleCard.tsx

@@ -32,9 +32,10 @@ const useStyles = makeStyles((theme) => ({
 
 export const PeopleCard = ({}) => {
  const classes = useStyles();
- const GitlabCIAPI = useApi(GitlabCIApiRef);
  const { project_id } = gitlabAppData();
- const { project_slug } = gitlabAppSlug();
+ const { project_slug, gitlab_instance } = gitlabAppSlug();
+
+ const GitlabCIAPI = useApi(GitlabCIApiRef).build(gitlab_instance || '0');
  const { codeowners_path } = gitlabCodeOwnerPath();
  /* TODO: to change the below logic to get contributors data*/
  const { value, loading, error } = useAsync(async (): Promise<{

packages/gitlab/src/components/widgets/PipelinesTable/PipelinesTable.tsx

@@ -46,9 +46,9 @@ export const DenseTable = ({ pipelineObjects }: any) => {
 
 export const PipelinesTable = ({}) => {
  const { project_id } = gitlabAppData();
- const { project_slug } = gitlabAppSlug();
+ const { project_slug, gitlab_instance } = gitlabAppSlug();
 
- const GitlabCIAPI = useApi(GitlabCIApiRef);
+ const GitlabCIAPI = useApi(GitlabCIApiRef).build(gitlab_instance || '0');
 
  const { value, loading, error } = useAsync(async (): Promise<
  PipelineObject[]

packages/gitlab/src/plugin.ts

@@ -22,16 +22,14 @@ export const gitlabPlugin = createPlugin({
  createApiFactory({
  api: GitlabCIApiRef,
  deps: { configApi: configApiRef, discoveryApi: discoveryApiRef },
- factory: ({ configApi, discoveryApi }) => {
- return new GitlabCIClient({
+ factory: ({ configApi, discoveryApi }) =>
+ GitlabCIClient.setupAPI({
  discoveryApi,
  baseUrl: configApi.getOptionalString('gitlab.baseUrl'),
- proxyPath: configApi.getOptionalString('gitlab.proxyPath'),
  codeOwnersPath: configApi.getOptionalString(
  'gitlab.defaultCodeOwnersPath'
  ),
- });
- },
+ }),
  }),
  ],
 });