@postgres.ai/shared 4.0.1 → 4.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postgres.ai/shared",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "main": "index.js",
   "types": "index.d.ts",
   "peerDependencies": {

package/pages/CreateBranch/index.js

@@ -81,6 +81,7 @@ export const CreateBranchPage = observer(({ instanceId, api, elements, routes, i
     const classes = useStyles();
     const history = useHistory();
     const [branchSnapshots, setBranchSnapshots] = useState([]);
+    const [selectedBranchKey, setSelectedBranchKey] = useState('main|');
     const { load, branchesList, getBranchesError, createBranch, createBranchError, isBranchesLoading, isCreatingBranch, getSnapshots, snapshotsError, } = stores.main;
     const handleSubmit = async (values) => {
         await createBranch({
@@ -92,8 +93,8 @@ export const CreateBranchPage = observer(({ instanceId, api, elements, routes, i
             }
         });
     };
-    const fetchSnapshots = async (branchName) => {
-        await getSnapshots(instanceId, branchName).then((response) => {
+    const fetchSnapshots = async (branchName, dataset) => {
+        await getSnapshots(instanceId, branchName, dataset).then((response) => {
             var _a;
             if (response) {
                 setBranchSnapshots(response);
@@ -102,25 +103,40 @@ export const CreateBranchPage = observer(({ instanceId, api, elements, routes, i
         });
     };
     const handleParentBranchChange = async (e) => {
-        const branchName = e.target.value;
+        const compositeKey = e.target.value;
+        const [branchName, dataset] = compositeKey.split('|');
+        setSelectedBranchKey(compositeKey);
         formik.setFieldValue('baseBranch', branchName);
-        await fetchSnapshots(branchName);
+        await fetchSnapshots(branchName, dataset);
     };
     const [{ formik }] = useForm(handleSubmit);
     useEffect(() => {
         load(instanceId);
-        fetchSnapshots(formik.values.baseBranch);
-    }, [formik.values.baseBranch]);
+    }, [instanceId]);
+    useEffect(() => {
+        if (!(branchesList === null || branchesList === void 0 ? void 0 : branchesList.length))
+            return;
+        const selected = branchesList.find(b => b.name === formik.values.baseBranch);
+        if (!selected)
+            return;
+        const compositeKey = `${selected.name}|${selected.baseDataset || ''}`;
+        setSelectedBranchKey(compositeKey);
+        fetchSnapshots(selected.name, selected.baseDataset);
+    }, [branchesList]);
     if (isBranchesLoading) {
         return _jsx(StubSpinner, {});
     }
     return (_jsxs(_Fragment, { children: [elements.breadcrumbs, _jsx(SectionTitle, { tag: "h1", level: 1, text: "Create branch", className: classes.title, children: _jsx(InstanceTabs, { tab: TABS_INDEX.BRANCHES, isPlatform: isPlatform, instanceId: instanceId, hasLogs: api.initWS !== undefined, hideInstanceTabs: hideBranchingFeatures }) }), _jsxs("div", { className: classes.wrapper, children: [_jsxs("div", { className: classes.container, children: [(snapshotsError || getBranchesError) && (_jsx("div", { className: classes.marginTop, children: _jsx(ErrorStub, { message: (snapshotsError === null || snapshotsError === void 0 ? void 0 : snapshotsError.message) || (getBranchesError === null || getBranchesError === void 0 ? void 0 : getBranchesError.message) }) })), _jsxs("div", { className: classes.form, children: [_jsx(TextField, { label: "Branch name", variant: "outlined", required: true, fullWidth: true, size: "small", InputLabelProps: {
                                             shrink: true,
-                                        }, value: formik.values.branchName, error: Boolean(formik.errors.branchName), helperText: formik.errors.branchName, className: classes.marginBottom, onChange: (e) => formik.setFieldValue('branchName', e.target.value) }), _jsx("p", { className: cn(classes.marginTop, classes.marginBottom), children: "Choose an existing branch. The new branch will initially point at the same snapshot as the parent branch but going further, their evolution paths will be independent - new snapshots can be created for both branches." }), _jsx(Select, { fullWidth: true, label: "Parent branch", value: formik.values.baseBranch, disabled: !branchesList || formik.isSubmitting, onChange: handleParentBranchChange, error: Boolean(formik.errors.baseBranch), items: branchesList
+                                        }, value: formik.values.branchName, error: Boolean(formik.errors.branchName), helperText: formik.errors.branchName, className: classes.marginBottom, onChange: (e) => formik.setFieldValue('branchName', e.target.value) }), _jsx("p", { className: cn(classes.marginTop, classes.marginBottom), children: "Choose an existing branch. The new branch will initially point at the same snapshot as the parent branch but going further, their evolution paths will be independent - new snapshots can be created for both branches." }), _jsx(Select, { fullWidth: true, label: "Parent branch", value: selectedBranchKey, disabled: !branchesList || formik.isSubmitting, onChange: handleParentBranchChange, error: Boolean(formik.errors.baseBranch), items: branchesList
                                             ? branchesList.map((branch) => {
+                                                const displayName = branch.baseDataset
+                                                    ? `${branch.name} (${branch.baseDataset})`
+                                                    : branch.name;
+                                                const compositeValue = `${branch.name}|${branch.baseDataset || ''}`;
                                                 return {
-                                                    value: branch.name,
-                                                    children: branch.name,
+                                                    value: compositeValue,
+                                                    children: displayName,
                                                 };
                                             })
                                             : [] }), _jsx("strong", { children: "Snapshot ID" }), _jsx("p", { className: cn(classes.marginTop, classes.marginBottom), children: "Choose an existing snapshot. This snapshot will be memorized as a forking point for the new branch; it cannot be deleted while the branch exists." }), _jsx(Select, { fullWidth: true, className: classes.marginBottom2x, label: "Snapshot ID", value: formik.values.snapshotID, disabled: !branchesList || formik.isSubmitting, onChange: (e) => formik.setFieldValue('snapshotID', e.target.value), error: Boolean(formik.errors.baseBranch), items: branchSnapshots

package/pages/CreateBranch/stores/Main.d.ts

@@ -25,7 +25,7 @@ export declare class MainStore {
     load: (instanceId: string) => Promise<void>;
     createBranch: (values: CreateBranchFormValues) => Promise<import("../../../types/api/entities/createBranch").CreateBranchDTO | null | undefined>;
     getBranches: (instanceId: string) => Promise<Branch[] | null | undefined>;
-    getSnapshots: (instanceId: string, branchName?: string) => Promise<{
+    getSnapshots: (instanceId: string, branchName?: string, dataset?: string) => Promise<{
         createdAtDate: Date;
         dataStateAtDate: Date;
         numClones: string | number;

package/pages/CreateBranch/stores/Main.js

@@ -41,12 +41,13 @@ export class MainStore {
                 this.getBranchesError = await error.json().then((err) => err);
             return response;
         };
-        this.getSnapshots = async (instanceId, branchName) => {
+        this.getSnapshots = async (instanceId, branchName, dataset) => {
             if (!this.api.getSnapshots)
                 return;
             const { response, error } = await this.api.getSnapshots({
                 instanceId,
                 branchName,
+                dataset,
             });
             if (error) {
                 this.snapshotsError = await error.json().then((err) => err);

package/pages/Instance/Configuration/utils/index.js

@@ -15,6 +15,7 @@ const dockerImagesConfig = {
     '15': ['0.5.3', '0.5.2', '0.5.1'],
     '16': ['0.5.3', '0.5.2', '0.5.1'],
     '17': ['0.5.3', '0.5.2', '0.5.1'],
+    '18': ['0.6.1'],
 };
 export const uniqueChipValue = (values) => {
     const splitChipArray = values.split(/[,(\s)(\n)(\r)(\t)(\r\n)]/);
@@ -119,7 +120,7 @@ export const postUniqueCustomOptions = (options) => {
 };
 export const customOrGenericImage = (dockerImage) => dockerImage === 'Generic Postgres' || dockerImage === 'custom';
 export const createFallbackDockerImage = (dockerPath, dockerTag) => {
-    const majorVersion = getImageMajorVersion(dockerPath) || '17'; // Default to 17 if version can't be extracted
+    const majorVersion = getImageMajorVersion(dockerPath) || '18'; // Default to 18 if version can't be extracted
     return {
         package_group: 'postgresai',
         pg_major_version: majorVersion,

package/types/api/endpoints/getBranches.d.ts

@@ -1,15 +1,19 @@
 export interface Branch {
     name: string;
+    baseDataset: string;
     parent: string;
     dataStateAt: string;
     snapshotID: string;
+    dataset: string;
     numSnapshots: number;
 }
 export declare const formatBranchesDto: (dto: Branch[]) => {
     dataStateAt: string;
     name: string;
+    baseDataset: string;
     parent: string;
     snapshotID: string;
+    dataset: string;
     numSnapshots: number;
 }[];
 export declare type GetBranches = (instanceId: string) => Promise<{

package/types/api/endpoints/getSnapshots.d.ts

@@ -2,6 +2,7 @@ import { Snapshot } from '@postgres.ai/shared/types/api/entities/snapshot';
 export declare type GetSnapshots = (args: {
     instanceId: string;
     branchName?: string;
+    dataset?: string;
 }) => Promise<{
     response: Snapshot[] | null;
     error: Response | null;