Merge branch 'ui-package-version-bump' into 'dle-4-0'

feat(ui): 3.5.0 backward compatibility & bump package versions to 4.0.0 & fix shared npm package build for DBLab 4.0

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

Author: bogdan-ts

ui/packages/ce/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postgres.ai/ce",
-  "version": "3.5.0",
+  "version": "4.0.0",
   "private": true,
   "dependencies": {
     "@craco/craco": "^6.4.3",

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

@@ -3,6 +3,7 @@ import { useParams } from 'react-router-dom'
 import { getBranches } from 'api/branches/getBranches'
 import { deleteBranch } from 'api/branches/deleteBranch'
 import { getSnapshotList } from 'api/branches/getSnapshotList'
+import { initWS } from 'api/engine/initWS'
 
 import { PageContainer } from 'components/PageContainer'
 import { NavPath } from 'components/NavPath'
@@ -20,6 +21,7 @@ export const Branch = () => {
     getBranches,
     deleteBranch,
     getSnapshotList,
+    initWS
   }
 
   const elements = {

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

@@ -1,6 +1,7 @@
 import { getBranches } from 'api/branches/getBranches'
 import { createBranch } from 'api/branches/createBranch'
 import { getSnapshots } from 'api/snapshots/getSnapshots'
+import { initWS } from 'api/engine/initWS'
 
 import { CreateBranchPage } from '@postgres.ai/shared/pages/CreateBranch'
 
@@ -18,6 +19,7 @@ export const CreateBranch = () => {
     getBranches,
     createBranch,
     getSnapshots,
+    initWS
   }
 
   const elements = {

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

@@ -10,11 +10,12 @@ import { resetClone } from 'api/clones/resetClone'
 import { destroyClone } from 'api/clones/destroyClone'
 import { updateClone } from 'api/clones/updateClone'
 import { createSnapshot } from 'api/snapshots/createSnapshot'
+import { initWS } from 'api/engine/initWS'
+import { destroySnapshot } from 'api/snapshots/destroySnapshot'
 
 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
@@ -33,6 +34,7 @@ export const Clone = () => {
     destroySnapshot,
     updateClone,
     createSnapshot,
+    initWS,
   }
 
   const elements = {

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

@@ -9,6 +9,7 @@ import { createClone } from 'api/clones/createClone'
 import { getClone } from 'api/clones/getClone'
 import { getBranches } from 'api/branches/getBranches'
 import { getSnapshots } from 'api/snapshots/getSnapshots'
+import { initWS } from 'api/engine/initWS'
 
 export const CreateClone = () => {
   const routes = {
@@ -23,6 +24,7 @@ export const CreateClone = () => {
     getClone,
     getBranches,
     getSnapshots,
+    initWS
   }
 
   const elements = {

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

@@ -1,5 +1,6 @@
 import { createSnapshot } from 'api/snapshots/createSnapshot'
 import { getInstance } from 'api/instances/getInstance'
+import { initWS } from 'api/engine/initWS'
 
 import { CreateSnapshotPage } from '@postgres.ai/shared/pages/CreateSnapshot'
 
@@ -11,6 +12,7 @@ export const CreateSnapshot = () => {
   const api = {
     createSnapshot,
     getInstance,
+    initWS
   }
 
   const elements = {

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

@@ -9,6 +9,7 @@ import { PageContainer } from 'components/PageContainer'
 import { destroySnapshot } from 'api/snapshots/destroySnapshot'
 import { getSnapshots } from 'api/snapshots/getSnapshots'
 import { getBranchSnapshot } from 'api/snapshots/getBranchSnapshot'
+import { initWS } from 'api/engine/initWS'
 
 type Params = {
   snapshotId: string
@@ -21,6 +22,7 @@ export const Snapshot = () => {
     destroySnapshot,
     getSnapshots,
     getBranchSnapshot,
+    initWS,
   }
 
   const elements = {

ui/packages/shared/.gitlab-ci.yml

@@ -27,15 +27,25 @@ publish-shared-preview:
     - cd ui/packages/shared
     - echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc
 
-    # Get base version from package.json (strip any -pr or other suffix)
+    # Get base version from package.json (strip any suffix)
     - BASE_VERSION=$(jq -r .version package.json)
     - BASE_VERSION=${BASE_VERSION%%-*}
     - export PREID="pr-${CI_MERGE_REQUEST_IID:-preview}"
 
-    # Detect next available patch for same PR
-    - EXISTING_TAGS=$(npm view @postgres.ai/shared versions --json | jq -r '.[]' | grep "^${BASE_VERSION}-${PREID}" || true)
-    - COUNT=$(echo "$EXISTING_TAGS" | wc -l | xargs)
-    - if [ "$COUNT" -eq 0 ]; then VERSION="${BASE_VERSION}-${PREID}"; else VERSION="${BASE_VERSION}-${PREID}.${COUNT}"; fi
+    # Get all existing versions
+    - EXISTING_TAGS=$(npm view @postgres.ai/shared versions --json | jq -r '.[]' || echo "")
+
+    # Find next available version suffix
+    - VERSION=""
+    - for i in $(seq 0 20); do
+        CANDIDATE="${BASE_VERSION}-${PREID}";
+        [ "$i" -gt 0 ] && CANDIDATE="${CANDIDATE}.${i}";
+        if ! echo "$EXISTING_TAGS" | grep -qx "$CANDIDATE"; then
+          VERSION="$CANDIDATE";
+          break;
+        fi;
+      done
+    - if [ -z "$VERSION" ]; then echo "❌ Failed to determine unique preview version"; exit 1; fi
     - echo "Publishing version $VERSION"
     - npm version "$VERSION" --no-git-tag-version
 

ui/packages/shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postgres.ai/shared",
-  "version": "3.5.0",
+  "version": "4.0.0",
   "scripts": {
     "build": "tsc -p tsconfig.build.json && node scripts/copy-assets.js",
     "pack": "node scripts/pack.js"

ui/packages/shared/pages/Branches/Branch/index.tsx

@@ -43,7 +43,7 @@ import { Host } from './context'
 import { DeleteBranch } from '@postgres.ai/shared/types/api/endpoints/deleteBranch'
 import { InstanceTabs, TABS_INDEX } from "../../Instance/Tabs";
 
-type Props = Host & { isPlatform?: boolean }
+type Props = Host & { isPlatform?: boolean, hideBranchingFeatures?: boolean }
 
 const useStyles = makeStyles(
   () => ({
@@ -187,6 +187,8 @@ export const BranchesPage = observer((props: Props) => {
           tab={TABS_INDEX.BRANCHES}
           isPlatform={props.isPlatform}
           instanceId={props.instanceId}
+          hasLogs={props.api.initWS !== undefined}
+          hideInstanceTabs={props.hideBranchingFeatures}
         />
       </SectionTitle>
     </>