@postgres.ai/shared 4.0.1-pr-1059.2 → 4.0.1-pr-1059.3

package/package.json

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

package/pages/CreateBranch/index.js

@@ -77,6 +77,7 @@ const useStyles = makeStyles({
     },
 }, { index: 1 });
 export const CreateBranchPage = observer(({ instanceId, api, elements, routes, isPlatform, hideBranchingFeatures }) => {
+    var _a;
     const stores = useCreatedStores(api);
     const classes = useStyles();
     const history = useHistory();
@@ -102,11 +103,11 @@ export const CreateBranchPage = observer(({ instanceId, api, elements, routes, i
         });
     };
     const handleParentBranchChange = async (e) => {
-        const branchName = e.target.value;
-        const selectedBranch = branchesList === null || branchesList === void 0 ? void 0 : branchesList.find((b) => b.name === branchName);
-        const dataset = selectedBranch === null || selectedBranch === void 0 ? void 0 : selectedBranch.baseDataset;
+        const compositeKey = e.target.value;
+        const [branchName, dataset] = compositeKey.split('|');
+        const selectedBranch = branchesList === null || branchesList === void 0 ? void 0 : branchesList.find((b) => b.name === branchName && b.baseDataset === dataset);
         formik.setFieldValue('baseBranch', branchName);
-        await fetchSnapshots(branchName, dataset);
+        await fetchSnapshots(branchName, dataset || (selectedBranch === null || selectedBranch === void 0 ? void 0 : selectedBranch.baseDataset));
     };
     const [{ formik }] = useForm(handleSubmit);
     useEffect(() => {
@@ -116,6 +117,8 @@ export const CreateBranchPage = observer(({ instanceId, api, elements, routes, i
         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 dataset = selected === null || selected === void 0 ? void 0 : selected.baseDataset;
         fetchSnapshots(formik.values.baseBranch, dataset);
     }, [branchesList, formik.values.baseBranch]);
@@ -124,13 +127,14 @@ export const CreateBranchPage = observer(({ instanceId, api, elements, routes, i
     }
     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: `${formik.values.baseBranch}|${((_a = branchesList === null || branchesList === void 0 ? void 0 : branchesList.find(b => b.name === formik.values.baseBranch)) === null || _a === void 0 ? void 0 : _a.baseDataset) || ''}`, 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,
+                                                    value: compositeValue,
                                                     children: displayName,
                                                 };
                                             })