Merge branch '572-dle-4-0-ui-feature-requests' into 'dle-4-0'

feat(ui): UI feature requests, dle-4-0 for EE UI (Platform)

See merge request postgres-ai/database-lab!974

Author: Bogdan Tsechoev

ui/packages/ce/src/App/Instance/Branches/Branch/index.tsx

@@ -40,11 +40,15 @@ export const Branch = () => {
   return (
     <PageContainer>
       <BranchesPage
+        instanceId=""
         api={api}
         elements={elements}
         branchId={branchId}
         routes={{
           branch: () => ROUTES.INSTANCE.BRANCHES.BRANCHES.path,
+          branches: () => ROUTES.INSTANCE.BRANCHES.BRANCHES.path,
+          snapshot: (snapshotId: string) =>
+            ROUTES.INSTANCE.SNAPSHOTS.SNAPSHOT.createPath(snapshotId),
         }}
       />
     </PageContainer>

ui/packages/ce/src/App/Instance/Branches/CreateBranch/index.tsx

@@ -9,6 +9,11 @@ import { NavPath } from 'components/NavPath'
 import { ROUTES } from 'config/routes'
 
 export const CreateBranch = () => {
+  const routes = {
+    branch: (branchName: string) =>
+      ROUTES.INSTANCE.BRANCHES.BRANCH.createPath(branchName),
+  }
+
   const api = {
     getBranches,
     createBranch,
@@ -29,7 +34,12 @@ export const CreateBranch = () => {
 
   return (
     <PageContainer>
-      <CreateBranchPage instanceId={''} api={api} elements={elements} />
+      <CreateBranchPage
+        instanceId={''}
+        routes={routes}
+        api={api}
+        elements={elements}
+      />
     </PageContainer>
   )
 }

ui/packages/ce/src/App/Instance/Clones/Clone/index.tsx

@@ -14,6 +14,7 @@ import { createSnapshot } from 'api/snapshots/createSnapshot'
 import { PageContainer } from 'components/PageContainer'
 import { NavPath } from 'components/NavPath'
 import { ROUTES } from 'config/routes'
+import { destroySnapshot } from 'api/snapshots/destroySnapshot'
 
 type Params = {
   cloneId: string
@@ -29,6 +30,7 @@ export const Clone = () => {
     getClone,
     resetClone,
     destroyClone,
+    destroySnapshot,
     updateClone,
     createSnapshot,
   }
@@ -55,6 +57,8 @@ export const Clone = () => {
         cloneId={cloneId}
         routes={{
           instance: () => ROUTES.INSTANCE.path,
+          snapshot: (snapshotId: string) =>
+            ROUTES.INSTANCE.SNAPSHOTS.SNAPSHOT.createPath(snapshotId),
         }}
         api={api}
         elements={elements}

ui/packages/ce/src/App/Instance/Page/index.tsx

@@ -1,4 +1,3 @@
-
 import { Instance } from '@postgres.ai/shared/pages/Instance'
 
 import { PageContainer } from 'components/PageContainer'
@@ -30,6 +29,12 @@ export const Page = ({ renderCurrentTab }: { renderCurrentTab?: number }) => {
     createSnapshot: () => ROUTES.INSTANCE.SNAPSHOTS.CREATE.path,
     clone: (cloneId: string) =>
       ROUTES.INSTANCE.CLONES.CLONE.createPath(cloneId),
+    branch: (branchId: string) =>
+      ROUTES.INSTANCE.BRANCHES.BRANCH.createPath(branchId),
+    branches: () => ROUTES.INSTANCE.BRANCHES.path,
+    snapshots: () => ROUTES.INSTANCE.SNAPSHOTS.path,
+    snapshot: (snapshotId: string) =>
+      ROUTES.INSTANCE.SNAPSHOTS.SNAPSHOT.createPath(snapshotId),
   }
 
   const api = {
@@ -50,7 +55,7 @@ export const Page = ({ renderCurrentTab }: { renderCurrentTab?: number }) => {
     createBranch,
     getBranches,
     getSnapshotList,
-    deleteBranch
+    deleteBranch,
   }
 
   const elements = {

ui/packages/ce/src/App/Instance/Snapshots/CreateSnapshot/index.tsx

@@ -27,7 +27,15 @@ export const CreateSnapshot = () => {
 
   return (
     <PageContainer>
-      <CreateSnapshotPage api={api} elements={elements} />
+      <CreateSnapshotPage
+        instanceId=""
+        api={api}
+        elements={elements}
+        routes={{
+          snapshot: (snapshotId: string) =>
+            ROUTES.INSTANCE.SNAPSHOTS.SNAPSHOT.createPath(snapshotId),
+        }}
+      />
     </PageContainer>
   )
 }

ui/packages/ce/src/App/Instance/Snapshots/Snapshot/index.tsx

@@ -45,6 +45,10 @@ export const Snapshot = () => {
         snapshotId={snapshotId}
         routes={{
           snapshot: () => ROUTES.INSTANCE.SNAPSHOTS.SNAPSHOTS.path,
+          branch: (branchName: string) =>
+            ROUTES.INSTANCE.BRANCHES.BRANCH.createPath(branchName),
+          clone: (cloneId: string) =>
+            ROUTES.INSTANCE.CLONES.CLONE.createPath(cloneId),
         }}
         api={api}
         elements={elements}

ui/packages/ce/src/api/snapshots/destroySnapshot.ts renamed to ui/packages/ce/src/api/snapshots/destroySnapshot.js

@@ -7,10 +7,7 @@
 
 import { request } from 'helpers/request'
 
-export const destroySnapshot = async (
-  snapshotId: string,
-  forceDelete: boolean,
-) => {
+export const destroySnapshot = async (snapshotId, forceDelete) => {
   const response = await request(`/snapshot/delete`, {
     method: 'POST',
     body: JSON.stringify({

ui/packages/platform/src/api/branches/createBranch.ts

@@ -0,0 +1,31 @@
+/*--------------------------------------------------------------------------
+ * Copyright (c) 2019-2021, Postgres.ai, Nikolay Samokhvalov nik@postgres.ai
+ * All Rights Reserved. Proprietary and confidential.
+ * Unauthorized copying of this file, via any medium is strictly prohibited
+ *--------------------------------------------------------------------------
+ */
+
+import { request } from 'helpers/request'
+
+import { CreateBranchFormValues } from '@postgres.ai/shared/types/api/endpoints/createBranch'
+
+export const createBranch = async (req: CreateBranchFormValues) => {
+  const response = await request('/rpc/dblab_api_call', {
+    method: 'POST',
+    body: JSON.stringify({
+      instance_id: req.instanceId,
+      action: '/branch/create',
+      method: 'post',
+      data: {
+        branchName: req.branchName,
+        ...(req.baseBranch && { baseBranch: req.baseBranch }),
+        ...(req.snapshotID && { snapshotID: req.snapshotID }),
+      },
+    }),
+  })
+
+  return {
+    response: response.ok ? await response.json() : null,
+    error: response.ok ? null : response,
+  }
+}

ui/packages/platform/src/api/branches/deleteBranch.ts

@@ -0,0 +1,27 @@
+/*--------------------------------------------------------------------------
+ * Copyright (c) 2019-2021, Postgres.ai, Nikolay Samokhvalov nik@postgres.ai
+ * All Rights Reserved. Proprietary and confidential.
+ * Unauthorized copying of this file, via any medium is strictly prohibited
+ *--------------------------------------------------------------------------
+ */
+
+import { request } from 'helpers/request'
+
+export const deleteBranch = async (branchName: string, instanceId: string) => {
+  const response = await request('/rpc/dblab_api_call', {
+    method: 'POST',
+    body: JSON.stringify({
+      action: '/branch/delete',
+      instance_id: instanceId,
+      method: 'post',
+      data: {
+        branchName,
+      },
+    }),
+  })
+
+  return {
+    response: response.ok ? await response.json() : null,
+    error: response.ok ? null : await response.json(),
+  }
+}

ui/packages/platform/src/api/branches/getBranches.ts

@@ -0,0 +1,25 @@
+/*--------------------------------------------------------------------------
+ * Copyright (c) 2019-2021, Postgres.ai, Nikolay Samokhvalov nik@postgres.ai
+ * All Rights Reserved. Proprietary and confidential.
+ * Unauthorized copying of this file, via any medium is strictly prohibited
+ *--------------------------------------------------------------------------
+ */
+
+import { request } from 'helpers/request'
+import { formatBranchesDto } from '@postgres.ai/shared/types/api/endpoints/getBranches'
+
+export const getBranches = async (instanceId: string) => {
+  const response = await request('/rpc/dblab_api_call', {
+    method: 'POST',
+    body: JSON.stringify({
+      instance_id: instanceId,
+      action: '/branches',
+      method: 'get',
+    }),
+  })
+
+  return {
+    response: response.ok ? formatBranchesDto(await response.json()) : null,
+    error: response.ok ? null : response,
+  }
+}

ui/packages/platform/src/api/branches/getSnapshotList.ts

@@ -0,0 +1,30 @@
+/*--------------------------------------------------------------------------
+ * Copyright (c) 2019-2021, Postgres.ai, Nikolay Samokhvalov nik@postgres.ai
+ * All Rights Reserved. Proprietary and confidential.
+ * Unauthorized copying of this file, via any medium is strictly prohibited
+ *--------------------------------------------------------------------------
+ */
+
+import { request } from 'helpers/request'
+
+export const getSnapshotList = async (
+  branchName: string,
+  instanceId: string,
+) => {
+  const response = await request('/rpc/dblab_api_call', {
+    method: 'POST',
+    body: JSON.stringify({
+      instance_id: instanceId,
+      action: '/branch/log',
+      method: 'post',
+      data: {
+        branchName: branchName,
+      },
+    }),
+  })
+
+  return {
+    response: response.ok ? await response.json() : null,
+    error: response.ok ? null : response,
+  }
+}

ui/packages/platform/src/api/configs/getConfig.ts

@@ -1,8 +1,15 @@
 import { formatConfig } from '@postgres.ai/shared/types/api/entities/config'
 import { request } from 'helpers/request'
 
-export const getConfig = async () => {
-  const response = await request('/admin/config')
+export const getConfig = async (instanceId: string) => {
+  const response = await request('/rpc/dblab_api_call', {
+    method: 'POST',
+    body: JSON.stringify({
+      instance_id: instanceId,
+      action: '/admin/config',
+      method: 'get',
+    }),
+  })
 
   return {
     response: response.ok ? formatConfig(await response.json()) : null,

ui/packages/platform/src/api/configs/getFullConfig.ts

@@ -1,6 +1,14 @@
 import { request } from 'helpers/request'
-export const getFullConfig = async () => {
-  const response = await request('/admin/config.yaml')
+
+export const getFullConfig = async (instanceId: string) => {
+  const response = await request('/rpc/dblab_api_call', {
+    method: 'POST',
+    body: JSON.stringify({
+      instance_id: instanceId,
+      action: '/admin/config.yaml',
+      method: 'get',
+    }),
+  })
     .then((res) => res.blob())
     .then((blob) => blob.text())
     .then((yamlAsString) => {

ui/packages/platform/src/api/configs/testDbSource.ts

@@ -2,20 +2,25 @@ import { dbSource } from '@postgres.ai/shared/types/api/entities/dbSource'
 import { request } from 'helpers/request'
 
 export const testDbSource = async (req: dbSource) => {
-  const response = await request('/admin/test-db-source', {
+  const response = await request('/rpc/dblab_api_call', {
     method: 'POST',
     body: JSON.stringify({
-      host: req.host,
-      port: req.port.toString(),
-      dbname: req.dbname,
-      username: req.username,
-      password: req.password,
-      db_list: req.db_list
+      instance_id: req.instanceId,
+      action: '/admin/test-db-source',
+      method: 'post',
+      data: {
+        host: req.host,
+        port: req.port.toString(),
+        dbname: req.dbname,
+        username: req.username,
+        password: req.password,
+        db_list: req.db_list,
+      },
     }),
   })
 
   return {
-    response: response.ok ? await response.json(): null,
-    error: response.ok ? null : await response.json()
+    response: response.ok ? await response.json() : null,
+    error: response.ok ? null : await response.json(),
   }
 }