@postgres.ai/shared 4.0.0-pr-695.12 → 4.0.0-pr-1042

package/package.json

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

package/pages/CreateBranch/index.js

@@ -116,7 +116,7 @@ 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), 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, disabled: !branchesList || formik.isSubmitting, onChange: handleParentBranchChange, error: Boolean(formik.errors.baseBranch), items: branchesList
                                             ? branchesList.map((branch) => {
                                                 return {
                                                     value: branch.name,

package/pages/CreateBranch/useForm.js

@@ -7,7 +7,23 @@
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
 const Schema = Yup.object().shape({
-    branchName: Yup.string().required('Branch name is required'),
+    branchName: Yup.string()
+        .required('Branch name is required')
+        .max(255, 'Branch name cannot exceed 255 characters')
+        .test('valid-zfs-name', 'Branch name can only contain letters, numbers, and these characters: _ -', (value) => {
+        if (!value)
+            return true;
+        // ZFS allows only alphanumeric characters and: _ -
+        const validChars = /^[a-zA-Z0-9_-]*$/;
+        return validChars.test(value);
+    })
+        .test('valid-start-char', 'Branch name must start with a letter, number, or underscore', (value) => {
+        if (!value)
+            return true;
+        // Dataset names can begin with alphanumeric character or underscore
+        const validStartChar = /^[a-zA-Z0-9_]/;
+        return validStartChar.test(value);
+    }),
 });
 export const useForm = (onSubmit) => {
     const formik = useFormik({

package/pages/CreateClone/index.js

@@ -128,13 +128,13 @@ export const CreateClone = observer((props) => {
                                         })) !== null && _g !== void 0 ? _g : [] })), _jsx(TextField, { fullWidth: true, label: "Clone ID", value: formik.values.cloneId, onChange: (e) => {
                                             const sanitizedCloneIdValue = e.target.value.replace(/\s/g, '');
                                             formik.setFieldValue('cloneId', sanitizedCloneIdValue);
-                                        }, error: Boolean(formik.errors.cloneId), disabled: isCreatingClone }), _jsx(Select, { fullWidth: true, label: "Snapshot *", value: formik.values.snapshotId, disabled: !snapshots || isCreatingClone, onChange: (e) => formik.setFieldValue('snapshotId', e.target.value), error: Boolean(formik.errors.snapshotId), items: (_h = snapshots.map((snapshot, i) => {
+                                        }, error: Boolean(formik.errors.cloneId), helperText: formik.errors.cloneId, disabled: isCreatingClone }), _jsx(Select, { fullWidth: true, label: "Snapshot *", value: formik.values.snapshotId, disabled: !snapshots || isCreatingClone, onChange: (e) => formik.setFieldValue('snapshotId', e.target.value), error: Boolean(formik.errors.snapshotId), items: (_h = snapshots.map((snapshot, i) => {
                                             const isLatest = i === 0;
                                             return {
                                                 value: snapshot.id,
                                                 children: (_jsxs("div", { className: styles.snapshotItem, children: [_jsxs("strong", { className: styles.snapshotOverflow, children: [snapshot === null || snapshot === void 0 ? void 0 : snapshot.id, " ", isLatest && _jsx("span", { children: "Latest" })] }), (snapshot === null || snapshot === void 0 ? void 0 : snapshot.dataStateAt) && (_jsxs("p", { children: ["Data state at: ", snapshot === null || snapshot === void 0 ? void 0 : snapshot.dataStateAt] })), snapshot.message && (_jsxs("span", { children: ["Message: ", snapshot.message] }))] })),
                                             };
-                                        })) !== null && _h !== void 0 ? _h : [] }), _jsx("p", { className: styles.remark, children: "By default latest snapshot of database is used. You can select\u00A0 different snapshots if earlier database state is needed." })] }), _jsxs("div", { className: styles.section, children: [_jsx("h2", { className: styles.title, children: "Database credentials *" }), _jsx("p", { className: styles.text, children: "Set custom credentials for the new clone. Save the password in reliable place, it can\u2019t be read later." }), _jsx(TextField, { fullWidth: true, label: "Database username *", value: formik.values.dbUser, onChange: (e) => formik.setFieldValue('dbUser', e.target.value), error: Boolean(formik.errors.dbUser), disabled: isCreatingClone }), _jsx(TextField, { fullWidth: true, label: "Database password *", type: "password", value: formik.values.dbPassword, onChange: (e) => {
+                                        })) !== null && _h !== void 0 ? _h : [] }), _jsx("p", { className: styles.remark, children: "By default latest snapshot of database is used. You can select\u00A0 different snapshots if earlier database state is needed." })] }), _jsxs("div", { className: styles.section, children: [_jsx("h2", { className: styles.title, children: "Database credentials *" }), _jsx("p", { className: styles.text, children: "Set custom credentials for the new clone. Save the password in reliable place, it can't be read later." }), _jsx(TextField, { fullWidth: true, label: "Database username *", value: formik.values.dbUser, onChange: (e) => formik.setFieldValue('dbUser', e.target.value), error: Boolean(formik.errors.dbUser), disabled: isCreatingClone }), _jsx(TextField, { fullWidth: true, label: "Database password *", type: "password", value: formik.values.dbPassword, onChange: (e) => {
                                             formik.setFieldValue('dbPassword', e.target.value);
                                             if (formik.errors.dbPassword) {
                                                 formik.setFieldError('dbPassword', '');

package/pages/CreateClone/useForm.js

@@ -1,7 +1,15 @@
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
 const Schema = Yup.object().shape({
-    cloneId: Yup.string(),
+    cloneId: Yup.string()
+        .max(63, 'Clone ID cannot exceed 63 characters')
+        .test('valid-docker-name', 'Clone ID must start with a letter or number and can only contain letters, numbers, underscores, periods, and hyphens', (value) => {
+        if (!value)
+            return true;
+        // Docker container name requirements: start with letter/number, contain only ASCII [a-zA-Z0-9_.-]
+        const validDockerName = /^[a-zA-Z0-9][a-zA-Z0-9_.-]*$/;
+        return validDockerName.test(value);
+    }),
     snapshotId: Yup.string().required('Date state time is required'),
     dbUser: Yup.string().required('Database username is required'),
     dbPassword: Yup.string().required('Database password is required'),

package/pages/Instance/index.js

@@ -56,7 +56,7 @@ export const Instance = observer((props) => {
     const [activeTab, setActiveTab] = React.useState((props === null || props === void 0 ? void 0 : props.renderCurrentTab) || TABS_INDEX.OVERVIEW);
     const [hasBeenRedirected, setHasBeenRedirected] = React.useState(false);
     const stores = useCreatedStores(props);
-    const { instance, instanceError, instanceRetrieval, isLoadingInstance, load, } = stores.main;
+    const { instance, instanceError, instanceRetrieval, isLoadingInstance, isLoadingInstanceRetrieval, load, } = stores.main;
     const switchTab = (_, tabID) => {
         const contentElement = document.getElementById('content-container');
         setActiveTab(tabID);
@@ -66,7 +66,7 @@ export const Instance = observer((props) => {
         contentElement === null || contentElement === void 0 ? void 0 : contentElement.scrollTo(0, 0);
     };
     const isInstanceIntegrated = instanceRetrieval ||
-        (!isLoadingInstance && instance && (instance === null || instance === void 0 ? void 0 : instance.url) && !instanceError);
+        (!isLoadingInstance && !isLoadingInstanceRetrieval && instance && (instance === null || instance === void 0 ? void 0 : instance.url) && !instanceError);
     const isConfigurationActive = (instanceRetrieval === null || instanceRetrieval === void 0 ? void 0 : instanceRetrieval.mode) !== 'physical';
     useEffect(() => {
         load(instanceId, isPlatform);
@@ -86,7 +86,7 @@ export const Instance = observer((props) => {
         }
     }, [instance, hasBeenRedirected]);
     return (_jsx(HostProvider, { value: props, children: _jsxs(StoresProvider, { value: stores, children: [props.elements.breadcrumbs, _jsx(SectionTitle, { text: props.title, level: 1, tag: "h1", className: classes.title, rightContent: _jsx(Button, { onClick: () => load(props.instanceId, isPlatform), isDisabled: !instance && !instanceError, className: classes.reloadButton, children: "Reload info" }), children: isInstanceIntegrated && (_jsx(InstanceTabs, { instanceId: props.instanceId, tab: activeTab, onTabChange: (tabID) => setActiveTab(tabID), isPlatform: isPlatform, hasLogs: api.initWS !== undefined, hideInstanceTabs: props.hideBranchingFeatures })) }), instanceError && (_jsx(ErrorStub, { ...instanceError, className: classes.errorStub })), isInstanceIntegrated ? (_jsxs(_Fragment, { children: [_jsxs(TabPanel, { value: activeTab, index: TABS_INDEX.OVERVIEW, children: [!instanceError && (_jsx("div", { className: classes.content, children: instance && ((_b = (_a = instance.state) === null || _a === void 0 ? void 0 : _a.retrieving) === null || _b === void 0 ? void 0 : _b.status) ? (_jsxs(_Fragment, { children: [_jsx(Clones, {}), _jsx(Info, { hideBranchingFeatures: props.hideBranchingFeatures })] })) : (_jsx(StubSpinner, {})) })), _jsx(ClonesModal, {}), _jsx(SnapshotsModal, {})] }), _jsx(TabPanel, { value: activeTab, index: TABS_INDEX.CLONES, children: activeTab === TABS_INDEX.CLONES && (_jsx("div", { className: classes.content, children: !instanceError &&
-                                    (instance ? _jsx(Clones, { onlyRenderList: true }) : _jsx(StubSpinner, {})) })) }), _jsx(TabPanel, { value: activeTab, index: TABS_INDEX.LOGS, children: activeTab === TABS_INDEX.LOGS && (_jsx(Logs, { api: api, instanceId: props.instanceId })) }), _jsx(TabPanel, { value: activeTab, index: TABS_INDEX.CONFIGURATION, children: activeTab === TABS_INDEX.CONFIGURATION && (_jsx(Configuration, { instanceId: instanceId, switchActiveTab: switchTab, isConfigurationActive: isConfigurationActive, reload: () => load(props.instanceId), disableConfigModification: (_c = instance === null || instance === void 0 ? void 0 : instance.state) === null || _c === void 0 ? void 0 : _c.engine.disableConfigModification })) }), _jsx(TabPanel, { value: activeTab, index: TABS_INDEX.SNAPSHOTS, children: activeTab === TABS_INDEX.SNAPSHOTS && (_jsx(Snapshots, { instanceId: instanceId })) }), _jsx(TabPanel, { value: activeTab, index: TABS_INDEX.BRANCHES, children: activeTab === TABS_INDEX.BRANCHES && (_jsx(Branches, { instanceId: instanceId })) })] })) : !isLoadingInstance && !instanceError ? (_jsx(TabPanel, { value: activeTab, index: activeTab, children: _jsx(InactiveInstance, { instance: instance, org: (_d = props.elements.breadcrumbs) === null || _d === void 0 ? void 0 : _d.props.org }) })) : (!instanceError && (_jsx(TabPanel, { value: activeTab, index: activeTab, children: _jsx("div", { className: classes.content, children: _jsx(StubSpinner, {}) }) })))] }) }));
+                                    (instance ? _jsx(Clones, { onlyRenderList: true }) : _jsx(StubSpinner, {})) })) }), _jsx(TabPanel, { value: activeTab, index: TABS_INDEX.LOGS, children: activeTab === TABS_INDEX.LOGS && (_jsx(Logs, { api: api, instanceId: props.instanceId })) }), _jsx(TabPanel, { value: activeTab, index: TABS_INDEX.CONFIGURATION, children: activeTab === TABS_INDEX.CONFIGURATION && (_jsx(Configuration, { instanceId: instanceId, switchActiveTab: switchTab, isConfigurationActive: isConfigurationActive, reload: () => load(props.instanceId), disableConfigModification: (_c = instance === null || instance === void 0 ? void 0 : instance.state) === null || _c === void 0 ? void 0 : _c.engine.disableConfigModification })) }), _jsx(TabPanel, { value: activeTab, index: TABS_INDEX.SNAPSHOTS, children: activeTab === TABS_INDEX.SNAPSHOTS && (_jsx(Snapshots, { instanceId: instanceId })) }), _jsx(TabPanel, { value: activeTab, index: TABS_INDEX.BRANCHES, children: activeTab === TABS_INDEX.BRANCHES && (_jsx(Branches, { instanceId: instanceId })) })] })) : !isLoadingInstance && !isLoadingInstanceRetrieval && !instanceError ? (_jsx(TabPanel, { value: activeTab, index: activeTab, children: _jsx(InactiveInstance, { instance: instance, org: (_d = props.elements.breadcrumbs) === null || _d === void 0 ? void 0 : _d.props.org }) })) : (!instanceError && (_jsx(TabPanel, { value: activeTab, index: activeTab, children: _jsx("div", { className: classes.content, children: _jsx(StubSpinner, {}) }) })))] }) }));
 });
 function TabPanel(props) {
     const { children, value, index, ...other } = props;

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

@@ -72,6 +72,7 @@ export declare class MainStore {
     isBranchesLoading: boolean;
     isConfigLoading: boolean;
     isLoadingInstance: boolean;
+    isLoadingInstanceRetrieval: boolean;
     private readonly api;
     constructor(api: Api);
     get isDisabledInstance(): boolean;

package/pages/Instance/stores/Main.js

@@ -27,9 +27,12 @@ export class MainStore {
         this.isBranchesLoading = false;
         this.isConfigLoading = false;
         this.isLoadingInstance = false;
+        this.isLoadingInstanceRetrieval = false;
         this.load = (instanceId, isPlatform = false) => {
             this.instance = null;
+            this.instanceRetrieval = null;
             this.isReloadingInstance = true;
+            this.isLoadingInstanceRetrieval = true;
             if (!isPlatform) {
                 this.getBranches(instanceId);
             }
@@ -58,7 +61,9 @@ export class MainStore {
         };
         this.reload = (instanceId) => {
             this.instance = null;
+            this.instanceRetrieval = null;
             this.isReloadingInstance = true;
+            this.isLoadingInstanceRetrieval = true;
             this.loadInstance(instanceId, false).then(() => {
                 var _a, _b, _c;
                 if (this.api.refreshInstance)
@@ -88,11 +93,15 @@ export class MainStore {
             this.isReloadingInstanceRetrieval = false;
         };
         this.loadInstanceRetrieval = async (instanceId) => {
-            if (!this.api.getInstanceRetrieval)
+            if (!this.api.getInstanceRetrieval) {
+                this.isLoadingInstanceRetrieval = false;
                 return;
+            }
+            this.isLoadingInstanceRetrieval = true;
             const { response, error } = await this.api.getInstanceRetrieval({
                 instanceId: instanceId,
             });
+            this.isLoadingInstanceRetrieval = false;
             if (response)
                 this.instanceRetrieval = response;
             if (error)