@postgres.ai/shared 4.0.1-pr-1054.10 → 4.0.1-pr-1059

package/package.json

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

package/pages/Branches/components/BranchesTable/index.js

@@ -77,7 +77,7 @@ export const BranchesTable = ({ branches, emptyTableText, deleteBranch, branches
     if (!state.branches.length) {
         return _jsx("p", { className: classes.marginTop, children: emptyTableText });
     }
-    return (_jsx(HorizontalScrollContainer, { children: _jsxs(Table, { children: [_jsx(TableHead, { children: _jsxs(TableRow, { children: [_jsx(TableHeaderCell, {}), _jsx(TableHeaderCell, { children: "Branch" }), _jsx(TableHeaderCell, { children: _jsxs("div", { onClick: handlesortByParent, className: cn(classes.interactiveRow, classes.verticalCentered), children: ["Parent", _jsx(ArrowDropDownIcon, { className: cn(state.sortByParent === 'asc' && classes.sortIconUp, classes.sortIcon) })] }) }), _jsx(TableHeaderCell, { children: "Data state time" }), _jsx(TableHeaderCell, { children: "Latest Snapshot ID" }), _jsx(TableHeaderCell, { children: "Number of snapshots" })] }) }), _jsx(TableBody, { children: (_a = state.branches) === null || _a === void 0 ? void 0 : _a.map((branch) => {
+    return (_jsx(HorizontalScrollContainer, { children: _jsxs(Table, { children: [_jsx(TableHead, { children: _jsxs(TableRow, { children: [_jsx(TableHeaderCell, {}), _jsx(TableHeaderCell, { children: "Branch" }), _jsx(TableHeaderCell, { children: "Dataset" }), _jsx(TableHeaderCell, { children: _jsxs("div", { onClick: handlesortByParent, className: cn(classes.interactiveRow, classes.verticalCentered), children: ["Parent", _jsx(ArrowDropDownIcon, { className: cn(state.sortByParent === 'asc' && classes.sortIconUp, classes.sortIcon) })] }) }), _jsx(TableHeaderCell, { children: "Data state time" }), _jsx(TableHeaderCell, { children: "Latest Snapshot ID" }), _jsx(TableHeaderCell, { children: "Number of snapshots" })] }) }), _jsx(TableBody, { children: (_a = state.branches) === null || _a === void 0 ? void 0 : _a.map((branch) => {
                         const branchPagePath = host.routes.branch(branch.name);
                         return (_jsxs(TableRow, { hover: true, onClick: () => history.push(branchPagePath), className: classes.pointerCursor, children: [_jsx(TableBodyCellMenu, { actions: [
                                         {
@@ -91,7 +91,7 @@ export const BranchesTable = ({ branches, emptyTableText, deleteBranch, branches
                                                 setIsOpenDestroyModal(true);
                                             },
                                         },
-                                    ] }), _jsx(TableBodyCell, { children: branch.name }), _jsx(TableBodyCell, { children: branch.parent }), _jsx(TableBodyCell, { children: formatDateWithDistance(branch.dataStateAt, new Date(branch.dataStateAt)) }), _jsx(TableBodyCell, { children: branch.snapshotID }), _jsx(TableBodyCell, { children: branch.numSnapshots })] }, branch.name));
+                                    ] }), _jsx(TableBodyCell, { children: branch.name }), _jsx(TableBodyCell, { children: branch.dataset }), _jsx(TableBodyCell, { children: branch.parent }), _jsx(TableBodyCell, { children: formatDateWithDistance(branch.dataStateAt, new Date(branch.dataStateAt)) }), _jsx(TableBodyCell, { children: branch.snapshotID }), _jsx(TableBodyCell, { children: branch.numSnapshots })] }, branch.name));
                     }) }), _jsx(DeleteBranchModal, { isOpen: isOpenDestroyModal, onClose: () => {
                         setIsOpenDestroyModal(false);
                         setBranchId('');

package/pages/CreateBranch/index.js

@@ -92,8 +92,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);
@@ -103,13 +103,18 @@ 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.dataset;
         formik.setFieldValue('baseBranch', branchName);
-        await fetchSnapshots(branchName);
+        await fetchSnapshots(branchName, dataset);
     };
     const [{ formik }] = useForm(handleSubmit);
     useEffect(() => {
-        load(instanceId);
-        fetchSnapshots(formik.values.baseBranch);
+        load(instanceId).then(() => {
+            const selectedBranch = branchesList === null || branchesList === void 0 ? void 0 : branchesList.find((b) => b.name === formik.values.baseBranch);
+            const dataset = selectedBranch === null || selectedBranch === void 0 ? void 0 : selectedBranch.dataset;
+            fetchSnapshots(formik.values.baseBranch, dataset);
+        });
     }, [formik.values.baseBranch]);
     if (isBranchesLoading) {
         return _jsx(StubSpinner, {});
@@ -118,9 +123,12 @@ export const CreateBranchPage = observer(({ instanceId, api, elements, routes, i
                                             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
                                             ? branchesList.map((branch) => {
+                                                const displayName = branch.dataset
+                                                    ? `${branch.name} (${branch.dataset})`
+                                                    : branch.name;
                                                 return {
                                                     value: branch.name,
-                                                    children: branch.name,
+                                                    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

@@ -3,6 +3,7 @@ export interface Branch {
     parent: string;
     dataStateAt: string;
     snapshotID: string;
+    dataset: string;
     numSnapshots: number;
 }
 export declare const formatBranchesDto: (dto: Branch[]) => {
@@ -10,6 +11,7 @@ export declare const formatBranchesDto: (dto: Branch[]) => {
     name: 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;