Merge remote-tracking branch 'origin/dev' into main

Author: htahir1

global.d.ts

@@ -16,7 +16,7 @@ interface TRequestActionPayload {
   failureActionType?: string;
   successActionType?: string;
   params?: Record<string, unknown>;
-  onSuccess?: () => void;
+  onSuccess?: (res: any) => void;
   onFailure?: (errorText: string) => void;
 }
 
@@ -74,7 +74,13 @@ interface TWorkspace {
   name: string;
   createdAt: Date;
 }
-
+interface Projects {
+  id: TId;
+  created: Date;
+  updated: Date;
+  name: string;
+  description: string;
+}
 interface TPipeline {
   id: TId;
   name: string;
@@ -112,6 +118,13 @@ interface TStack {
   user?: any;
   isShared?: Boolean;
 }
+interface Roles {
+  id: TId;
+  created: Date;
+  updated: Date;
+  name: string;
+  permissions: Array;
+}
 type TRunStatus =
   | 'finished'
   | 'In Progress'

package.json

@@ -37,6 +37,7 @@
     "i18next": "^19.6.3",
     "i18next-browser-languagedetector": "^5.0.0",
     "json2yaml": "^1.1.0",
+    "jwt-decode": "^3.1.2",
     "node-sass": "^4.14.1",
     "query-string": "^6.13.1",
     "react": "^16.13.1",

src/App.tsx

@@ -11,6 +11,15 @@ import './App.css';
 import './ui/default.css';
 
 const { store, persistor } = configureStore();
+if (
+  process.env.REACT_APP_DEMO_SETUP === 'true' &&
+  (process.env.REACT_APP_USERNAME === undefined ||
+    process.env.REACT_APP_PASSWORD === undefined)
+) {
+  console.warn(
+    'You need to add process.env.REACT_APP_USERNAME and process.env.REACT_APP_PASSWORD in .env file.',
+  );
+}
 
 const App: React.FC = () => {
   return (

src/api/endpoints.ts

@@ -19,39 +19,42 @@ export const endpoints = {
     deleteInvite: (id: string): string => `/users/${id}`,
   },
 
+  projects: {
+    my: '/projects',
+  },
+
   pipelines: {
-    my: '/pipelines?hydrated=true',
-    get: (pipelineId: TId): string =>
-      `/pipelines/${pipelineId}?unlisted=false&hydrated=true`,
+    my: (project: string): string => `/projects/${project}/pipelines`,
+    get: (pipelineId: TId): string => `/pipelines/${pipelineId}`,
   },
   Stacks: {
-    my: '/stacks?hydrated=true',
-    get: (stackId: TId): string =>
-      `/stacks/${stackId}?unlisted=false&hydrated=true`,
+    my: (project: string): string => `/projects/${project}/stacks`,
+    get: (stackId: TId): string => `/stacks/${stackId}`,
   },
   StackComponents: {
     types: '/component-types',
-    my: (type: string): string => `/components?type=${type}&hydrated=true`,
-    get: (stackComponentId: TId): string =>
-      `/components/${stackComponentId}?hydrated=true`,
+    my: (type: string, project: string): string =>
+      `/projects/${project}/components?type=${type}`,
+    get: (stackComponentId: TId): string => `/components/${stackComponentId}`,
   },
   runs: {
     pipeline: {
-      get: (pipelineId: TId): string =>
-        `/runs?pipeline_id=${pipelineId}&unlisted=false&hydrated=true`,
+      get: (pipelineId: TId): string => `/runs?pipeline_id=${pipelineId}`,
     },
     stack: {
-      get: (stackId: TId): string =>
-        `/runs?stack_id=${stackId}&unlisted=false&hydrated=true`,
+      get: (stackId: TId): string => `/runs?stack_id=${stackId}`,
     },
     stackComponent: {
       get: (stackComponentId: TId): string =>
-        `/runs?component_id=${stackComponentId}&unlisted=false&hydrated=true`,
+        `/runs?component_id=${stackComponentId}`,
     },
     graphById: {
       get: (runId: TId): string => `/runs/${runId}/graph`,
     },
-    all: `/runs?unlisted=false&hydrated=true`,
-    get: (runId: TId): string => `/runs/${runId}?unlisted=false&hydrated=true`,
+    all: (project: string): string => `/projects/${project}/runs`,
+    get: (runId: TId): string => `/runs/${runId}`,
+  },
+  roles: {
+    all: `/roles`,
   },
 };

src/api/pipelines/getMyPipelinesApi.ts

@@ -5,11 +5,13 @@ import { apiUrl } from '../apiUrl';
 
 const getMyPipelinesApi = ({
   authenticationToken,
+  project,
 }: {
   authenticationToken: string;
+  project: string;
 }): Promise<TPipeline> =>
   fetchApiWithAuthRequest({
-    url: apiUrl(endpoints.pipelines.my),
+    url: apiUrl(endpoints.pipelines.my(project)),
     method: httpMethods.get,
     authenticationToken,
   });

src/api/projects/getMyProjectsApi.ts

@@ -0,0 +1,17 @@
+import { fetchApiWithAuthRequest } from '../fetchApi';
+import { endpoints } from '../endpoints';
+import { httpMethods } from '../constants';
+import { apiUrl } from '../apiUrl';
+
+const getMyProjectApi = ({
+  authenticationToken,
+}: {
+  authenticationToken: string;
+}): Promise<TPipeline> =>
+  fetchApiWithAuthRequest({
+    url: apiUrl(endpoints.projects.my),
+    method: httpMethods.get,
+    authenticationToken,
+  });
+
+export default getMyProjectApi;

src/api/roles/getRolesApi.ts

@@ -0,0 +1,17 @@
+import { fetchApiWithAuthRequest } from '../fetchApi';
+import { endpoints } from '../endpoints';
+import { httpMethods } from '../constants';
+import { apiUrl } from '../apiUrl';
+
+const getRolesApi = ({
+  authenticationToken,
+}: {
+  authenticationToken: string;
+}): Promise<Roles> =>
+  fetchApiWithAuthRequest({
+    url: apiUrl(endpoints.roles.all),
+    method: httpMethods.get,
+    authenticationToken,
+  });
+
+export default getRolesApi;

src/api/runs/getAllRunsApi.ts

@@ -4,12 +4,14 @@ import { httpMethods } from '../constants';
 import { apiUrl } from '../apiUrl';
 
 const getAllRunsApi = ({
+  project,
   authenticationToken,
 }: {
+  project: string;
   authenticationToken: string;
 }): Promise<TOrganization> =>
   fetchApiWithAuthRequest({
-    url: apiUrl(endpoints.runs.all),
+    url: apiUrl(endpoints.runs.all(project)),
     method: httpMethods.get,
     authenticationToken,
   });

src/api/stackComponents/getStackComponentListApi.ts

@@ -6,12 +6,14 @@ import { apiUrl } from '../apiUrl';
 const getMyStackComponentsApi = ({
   authenticationToken,
   type,
+  project,
 }: {
+  project: string;
   authenticationToken: string;
   type: string;
 }): Promise<TStack> =>
   fetchApiWithAuthRequest({
-    url: apiUrl(endpoints.StackComponents.my(type)),
+    url: apiUrl(endpoints.StackComponents.my(type, project)),
     method: httpMethods.get,
     authenticationToken,
   });

src/api/stacks/getMyStacksApi.ts

@@ -4,12 +4,14 @@ import { httpMethods } from '../constants';
 import { apiUrl } from '../apiUrl';
 
 const getMyStacksApi = ({
+  project,
   authenticationToken,
 }: {
+  project: string;
   authenticationToken: string;
 }): Promise<TStack> =>
   fetchApiWithAuthRequest({
-    url: apiUrl(endpoints.Stacks.my),
+    url: apiUrl(endpoints.Stacks.my(project)),
     method: httpMethods.get,
     authenticationToken,
   });