@vuu-ui/vuu-data-react 0.11.2 → 0.12.0

package/cjs/data-editing/EditForm.js

@@ -1,21 +1,14 @@
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');
-var getDataItemEditControl = require('./get-data-item-edit-control.js');
-require('@vuu-ui/vuu-utils');
+var core = require('@salt-ds/core');
 var styles = require('@salt-ds/styles');
 var window = require('@salt-ds/window');
-var useEditForm = require('./useEditForm.js');
-require('@vuu-ui/vuu-data-remote');
-require('react');
-require('@vuu-ui/vuu-layout');
-require('@vuu-ui/vuu-popups');
-require('@vuu-ui/vuu-table');
-var core = require('@salt-ds/core');
 var cx = require('clsx');
-require('@vuu-ui/vuu-ui-controls');
 var editValidationRules = require('./edit-validation-rules.js');
+var useEditForm = require('./useEditForm.js');
 var EditForm$1 = require('./EditForm.css.js');
+var getDataItemEditControl = require('./get-data-item-edit-control.js');
 
 const classBase = "EditForm";
 editValidationRules.registerRules();

package/cjs/data-editing/EditForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"EditForm.js","sources":["../../src/data-editing/EditForm.tsx"],"sourcesContent":["import { getDataItemEditControl } from \"@vuu-ui/vuu-data-react\";\nimport { Button, FormField, FormFieldLabel } from \"@salt-ds/core\";\nimport { useComponentCssInjection } from \"@salt-ds/styles\";\nimport { useWindow } from \"@salt-ds/window\";\nimport cx from \"clsx\";\nimport { HTMLAttributes } from \"react\";\nimport { registerRules } from \"./edit-validation-rules\";\nimport { EditFormHookProps, useEditForm } from \"./useEditForm\";\n\nimport editFormCss from \"./EditForm.css\";\n\nconst classBase = \"EditForm\";\n\nregisterRules();\n\nexport interface EditFormProps\n  extends EditFormHookProps,\n    Omit<HTMLAttributes<HTMLDivElement>, \"onSubmit\"> {}\n\nexport const EditForm = ({\n  className,\n  dataSource,\n  formFieldDescriptors,\n  onSubmit: onSubmitProp,\n  ...htmlAttributes\n}: EditFormProps) => {\n  const targetWindow = useWindow();\n  useComponentCssInjection({\n    testId: \"vuu-edit-form\",\n    css: editFormCss,\n    window: targetWindow,\n  });\n\n  const {\n    editedFields,\n    editEntity,\n    errorMessages,\n    formFieldsContainerRef,\n    isClean,\n    ok,\n    onCancel,\n    onChange,\n    onCommit,\n    onFocus,\n    onSubmit,\n  } = useEditForm({\n    dataSource,\n    formFieldDescriptors,\n    onSubmit: onSubmitProp,\n  });\n\n  return (\n    <div\n      {...htmlAttributes}\n      className={cx(classBase, className)}\n      onFocus={onFocus}\n    >\n      <div className={`${classBase}-form-fields`} ref={formFieldsContainerRef}>\n        {formFieldDescriptors.map((dataDescriptor) => {\n          const { name, label = name } = dataDescriptor;\n          const errorMessage = errorMessages[name];\n          const isEdited = !isClean && editedFields.includes(name);\n\n          return (\n            <div\n              className={`${classBase}-field`}\n              key={name}\n              data-edited={isEdited}\n            >\n              <FormField data-field={name}>\n                <FormFieldLabel>{label}</FormFieldLabel>\n                {getDataItemEditControl({\n                  InputProps: {\n                    onChange,\n                    value: editEntity?.[name]?.toString() ?? \"\",\n                  },\n                  dataDescriptor,\n                  errorMessage,\n                  onCommit,\n                })}\n              </FormField>\n              <div className={`${classBase}-edit-indicator`} />\n            </div>\n          );\n        })}\n      </div>\n      <div className={`${classBase}-buttons`}>\n        <Button disabled={isClean} onClick={onCancel}>\n          Cancel\n        </Button>\n        <Button onClick={onSubmit} disabled={!ok || isClean}>\n          Save\n        </Button>\n      </div>\n    </div>\n  );\n};\n"],"names":["registerRules","useWindow","useComponentCssInjection","editFormCss","useEditForm","jsxs","jsx","FormField","FormFieldLabel","getDataItemEditControl","Button"],"mappings":"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"}
+{"version":3,"file":"EditForm.js","sources":["../../src/data-editing/EditForm.tsx"],"sourcesContent":["import { Button, FormField, FormFieldLabel } from \"@salt-ds/core\";\nimport { useComponentCssInjection } from \"@salt-ds/styles\";\nimport { useWindow } from \"@salt-ds/window\";\nimport cx from \"clsx\";\nimport { HTMLAttributes } from \"react\";\nimport { registerRules } from \"./edit-validation-rules\";\nimport { EditFormHookProps, useEditForm } from \"./useEditForm\";\n\nimport editFormCss from \"./EditForm.css\";\nimport { getDataItemEditControl } from \"./get-data-item-edit-control\";\n\nconst classBase = \"EditForm\";\n\nregisterRules();\n\nexport interface EditFormProps\n  extends EditFormHookProps,\n    Omit<HTMLAttributes<HTMLDivElement>, \"onSubmit\"> {}\n\nexport const EditForm = ({\n  className,\n  dataSource,\n  formFieldDescriptors,\n  onSubmit: onSubmitProp,\n  ...htmlAttributes\n}: EditFormProps) => {\n  const targetWindow = useWindow();\n  useComponentCssInjection({\n    testId: \"vuu-edit-form\",\n    css: editFormCss,\n    window: targetWindow,\n  });\n\n  const {\n    editedFields,\n    editEntity,\n    errorMessages,\n    formFieldsContainerRef,\n    isClean,\n    ok,\n    onCancel,\n    onChange,\n    onCommit,\n    onFocus,\n    onSubmit,\n  } = useEditForm({\n    dataSource,\n    formFieldDescriptors,\n    onSubmit: onSubmitProp,\n  });\n\n  return (\n    <div\n      {...htmlAttributes}\n      className={cx(classBase, className)}\n      onFocus={onFocus}\n    >\n      <div className={`${classBase}-form-fields`} ref={formFieldsContainerRef}>\n        {formFieldDescriptors.map((dataDescriptor) => {\n          const { name, label = name } = dataDescriptor;\n          const errorMessage = errorMessages[name];\n          const isEdited = !isClean && editedFields.includes(name);\n\n          return (\n            <div\n              className={`${classBase}-field`}\n              key={name}\n              data-edited={isEdited}\n            >\n              <FormField data-field={name}>\n                <FormFieldLabel>{label}</FormFieldLabel>\n                {getDataItemEditControl({\n                  InputProps: {\n                    onChange,\n                    value: editEntity?.[name]?.toString() ?? \"\",\n                  },\n                  dataDescriptor,\n                  errorMessage,\n                  onCommit,\n                })}\n              </FormField>\n              <div className={`${classBase}-edit-indicator`} />\n            </div>\n          );\n        })}\n      </div>\n      <div className={`${classBase}-buttons`}>\n        <Button disabled={isClean} onClick={onCancel}>\n          Cancel\n        </Button>\n        <Button onClick={onSubmit} disabled={!ok || isClean}>\n          Save\n        </Button>\n      </div>\n    </div>\n  );\n};\n"],"names":["registerRules","useWindow","useComponentCssInjection","editFormCss","useEditForm","jsxs","jsx","FormField","FormFieldLabel","getDataItemEditControl","Button"],"mappings":";;;;;;;;;;;;AAWA,MAAM,SAAY,GAAA,UAAA;AAElBA,iCAAc,EAAA;AAMP,MAAM,WAAW,CAAC;AAAA,EACvB,SAAA;AAAA,EACA,UAAA;AAAA,EACA,oBAAA;AAAA,EACA,QAAU,EAAA,YAAA;AAAA,EACV,GAAG;AACL,CAAqB,KAAA;AACnB,EAAA,MAAM,eAAeC,gBAAU,EAAA;AAC/B,EAAyBC,+BAAA,CAAA;AAAA,IACvB,MAAQ,EAAA,eAAA;AAAA,IACR,GAAK,EAAAC,UAAA;AAAA,IACL,MAAQ,EAAA;AAAA,GACT,CAAA;AAED,EAAM,MAAA;AAAA,IACJ,YAAA;AAAA,IACA,UAAA;AAAA,IACA,aAAA;AAAA,IACA,sBAAA;AAAA,IACA,OAAA;AAAA,IACA,EAAA;AAAA,IACA,QAAA;AAAA,IACA,QAAA;AAAA,IACA,QAAA;AAAA,IACA,OAAA;AAAA,IACA;AAAA,MACEC,uBAAY,CAAA;AAAA,IACd,UAAA;AAAA,IACA,oBAAA;AAAA,IACA,QAAU,EAAA;AAAA,GACX,CAAA;AAED,EACE,uBAAAC,eAAA;AAAA,IAAC,KAAA;AAAA,IAAA;AAAA,MACE,GAAG,cAAA;AAAA,MACJ,SAAA,EAAW,EAAG,CAAA,SAAA,EAAW,SAAS,CAAA;AAAA,MAClC,OAAA;AAAA,MAEA,QAAA,EAAA;AAAA,wBAACC,cAAA,CAAA,KAAA,EAAA,EAAI,SAAW,EAAA,CAAA,EAAG,SAAS,CAAA,YAAA,CAAA,EAAgB,KAAK,sBAC9C,EAAA,QAAA,EAAA,oBAAA,CAAqB,GAAI,CAAA,CAAC,cAAmB,KAAA;AAC5C,UAAA,MAAM,EAAE,IAAA,EAAM,KAAQ,GAAA,IAAA,EAAS,GAAA,cAAA;AAC/B,UAAM,MAAA,YAAA,GAAe,cAAc,IAAI,CAAA;AACvC,UAAA,MAAM,QAAW,GAAA,CAAC,OAAW,IAAA,YAAA,CAAa,SAAS,IAAI,CAAA;AAEvD,UACE,uBAAAD,eAAA;AAAA,YAAC,KAAA;AAAA,YAAA;AAAA,cACC,SAAA,EAAW,GAAG,SAAS,CAAA,MAAA,CAAA;AAAA,cAEvB,aAAa,EAAA,QAAA;AAAA,cAEb,QAAA,EAAA;AAAA,gCAACA,eAAA,CAAAE,cAAA,EAAA,EAAU,cAAY,IACrB,EAAA,QAAA,EAAA;AAAA,kCAAAD,cAAA,CAACE,uBAAgB,QAAM,EAAA,KAAA,EAAA,CAAA;AAAA,kBACtBC,6CAAuB,CAAA;AAAA,oBACtB,UAAY,EAAA;AAAA,sBACV,QAAA;AAAA,sBACA,KAAO,EAAA,UAAA,GAAa,IAAI,CAAA,EAAG,UAAc,IAAA;AAAA,qBAC3C;AAAA,oBACA,cAAA;AAAA,oBACA,YAAA;AAAA,oBACA;AAAA,mBACD;AAAA,iBACH,EAAA,CAAA;AAAA,gCACCH,cAAA,CAAA,KAAA,EAAA,EAAI,SAAW,EAAA,CAAA,EAAG,SAAS,CAAmB,eAAA,CAAA,EAAA;AAAA;AAAA,aAAA;AAAA,YAf1C;AAAA,WAgBP;AAAA,SAEH,CACH,EAAA,CAAA;AAAA,wBACCD,eAAA,CAAA,KAAA,EAAA,EAAI,SAAW,EAAA,CAAA,EAAG,SAAS,CAC1B,QAAA,CAAA,EAAA,QAAA,EAAA;AAAA,0BAAAC,cAAA,CAACI,WAAO,EAAA,EAAA,QAAA,EAAU,OAAS,EAAA,OAAA,EAAS,UAAU,QAE9C,EAAA,QAAA,EAAA,CAAA;AAAA,0BACAJ,cAAA,CAACI,eAAO,OAAS,EAAA,QAAA,EAAU,UAAU,CAAC,EAAA,IAAM,SAAS,QAErD,EAAA,MAAA,EAAA;AAAA,SACF,EAAA;AAAA;AAAA;AAAA,GACF;AAEJ;;;;"}

package/cjs/data-editing/edit-validation-rules.js.map

@@ -1 +1 @@
-{"version":3,"file":"edit-validation-rules.js","sources":["../../src/data-editing/edit-validation-rules.ts"],"sourcesContent":["import { registerComponent } from \"@vuu-ui/vuu-utils\";\nimport { VuuRowDataItemType } from \"@vuu-ui/vuu-protocol-types\";\nimport { EditRuleValidator } from \"@vuu-ui/vuu-data-types\";\nimport { OK } from \"./edit-rule-validation-checker\";\n\nconst isString = (value?: VuuRowDataItemType): value is string =>\n  typeof value === \"string\";\n\nconst NUMERIC = /^(?:[0-9]|\\.)+$/;\n\nconst CharValidatorNumeric: EditRuleValidator = (rule, value) => {\n  if (isString(value)) {\n    if (value.trim() === \"\") {\n      return OK;\n    } else if (value.match(NUMERIC)) {\n      return OK;\n    }\n  }\n  return { ok: false, message: \"only numeric characters are permitted\" };\n};\n\nconst ValueValidatorInteger: EditRuleValidator = (rule, value) => {\n  if (isString(value)) {\n    if (value.trim() === \"\") {\n      return OK;\n    } else {\n      if (!value.match(NUMERIC)) {\n        return {\n          ok: false,\n          message: \"value must be an integer, invalid character\",\n        };\n      }\n      if (parseFloat(value) === parseInt(value)) {\n        return OK;\n      }\n    }\n  }\n  return { ok: false, message: \"must be an integer value\" };\n};\n\nexport const registerRules = () => {\n  registerComponent(\n    \"char-numeric\",\n    CharValidatorNumeric,\n    \"data-edit-validator\",\n    {},\n  );\n  registerComponent(\n    \"value-integer\",\n    ValueValidatorInteger,\n    \"data-edit-validator\",\n    {},\n  );\n};\n"],"names":["OK","registerComponent"],"mappings":";;;;;AAKA,MAAM,QAAW,GAAA,CAAC,KAChB,KAAA,OAAO,KAAU,KAAA,QAAA;AAEnB,MAAM,OAAU,GAAA,iBAAA;AAEhB,MAAM,oBAAA,GAA0C,CAAC,IAAA,EAAM,KAAU,KAAA;AAC/D,EAAI,IAAA,QAAA,CAAS,KAAK,CAAG,EAAA;AACnB,IAAI,IAAA,KAAA,CAAM,IAAK,EAAA,KAAM,EAAI,EAAA;AACvB,MAAO,OAAAA,4BAAA;AAAA,KACE,MAAA,IAAA,KAAA,CAAM,KAAM,CAAA,OAAO,CAAG,EAAA;AAC/B,MAAO,OAAAA,4BAAA;AAAA;AACT;AAEF,EAAA,OAAO,EAAE,EAAA,EAAI,KAAO,EAAA,OAAA,EAAS,uCAAwC,EAAA;AACvE,CAAA;AAEA,MAAM,qBAAA,GAA2C,CAAC,IAAA,EAAM,KAAU,KAAA;AAChE,EAAI,IAAA,QAAA,CAAS,KAAK,CAAG,EAAA;AACnB,IAAI,IAAA,KAAA,CAAM,IAAK,EAAA,KAAM,EAAI,EAAA;AACvB,MAAO,OAAAA,4BAAA;AAAA,KACF,MAAA;AACL,MAAA,IAAI,CAAC,KAAA,CAAM,KAAM,CAAA,OAAO,CAAG,EAAA;AACzB,QAAO,OAAA;AAAA,UACL,EAAI,EAAA,KAAA;AAAA,UACJ,OAAS,EAAA;AAAA,SACX;AAAA;AAEF,MAAA,IAAI,UAAW,CAAA,KAAK,CAAM,KAAA,QAAA,CAAS,KAAK,CAAG,EAAA;AACzC,QAAO,OAAAA,4BAAA;AAAA;AACT;AACF;AAEF,EAAA,OAAO,EAAE,EAAA,EAAI,KAAO,EAAA,OAAA,EAAS,0BAA2B,EAAA;AAC1D,CAAA;AAEO,MAAM,gBAAgB,MAAM;AACjC,EAAAC,0BAAA;AAAA,IACE,cAAA;AAAA,IACA,oBAAA;AAAA,IACA,qBAAA;AAAA,IACA;AAAC,GACH;AACA,EAAAA,0BAAA;AAAA,IACE,eAAA;AAAA,IACA,qBAAA;AAAA,IACA,qBAAA;AAAA,IACA;AAAC,GACH;AACF;;;;"}
+{"version":3,"file":"edit-validation-rules.js","sources":["../../src/data-editing/edit-validation-rules.ts"],"sourcesContent":["import type { EditRuleValidator } from \"@vuu-ui/vuu-data-types\";\nimport type { VuuRowDataItemType } from \"@vuu-ui/vuu-protocol-types\";\nimport { registerComponent } from \"@vuu-ui/vuu-utils\";\nimport { OK } from \"./edit-rule-validation-checker\";\n\nconst isString = (value?: VuuRowDataItemType): value is string =>\n  typeof value === \"string\";\n\nconst NUMERIC = /^(?:[0-9]|\\.)+$/;\n\nconst CharValidatorNumeric: EditRuleValidator = (rule, value) => {\n  if (isString(value)) {\n    if (value.trim() === \"\") {\n      return OK;\n    } else if (value.match(NUMERIC)) {\n      return OK;\n    }\n  }\n  return { ok: false, message: \"only numeric characters are permitted\" };\n};\n\nconst ValueValidatorInteger: EditRuleValidator = (rule, value) => {\n  if (isString(value)) {\n    if (value.trim() === \"\") {\n      return OK;\n    } else {\n      if (!value.match(NUMERIC)) {\n        return {\n          ok: false,\n          message: \"value must be an integer, invalid character\",\n        };\n      }\n      if (parseFloat(value) === parseInt(value)) {\n        return OK;\n      }\n    }\n  }\n  return { ok: false, message: \"must be an integer value\" };\n};\n\nexport const registerRules = () => {\n  registerComponent(\n    \"char-numeric\",\n    CharValidatorNumeric,\n    \"data-edit-validator\",\n    {},\n  );\n  registerComponent(\n    \"value-integer\",\n    ValueValidatorInteger,\n    \"data-edit-validator\",\n    {},\n  );\n};\n"],"names":["OK","registerComponent"],"mappings":";;;;;AAKA,MAAM,QAAW,GAAA,CAAC,KAChB,KAAA,OAAO,KAAU,KAAA,QAAA;AAEnB,MAAM,OAAU,GAAA,iBAAA;AAEhB,MAAM,oBAAA,GAA0C,CAAC,IAAA,EAAM,KAAU,KAAA;AAC/D,EAAI,IAAA,QAAA,CAAS,KAAK,CAAG,EAAA;AACnB,IAAI,IAAA,KAAA,CAAM,IAAK,EAAA,KAAM,EAAI,EAAA;AACvB,MAAO,OAAAA,4BAAA;AAAA,KACE,MAAA,IAAA,KAAA,CAAM,KAAM,CAAA,OAAO,CAAG,EAAA;AAC/B,MAAO,OAAAA,4BAAA;AAAA;AACT;AAEF,EAAA,OAAO,EAAE,EAAA,EAAI,KAAO,EAAA,OAAA,EAAS,uCAAwC,EAAA;AACvE,CAAA;AAEA,MAAM,qBAAA,GAA2C,CAAC,IAAA,EAAM,KAAU,KAAA;AAChE,EAAI,IAAA,QAAA,CAAS,KAAK,CAAG,EAAA;AACnB,IAAI,IAAA,KAAA,CAAM,IAAK,EAAA,KAAM,EAAI,EAAA;AACvB,MAAO,OAAAA,4BAAA;AAAA,KACF,MAAA;AACL,MAAA,IAAI,CAAC,KAAA,CAAM,KAAM,CAAA,OAAO,CAAG,EAAA;AACzB,QAAO,OAAA;AAAA,UACL,EAAI,EAAA,KAAA;AAAA,UACJ,OAAS,EAAA;AAAA,SACX;AAAA;AAEF,MAAA,IAAI,UAAW,CAAA,KAAK,CAAM,KAAA,QAAA,CAAS,KAAK,CAAG,EAAA;AACzC,QAAO,OAAAA,4BAAA;AAAA;AACT;AACF;AAEF,EAAA,OAAO,EAAE,EAAA,EAAI,KAAO,EAAA,OAAA,EAAS,0BAA2B,EAAA;AAC1D,CAAA;AAEO,MAAM,gBAAgB,MAAM;AACjC,EAAAC,0BAAA;AAAA,IACE,cAAA;AAAA,IACA,oBAAA;AAAA,IACA,qBAAA;AAAA,IACA;AAAC,GACH;AACA,EAAAA,0BAAA;AAAA,IACE,eAAA;AAAA,IACA,qBAAA;AAAA,IACA,qBAAA;AAAA,IACA;AAAC,GACH;AACF;;;;"}

package/cjs/data-editing/useEditForm.js

@@ -141,7 +141,7 @@ const useEditForm = ({
       currentDataSource.current = dataSource;
       originalEntityRef.current = void 0;
       const columnMap = vuuUtils.buildColumnMap(dataSource.columns);
-      dataSource?.subscribe({ range: { from: 0, to: 1 } }, (message) => {
+      dataSource?.subscribe({ range: vuuUtils.Range(0, 1) }, (message) => {
         if (vuuUtils.messageHasDataRows(message)) {
           const [row] = message.rows;
           if (row) {

package/cjs/data-editing/useEditForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEditForm.js","sources":["../../src/data-editing/useEditForm.tsx"],"sourcesContent":["import type { DataSource, DataValueDescriptor } from \"@vuu-ui/vuu-data-types\";\nimport { useDialogContext } from \"@vuu-ui/vuu-popups\";\nimport type { VuuRowDataItemType } from \"@vuu-ui/vuu-protocol-types\";\nimport {\n  CommitHandler,\n  Entity,\n  buildColumnMap,\n  dataSourceRowToEntity,\n  messageHasDataRows,\n  queryClosest,\n  viewportRpcRequest,\n} from \"@vuu-ui/vuu-utils\";\nimport { Button } from \"@salt-ds/core\";\nimport {\n  FocusEventHandler,\n  SyntheticEvent,\n  useCallback,\n  useMemo,\n  useRef,\n  useState,\n} from \"react\";\nimport { UnsavedChangesReport } from \"./UnsavedChangesReport\";\nimport {\n  buildValidationChecker,\n  getEditValidationRules,\n} from \"./edit-rule-validation-checker\";\nimport {\n  CLEAN_FORM,\n  FormEditState,\n  buildFormEditState,\n} from \"./form-edit-state\";\n\nexport interface EditFormHookProps {\n  dataSource?: DataSource;\n  formFieldDescriptors: DataValueDescriptor[];\n  onSubmit?: () => void;\n}\n\ntype ValidationState = {\n  ok: boolean;\n  messages: Record<string, string>;\n};\n\nconst CLEAN_VALIDATION: ValidationState = {\n  ok: true,\n  messages: {},\n};\n\nconst getValidationChecker = (\n  descriptor: DataValueDescriptor,\n  editPhase: \"change\" | \"commit\",\n) => {\n  const rules = getEditValidationRules(descriptor, editPhase) ?? [];\n  return buildValidationChecker(rules);\n};\n\nconst nextValidationState = (\n  state: ValidationState,\n  dataDescriptor: DataValueDescriptor,\n  value: VuuRowDataItemType,\n): ValidationState => {\n  const check = getValidationChecker(dataDescriptor, \"change\");\n  const result = check(value, \"change\");\n  const { name } = dataDescriptor;\n\n  const { ok: wasOk, messages: existingMessages } = state;\n\n  if (result.ok) {\n    if (!wasOk) {\n      // if this field was the only one in error, the overall state\n      // will now be ok, but not if there is still one or more other\n      // field still in error.\n      const fieldsInError = Object.keys(existingMessages);\n      if (fieldsInError.includes(name)) {\n        if (fieldsInError.length === 1) {\n          return { ok: true, messages: {} };\n        } else {\n          const messages = { ...existingMessages };\n          delete messages[name];\n          return { ok: false, messages };\n        }\n      }\n    }\n  } else {\n    return {\n      ok: false,\n      messages: {\n        ...existingMessages,\n        [name]: result.messages.join(\"\\n\"),\n      },\n    };\n  }\n\n  return state;\n};\n\nfunction find(descriptors: DataValueDescriptor[], fieldname: string) {\n  const d = descriptors.find(({ name }) => name === fieldname);\n  if (d) {\n    return d;\n  }\n  throw Error(`DataValueDescriptor not found for field ${fieldname}`);\n}\n\nconst getField = (target: EventTarget | HTMLElement) => {\n  const fieldElement = queryClosest(target, \"[data-field]\");\n  if (fieldElement) {\n    return fieldElement.dataset.field as string;\n  } else {\n    throw Error(\"no field \");\n  }\n};\n\ntype Resolver = (value: unknown) => void;\n\nexport const useEditForm = ({\n  dataSource,\n  formFieldDescriptors,\n  onSubmit,\n}: EditFormHookProps) => {\n  const { showDialog, closeDialog } = useDialogContext();\n\n  const currentDataSource = useRef<DataSource>();\n  const formFieldsContainerRef = useRef<HTMLDivElement>(null);\n  const entityRef = useRef<Entity>();\n  const focusedFieldRef = useRef(\"\");\n  const originalEntityRef = useRef<Entity>();\n  const formEditStateRef = useRef<FormEditState>(CLEAN_FORM);\n  const validationStateRef = useRef<ValidationState>({\n    ok: true,\n    messages: {},\n  });\n\n  const [entity, _setEntity] = useState<Entity>();\n  const [, forceUpdate] = useState({});\n\n  const setFormEditState = useCallback((newState: FormEditState) => {\n    formEditStateRef.current = newState;\n  }, []);\n\n  const setEntity = useCallback(\n    (newEntity: Entity) => {\n      setFormEditState(\n        buildFormEditState(originalEntityRef.current, newEntity),\n      );\n      entityRef.current = newEntity;\n      _setEntity(newEntity);\n    },\n    [setFormEditState],\n  );\n\n  const submitChanges = useCallback(async () => {\n    const rpcResponse = await currentDataSource.current?.rpcCall?.(\n      viewportRpcRequest(\"VP_BULK_EDIT_SUBMIT_RPC\"),\n    );\n    console.log({ rpcResponse });\n  }, []);\n\n  const showSaveOrDiscardPrompt = useCallback(async () => {\n    const { current: currentEntity } = entityRef;\n    const { current: originalEntity } = originalEntityRef;\n    let resolver: Resolver | undefined = undefined;\n    const save = async () => {\n      await submitChanges();\n      closeDialog();\n      resolver?.(\"saved\");\n    };\n\n    const discard = () => {\n      closeDialog();\n      resolver?.(\"discarded\");\n    };\n\n    requestAnimationFrame(() => {\n      showDialog(\n        <UnsavedChangesReport\n          entity={originalEntity as Entity}\n          editedEntity={currentEntity as Entity}\n        />,\n        \"Unsaved Changes\",\n        [\n          <Button key=\"cancel\" onClick={discard}>\n            Discard Changes\n          </Button>,\n          <Button key=\"submit\" onClick={save}>\n            Save Changes\n          </Button>,\n        ],\n        true, // hideCloseButton\n      );\n    });\n\n    return new Promise((resolve) => {\n      resolver = resolve;\n    });\n  }, [closeDialog, showDialog, submitChanges]);\n\n  useMemo(async () => {\n    if (dataSource) {\n      if (formEditStateRef.current.isClean === false) {\n        await showSaveOrDiscardPrompt();\n      }\n\n      currentDataSource.current = dataSource;\n\n      originalEntityRef.current = undefined;\n\n      const columnMap = buildColumnMap(dataSource.columns);\n\n      dataSource?.subscribe({ range: { from: 0, to: 1 } }, (message) => {\n        if (messageHasDataRows(message)) {\n          const [row] = message.rows;\n          if (row) {\n            const entity = dataSourceRowToEntity(row, columnMap);\n            if (originalEntityRef.current === undefined) {\n              originalEntityRef.current = entity;\n              setEntity(entity);\n            }\n\n            const { editedFields } = buildFormEditState(\n              entityRef.current,\n              entity,\n            );\n\n            // for controls which do not yield incremental changes, e.g dropdown, calendar\n            // we apply the server update to our entity.\n            if (editedFields.length === 1) {\n              setEntity(entity);\n            }\n\n            // Do not overwrite entity here, just check that values returned by server\n            // match whats expected\n          }\n        }\n      });\n    }\n  }, [dataSource, setEntity, showSaveOrDiscardPrompt]);\n\n  const setValidationState = useCallback((state: ValidationState) => {\n    validationStateRef.current = state;\n    forceUpdate({});\n  }, []);\n\n  const handleFieldCommit = useCallback<CommitHandler<HTMLElement>>(\n    (_, value) => {\n      const { current: fieldName } = focusedFieldRef;\n      const dataDescriptor = find(formFieldDescriptors, fieldName);\n\n      const { current: state } = validationStateRef;\n      const newState = nextValidationState(state, dataDescriptor, value);\n      if (newState !== state) {\n        setValidationState(newState);\n      }\n\n      if (newState.ok && dataSource?.tableSchema) {\n        const { key } = dataSource.tableSchema;\n        const keyValue = entity?.[key] as string;\n        dataSource\n          ?.applyEdit(keyValue, fieldName, value)\n          .then((rpcResponse) => {\n            console.log({ rpcResponse });\n          });\n      }\n    },\n    [dataSource, entity, formFieldDescriptors, setValidationState],\n  );\n\n  const handleFieldChange = useCallback(\n    (evt: SyntheticEvent<HTMLInputElement>) => {\n      const { current: fieldName } = focusedFieldRef;\n      if (fieldName) {\n        const input = queryClosest<HTMLInputElement>(evt.target, \"input\", true);\n        const dataDescriptor = find(formFieldDescriptors, fieldName);\n        const value = input.value as string;\n        const { current: state } = validationStateRef;\n        const newState = nextValidationState(state, dataDescriptor, value);\n        if (newState !== state) {\n          setValidationState(newState);\n        }\n\n        setEntity({ ...entity, [fieldName]: value });\n      }\n    },\n    [entity, formFieldDescriptors, setEntity, setValidationState],\n  );\n\n  const handleFormSubmit = useCallback(async () => {\n    submitChanges();\n    setFormEditState(CLEAN_FORM);\n    originalEntityRef.current = entity;\n    onSubmit?.();\n    forceUpdate({});\n  }, [entity, onSubmit, setFormEditState, submitChanges]);\n\n  const handleFormCancel = useCallback(async () => {\n    // const rpcResponse = await dataSource?.rpcCall?.(\n    //   viewportRpcRequest(\"VP_BULK_EDIT_CANCEL_RPC\"),\n    // );\n    setFormEditState(CLEAN_FORM);\n    setValidationState(CLEAN_VALIDATION);\n    // console.log({ rpcResponse });\n    setEntity(originalEntityRef.current as Entity);\n  }, [setEntity, setFormEditState, setValidationState]);\n\n  const handleFocus = useCallback<FocusEventHandler>((evt) => {\n    // Ignore focus on popup Calendars, Lists etc\n    if (formFieldsContainerRef.current?.contains(evt.target)) {\n      const fieldName = getField(evt.target);\n      if (fieldName) {\n        if (fieldName) {\n          focusedFieldRef.current = fieldName;\n        }\n      }\n    }\n  }, []);\n\n  const {\n    current: { ok, messages: errorMessages },\n  } = validationStateRef;\n\n  const {\n    current: { isClean, editedFields },\n  } = formEditStateRef;\n\n  return {\n    editedFields,\n    editEntity: entity,\n    errorMessages,\n    formFieldsContainerRef,\n    isClean,\n    ok,\n    onCancel: handleFormCancel,\n    onChange: handleFieldChange,\n    onCommit: handleFieldCommit,\n    onFocus: handleFocus,\n    onSubmit: handleFormSubmit,\n  };\n};\n"],"names":["getEditValidationRules","buildValidationChecker","queryClosest","useDialogContext","useRef","CLEAN_FORM","useState","useCallback","buildFormEditState","viewportRpcRequest","jsx","UnsavedChangesReport","Button","useMemo","buildColumnMap","messageHasDataRows","entity","dataSourceRowToEntity","editedFields"],"mappings":"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"}
+{"version":3,"file":"useEditForm.js","sources":["../../src/data-editing/useEditForm.tsx"],"sourcesContent":["import type { DataSource, DataValueDescriptor } from \"@vuu-ui/vuu-data-types\";\nimport { useDialogContext } from \"@vuu-ui/vuu-popups\";\nimport type { VuuRowDataItemType } from \"@vuu-ui/vuu-protocol-types\";\nimport {\n  CommitHandler,\n  Entity,\n  Range,\n  buildColumnMap,\n  dataSourceRowToEntity,\n  messageHasDataRows,\n  queryClosest,\n  viewportRpcRequest,\n} from \"@vuu-ui/vuu-utils\";\nimport { Button } from \"@salt-ds/core\";\nimport {\n  FocusEventHandler,\n  SyntheticEvent,\n  useCallback,\n  useMemo,\n  useRef,\n  useState,\n} from \"react\";\nimport { UnsavedChangesReport } from \"./UnsavedChangesReport\";\nimport {\n  buildValidationChecker,\n  getEditValidationRules,\n} from \"./edit-rule-validation-checker\";\nimport {\n  CLEAN_FORM,\n  FormEditState,\n  buildFormEditState,\n} from \"./form-edit-state\";\n\nexport interface EditFormHookProps {\n  dataSource?: DataSource;\n  formFieldDescriptors: DataValueDescriptor[];\n  onSubmit?: () => void;\n}\n\ntype ValidationState = {\n  ok: boolean;\n  messages: Record<string, string>;\n};\n\nconst CLEAN_VALIDATION: ValidationState = {\n  ok: true,\n  messages: {},\n};\n\nconst getValidationChecker = (\n  descriptor: DataValueDescriptor,\n  editPhase: \"change\" | \"commit\",\n) => {\n  const rules = getEditValidationRules(descriptor, editPhase) ?? [];\n  return buildValidationChecker(rules);\n};\n\nconst nextValidationState = (\n  state: ValidationState,\n  dataDescriptor: DataValueDescriptor,\n  value: VuuRowDataItemType,\n): ValidationState => {\n  const check = getValidationChecker(dataDescriptor, \"change\");\n  const result = check(value, \"change\");\n  const { name } = dataDescriptor;\n\n  const { ok: wasOk, messages: existingMessages } = state;\n\n  if (result.ok) {\n    if (!wasOk) {\n      // if this field was the only one in error, the overall state\n      // will now be ok, but not if there is still one or more other\n      // field still in error.\n      const fieldsInError = Object.keys(existingMessages);\n      if (fieldsInError.includes(name)) {\n        if (fieldsInError.length === 1) {\n          return { ok: true, messages: {} };\n        } else {\n          const messages = { ...existingMessages };\n          delete messages[name];\n          return { ok: false, messages };\n        }\n      }\n    }\n  } else {\n    return {\n      ok: false,\n      messages: {\n        ...existingMessages,\n        [name]: result.messages.join(\"\\n\"),\n      },\n    };\n  }\n\n  return state;\n};\n\nfunction find(descriptors: DataValueDescriptor[], fieldname: string) {\n  const d = descriptors.find(({ name }) => name === fieldname);\n  if (d) {\n    return d;\n  }\n  throw Error(`DataValueDescriptor not found for field ${fieldname}`);\n}\n\nconst getField = (target: EventTarget | HTMLElement) => {\n  const fieldElement = queryClosest(target, \"[data-field]\");\n  if (fieldElement) {\n    return fieldElement.dataset.field as string;\n  } else {\n    throw Error(\"no field \");\n  }\n};\n\ntype Resolver = (value: unknown) => void;\n\nexport const useEditForm = ({\n  dataSource,\n  formFieldDescriptors,\n  onSubmit,\n}: EditFormHookProps) => {\n  const { showDialog, closeDialog } = useDialogContext();\n\n  const currentDataSource = useRef<DataSource>();\n  const formFieldsContainerRef = useRef<HTMLDivElement>(null);\n  const entityRef = useRef<Entity>();\n  const focusedFieldRef = useRef(\"\");\n  const originalEntityRef = useRef<Entity>();\n  const formEditStateRef = useRef<FormEditState>(CLEAN_FORM);\n  const validationStateRef = useRef<ValidationState>({\n    ok: true,\n    messages: {},\n  });\n\n  const [entity, _setEntity] = useState<Entity>();\n  const [, forceUpdate] = useState({});\n\n  const setFormEditState = useCallback((newState: FormEditState) => {\n    formEditStateRef.current = newState;\n  }, []);\n\n  const setEntity = useCallback(\n    (newEntity: Entity) => {\n      setFormEditState(\n        buildFormEditState(originalEntityRef.current, newEntity),\n      );\n      entityRef.current = newEntity;\n      _setEntity(newEntity);\n    },\n    [setFormEditState],\n  );\n\n  const submitChanges = useCallback(async () => {\n    const rpcResponse = await currentDataSource.current?.rpcCall?.(\n      viewportRpcRequest(\"VP_BULK_EDIT_SUBMIT_RPC\"),\n    );\n    console.log({ rpcResponse });\n  }, []);\n\n  const showSaveOrDiscardPrompt = useCallback(async () => {\n    const { current: currentEntity } = entityRef;\n    const { current: originalEntity } = originalEntityRef;\n    let resolver: Resolver | undefined = undefined;\n    const save = async () => {\n      await submitChanges();\n      closeDialog();\n      resolver?.(\"saved\");\n    };\n\n    const discard = () => {\n      closeDialog();\n      resolver?.(\"discarded\");\n    };\n\n    requestAnimationFrame(() => {\n      showDialog(\n        <UnsavedChangesReport\n          entity={originalEntity as Entity}\n          editedEntity={currentEntity as Entity}\n        />,\n        \"Unsaved Changes\",\n        [\n          <Button key=\"cancel\" onClick={discard}>\n            Discard Changes\n          </Button>,\n          <Button key=\"submit\" onClick={save}>\n            Save Changes\n          </Button>,\n        ],\n        true, // hideCloseButton\n      );\n    });\n\n    return new Promise((resolve) => {\n      resolver = resolve;\n    });\n  }, [closeDialog, showDialog, submitChanges]);\n\n  useMemo(async () => {\n    if (dataSource) {\n      if (formEditStateRef.current.isClean === false) {\n        await showSaveOrDiscardPrompt();\n      }\n\n      currentDataSource.current = dataSource;\n\n      originalEntityRef.current = undefined;\n\n      const columnMap = buildColumnMap(dataSource.columns);\n\n      dataSource?.subscribe({ range: Range(0, 1) }, (message) => {\n        if (messageHasDataRows(message)) {\n          const [row] = message.rows;\n          if (row) {\n            const entity = dataSourceRowToEntity(row, columnMap);\n            if (originalEntityRef.current === undefined) {\n              originalEntityRef.current = entity;\n              setEntity(entity);\n            }\n\n            const { editedFields } = buildFormEditState(\n              entityRef.current,\n              entity,\n            );\n\n            // for controls which do not yield incremental changes, e.g dropdown, calendar\n            // we apply the server update to our entity.\n            if (editedFields.length === 1) {\n              setEntity(entity);\n            }\n\n            // Do not overwrite entity here, just check that values returned by server\n            // match whats expected\n          }\n        }\n      });\n    }\n  }, [dataSource, setEntity, showSaveOrDiscardPrompt]);\n\n  const setValidationState = useCallback((state: ValidationState) => {\n    validationStateRef.current = state;\n    forceUpdate({});\n  }, []);\n\n  const handleFieldCommit = useCallback<CommitHandler<HTMLElement>>(\n    (_, value) => {\n      const { current: fieldName } = focusedFieldRef;\n      const dataDescriptor = find(formFieldDescriptors, fieldName);\n\n      const { current: state } = validationStateRef;\n      const newState = nextValidationState(state, dataDescriptor, value);\n      if (newState !== state) {\n        setValidationState(newState);\n      }\n\n      if (newState.ok && dataSource?.tableSchema) {\n        const { key } = dataSource.tableSchema;\n        const keyValue = entity?.[key] as string;\n        dataSource\n          ?.applyEdit(keyValue, fieldName, value)\n          .then((rpcResponse) => {\n            console.log({ rpcResponse });\n          });\n      }\n    },\n    [dataSource, entity, formFieldDescriptors, setValidationState],\n  );\n\n  const handleFieldChange = useCallback(\n    (evt: SyntheticEvent<HTMLInputElement>) => {\n      const { current: fieldName } = focusedFieldRef;\n      if (fieldName) {\n        const input = queryClosest<HTMLInputElement>(evt.target, \"input\", true);\n        const dataDescriptor = find(formFieldDescriptors, fieldName);\n        const value = input.value as string;\n        const { current: state } = validationStateRef;\n        const newState = nextValidationState(state, dataDescriptor, value);\n        if (newState !== state) {\n          setValidationState(newState);\n        }\n\n        setEntity({ ...entity, [fieldName]: value });\n      }\n    },\n    [entity, formFieldDescriptors, setEntity, setValidationState],\n  );\n\n  const handleFormSubmit = useCallback(async () => {\n    submitChanges();\n    setFormEditState(CLEAN_FORM);\n    originalEntityRef.current = entity;\n    onSubmit?.();\n    forceUpdate({});\n  }, [entity, onSubmit, setFormEditState, submitChanges]);\n\n  const handleFormCancel = useCallback(async () => {\n    // const rpcResponse = await dataSource?.rpcCall?.(\n    //   viewportRpcRequest(\"VP_BULK_EDIT_CANCEL_RPC\"),\n    // );\n    setFormEditState(CLEAN_FORM);\n    setValidationState(CLEAN_VALIDATION);\n    // console.log({ rpcResponse });\n    setEntity(originalEntityRef.current as Entity);\n  }, [setEntity, setFormEditState, setValidationState]);\n\n  const handleFocus = useCallback<FocusEventHandler>((evt) => {\n    // Ignore focus on popup Calendars, Lists etc\n    if (formFieldsContainerRef.current?.contains(evt.target)) {\n      const fieldName = getField(evt.target);\n      if (fieldName) {\n        if (fieldName) {\n          focusedFieldRef.current = fieldName;\n        }\n      }\n    }\n  }, []);\n\n  const {\n    current: { ok, messages: errorMessages },\n  } = validationStateRef;\n\n  const {\n    current: { isClean, editedFields },\n  } = formEditStateRef;\n\n  return {\n    editedFields,\n    editEntity: entity,\n    errorMessages,\n    formFieldsContainerRef,\n    isClean,\n    ok,\n    onCancel: handleFormCancel,\n    onChange: handleFieldChange,\n    onCommit: handleFieldCommit,\n    onFocus: handleFocus,\n    onSubmit: handleFormSubmit,\n  };\n};\n"],"names":["getEditValidationRules","buildValidationChecker","queryClosest","useDialogContext","useRef","CLEAN_FORM","useState","useCallback","buildFormEditState","viewportRpcRequest","jsx","UnsavedChangesReport","Button","useMemo","buildColumnMap","Range","messageHasDataRows","entity","dataSourceRowToEntity","editedFields"],"mappings":"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"}

package/cjs/datasource-provider/RestDataSourceProvider.js

@@ -61,7 +61,7 @@ const RestDataSourceProvider = ({
   vuuDataRemote.RestDataSource.api = url;
   const restDataSourceClass = getRestDataSourceClass({ createHttpHeaders });
   return /* @__PURE__ */ jsxRuntime.jsx(
-    vuuUtils.DataSourceProvider,
+    vuuUtils.DataProvider,
     {
       VuuDataSource: restDataSourceClass,
       dataSourceExtensions: { createHttpHeaders },

package/cjs/datasource-provider/RestDataSourceProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"RestDataSourceProvider.js","sources":["../../src/datasource-provider/RestDataSourceProvider.tsx"],"sourcesContent":["import { RestDataSource } from \"@vuu-ui/vuu-data-remote\";\nimport {\n  DataSourceConstructorProps,\n  ServerAPI,\n  TableSchema,\n} from \"@vuu-ui/vuu-data-types\";\nimport {\n  VuuCreateVisualLink,\n  VuuRemoveVisualLink,\n  VuuRpcMenuRequest,\n  VuuRpcServiceRequest,\n  VuuRpcViewportRequest,\n  VuuTable,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { DataSourceProvider, isObject } from \"@vuu-ui/vuu-utils\";\nimport { ReactNode } from \"react\";\n\nconst serverAPI = (\n  schemas?: Record<string, TableSchema>,\n): Pick<ServerAPI, \"getTableList\" | \"getTableSchema\" | \"rpcCall\"> => ({\n  getTableList: async () => {\n    if (schemas) {\n      return {\n        tables: Object.keys(schemas).map((key) => {\n          const [module, table] = key.split(\":\");\n          return { module, table };\n        }),\n      };\n    } else {\n      console.log(`Rest data source does not yet support table list`);\n      return { tables: [] };\n    }\n  },\n  getTableSchema: async ({ module, table }: VuuTable) => {\n    const schema = schemas?.[`${module}:${table}`];\n    if (schema) {\n      return schema;\n    } else {\n      throw Error(\n        `Rest data source does not yet support table schema (${table})`,\n      );\n    }\n  },\n  rpcCall: async (\n    message:\n      | VuuRpcServiceRequest\n      | VuuRpcMenuRequest\n      | VuuRpcViewportRequest\n      | VuuCreateVisualLink\n      | VuuRemoveVisualLink,\n  ) =>\n    Promise.reject(\n      Error(`Rest data source does not yet support RPC (${message.type})`),\n    ),\n});\n\nconst getServerAPI = (schemas?: Record<string, TableSchema>) => async () =>\n  serverAPI(schemas);\n\nexport type RestDataSourceExtension = {\n  createHttpHeaders?: () => Headers;\n};\n\nexport const isRestDataSourceExtension = (\n  o?: unknown,\n): o is RestDataSourceExtension => {\n  return (\n    isObject(o) &&\n    \"createHttpHeaders\" in o &&\n    typeof o[\"createHttpHeaders\"] === \"function\"\n  );\n};\n\nconst getRestDataSourceClass = ({\n  createHttpHeaders,\n}: RestDataSourceExtension) => {\n  if (createHttpHeaders) {\n    return class ExtendedClass extends RestDataSource {\n      constructor(props: DataSourceConstructorProps) {\n        super(props);\n      }\n      get httpHeaders(): Headers | undefined {\n        return createHttpHeaders();\n      }\n    };\n  } else {\n    return RestDataSource;\n  }\n};\n\nexport const RestDataSourceProvider = ({\n  children,\n  createHttpHeaders,\n  tableSchemas,\n  url,\n}: {\n  children: ReactNode;\n  tableSchemas?: Record<string, TableSchema>;\n  url: string;\n} & RestDataSourceExtension) => {\n  RestDataSource.api = url;\n\n  const restDataSourceClass = getRestDataSourceClass({ createHttpHeaders });\n\n  return (\n    <DataSourceProvider\n      VuuDataSource={restDataSourceClass}\n      dataSourceExtensions={{ createHttpHeaders }}\n      getServerAPI={getServerAPI(tableSchemas)}\n      isLocalData={false}\n      tableSchemas={tableSchemas}\n    >\n      {children}\n    </DataSourceProvider>\n  );\n};\n"],"names":["isObject","RestDataSource","jsx","DataSourceProvider"],"mappings":";;;;;;AAiBA,MAAM,SAAA,GAAY,CAChB,OACoE,MAAA;AAAA,EACpE,cAAc,YAAY;AACxB,IAAA,IAAI,OAAS,EAAA;AACX,MAAO,OAAA;AAAA,QACL,QAAQ,MAAO,CAAA,IAAA,CAAK,OAAO,CAAE,CAAA,GAAA,CAAI,CAAC,GAAQ,KAAA;AACxC,UAAA,MAAM,CAAC,MAAQ,EAAA,KAAK,CAAI,GAAA,GAAA,CAAI,MAAM,GAAG,CAAA;AACrC,UAAO,OAAA,EAAE,QAAQ,KAAM,EAAA;AAAA,SACxB;AAAA,OACH;AAAA,KACK,MAAA;AACL,MAAA,OAAA,CAAQ,IAAI,CAAkD,gDAAA,CAAA,CAAA;AAC9D,MAAO,OAAA,EAAE,MAAQ,EAAA,EAAG,EAAA;AAAA;AACtB,GACF;AAAA,EACA,cAAgB,EAAA,OAAO,EAAE,MAAA,EAAQ,OAAsB,KAAA;AACrD,IAAA,MAAM,SAAS,OAAU,GAAA,CAAA,EAAG,MAAM,CAAA,CAAA,EAAI,KAAK,CAAE,CAAA,CAAA;AAC7C,IAAA,IAAI,MAAQ,EAAA;AACV,MAAO,OAAA,MAAA;AAAA,KACF,MAAA;AACL,MAAM,MAAA,KAAA;AAAA,QACJ,uDAAuD,KAAK,CAAA,CAAA;AAAA,OAC9D;AAAA;AACF,GACF;AAAA,EACA,OAAA,EAAS,OACP,OAAA,KAOA,OAAQ,CAAA,MAAA;AAAA,IACN,KAAM,CAAA,CAAA,2CAAA,EAA8C,OAAQ,CAAA,IAAI,CAAG,CAAA,CAAA;AAAA;AAEzE,CAAA,CAAA;AAEA,MAAM,YAAe,GAAA,CAAC,OAA0C,KAAA,YAC9D,UAAU,OAAO,CAAA;AAMN,MAAA,yBAAA,GAA4B,CACvC,CACiC,KAAA;AACjC,EACE,OAAAA,iBAAA,CAAS,CAAC,CACV,IAAA,mBAAA,IAAuB,KACvB,OAAO,CAAA,CAAE,mBAAmB,CAAM,KAAA,UAAA;AAEtC;AAEA,MAAM,yBAAyB,CAAC;AAAA,EAC9B;AACF,CAA+B,KAAA;AAC7B,EAAA,IAAI,iBAAmB,EAAA;AACrB,IAAO,OAAA,MAAM,sBAAsBC,4BAAe,CAAA;AAAA,MAChD,YAAY,KAAmC,EAAA;AAC7C,QAAA,KAAA,CAAM,KAAK,CAAA;AAAA;AACb,MACA,IAAI,WAAmC,GAAA;AACrC,QAAA,OAAO,iBAAkB,EAAA;AAAA;AAC3B,KACF;AAAA,GACK,MAAA;AACL,IAAO,OAAAA,4BAAA;AAAA;AAEX,CAAA;AAEO,MAAM,yBAAyB,CAAC;AAAA,EACrC,QAAA;AAAA,EACA,iBAAA;AAAA,EACA,YAAA;AAAA,EACA;AACF,CAIgC,KAAA;AAC9B,EAAAA,4BAAA,CAAe,GAAM,GAAA,GAAA;AAErB,EAAA,MAAM,mBAAsB,GAAA,sBAAA,CAAuB,EAAE,iBAAA,EAAmB,CAAA;AAExE,EACE,uBAAAC,cAAA;AAAA,IAACC,2BAAA;AAAA,IAAA;AAAA,MACC,aAAe,EAAA,mBAAA;AAAA,MACf,oBAAA,EAAsB,EAAE,iBAAkB,EAAA;AAAA,MAC1C,YAAA,EAAc,aAAa,YAAY,CAAA;AAAA,MACvC,WAAa,EAAA,KAAA;AAAA,MACb,YAAA;AAAA,MAEC;AAAA;AAAA,GACH;AAEJ;;;;;"}
+{"version":3,"file":"RestDataSourceProvider.js","sources":["../../src/datasource-provider/RestDataSourceProvider.tsx"],"sourcesContent":["import { RestDataSource } from \"@vuu-ui/vuu-data-remote\";\nimport {\n  DataSourceConstructorProps,\n  ServerAPI,\n  TableSchema,\n} from \"@vuu-ui/vuu-data-types\";\nimport {\n  VuuCreateVisualLink,\n  VuuRemoveVisualLink,\n  VuuRpcMenuRequest,\n  VuuRpcServiceRequest,\n  VuuRpcViewportRequest,\n  VuuTable,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { DataProvider, isObject } from \"@vuu-ui/vuu-utils\";\nimport { ReactNode } from \"react\";\n\nconst serverAPI = (\n  schemas?: Record<string, TableSchema>,\n): Pick<ServerAPI, \"getTableList\" | \"getTableSchema\" | \"rpcCall\"> => ({\n  getTableList: async () => {\n    if (schemas) {\n      return {\n        tables: Object.keys(schemas).map((key) => {\n          const [module, table] = key.split(\":\");\n          return { module, table };\n        }),\n      };\n    } else {\n      console.log(`Rest data source does not yet support table list`);\n      return { tables: [] };\n    }\n  },\n  getTableSchema: async ({ module, table }: VuuTable) => {\n    const schema = schemas?.[`${module}:${table}`];\n    if (schema) {\n      return schema;\n    } else {\n      throw Error(\n        `Rest data source does not yet support table schema (${table})`,\n      );\n    }\n  },\n  rpcCall: async (\n    message:\n      | VuuRpcServiceRequest\n      | VuuRpcMenuRequest\n      | VuuRpcViewportRequest\n      | VuuCreateVisualLink\n      | VuuRemoveVisualLink,\n  ) =>\n    Promise.reject(\n      Error(`Rest data source does not yet support RPC (${message.type})`),\n    ),\n});\n\nconst getServerAPI = (schemas?: Record<string, TableSchema>) => async () =>\n  serverAPI(schemas);\n\nexport type RestDataSourceExtension = {\n  createHttpHeaders?: () => Headers;\n};\n\nexport const isRestDataSourceExtension = (\n  o?: unknown,\n): o is RestDataSourceExtension => {\n  return (\n    isObject(o) &&\n    \"createHttpHeaders\" in o &&\n    typeof o[\"createHttpHeaders\"] === \"function\"\n  );\n};\n\nconst getRestDataSourceClass = ({\n  createHttpHeaders,\n}: RestDataSourceExtension) => {\n  if (createHttpHeaders) {\n    return class ExtendedClass extends RestDataSource {\n      constructor(props: DataSourceConstructorProps) {\n        super(props);\n      }\n      get httpHeaders(): Headers | undefined {\n        return createHttpHeaders();\n      }\n    };\n  } else {\n    return RestDataSource;\n  }\n};\n\nexport const RestDataSourceProvider = ({\n  children,\n  createHttpHeaders,\n  tableSchemas,\n  url,\n}: {\n  children: ReactNode;\n  tableSchemas?: Record<string, TableSchema>;\n  url: string;\n} & RestDataSourceExtension) => {\n  RestDataSource.api = url;\n\n  const restDataSourceClass = getRestDataSourceClass({ createHttpHeaders });\n\n  return (\n    <DataProvider\n      VuuDataSource={restDataSourceClass}\n      dataSourceExtensions={{ createHttpHeaders }}\n      getServerAPI={getServerAPI(tableSchemas)}\n      isLocalData={false}\n      tableSchemas={tableSchemas}\n    >\n      {children}\n    </DataProvider>\n  );\n};\n"],"names":["isObject","RestDataSource","jsx","DataProvider"],"mappings":";;;;;;AAiBA,MAAM,SAAA,GAAY,CAChB,OACoE,MAAA;AAAA,EACpE,cAAc,YAAY;AACxB,IAAA,IAAI,OAAS,EAAA;AACX,MAAO,OAAA;AAAA,QACL,QAAQ,MAAO,CAAA,IAAA,CAAK,OAAO,CAAE,CAAA,GAAA,CAAI,CAAC,GAAQ,KAAA;AACxC,UAAA,MAAM,CAAC,MAAQ,EAAA,KAAK,CAAI,GAAA,GAAA,CAAI,MAAM,GAAG,CAAA;AACrC,UAAO,OAAA,EAAE,QAAQ,KAAM,EAAA;AAAA,SACxB;AAAA,OACH;AAAA,KACK,MAAA;AACL,MAAA,OAAA,CAAQ,IAAI,CAAkD,gDAAA,CAAA,CAAA;AAC9D,MAAO,OAAA,EAAE,MAAQ,EAAA,EAAG,EAAA;AAAA;AACtB,GACF;AAAA,EACA,cAAgB,EAAA,OAAO,EAAE,MAAA,EAAQ,OAAsB,KAAA;AACrD,IAAA,MAAM,SAAS,OAAU,GAAA,CAAA,EAAG,MAAM,CAAA,CAAA,EAAI,KAAK,CAAE,CAAA,CAAA;AAC7C,IAAA,IAAI,MAAQ,EAAA;AACV,MAAO,OAAA,MAAA;AAAA,KACF,MAAA;AACL,MAAM,MAAA,KAAA;AAAA,QACJ,uDAAuD,KAAK,CAAA,CAAA;AAAA,OAC9D;AAAA;AACF,GACF;AAAA,EACA,OAAA,EAAS,OACP,OAAA,KAOA,OAAQ,CAAA,MAAA;AAAA,IACN,KAAM,CAAA,CAAA,2CAAA,EAA8C,OAAQ,CAAA,IAAI,CAAG,CAAA,CAAA;AAAA;AAEzE,CAAA,CAAA;AAEA,MAAM,YAAe,GAAA,CAAC,OAA0C,KAAA,YAC9D,UAAU,OAAO,CAAA;AAMN,MAAA,yBAAA,GAA4B,CACvC,CACiC,KAAA;AACjC,EACE,OAAAA,iBAAA,CAAS,CAAC,CACV,IAAA,mBAAA,IAAuB,KACvB,OAAO,CAAA,CAAE,mBAAmB,CAAM,KAAA,UAAA;AAEtC;AAEA,MAAM,yBAAyB,CAAC;AAAA,EAC9B;AACF,CAA+B,KAAA;AAC7B,EAAA,IAAI,iBAAmB,EAAA;AACrB,IAAO,OAAA,MAAM,sBAAsBC,4BAAe,CAAA;AAAA,MAChD,YAAY,KAAmC,EAAA;AAC7C,QAAA,KAAA,CAAM,KAAK,CAAA;AAAA;AACb,MACA,IAAI,WAAmC,GAAA;AACrC,QAAA,OAAO,iBAAkB,EAAA;AAAA;AAC3B,KACF;AAAA,GACK,MAAA;AACL,IAAO,OAAAA,4BAAA;AAAA;AAEX,CAAA;AAEO,MAAM,yBAAyB,CAAC;AAAA,EACrC,QAAA;AAAA,EACA,iBAAA;AAAA,EACA,YAAA;AAAA,EACA;AACF,CAIgC,KAAA;AAC9B,EAAAA,4BAAA,CAAe,GAAM,GAAA,GAAA;AAErB,EAAA,MAAM,mBAAsB,GAAA,sBAAA,CAAuB,EAAE,iBAAA,EAAmB,CAAA;AAExE,EACE,uBAAAC,cAAA;AAAA,IAACC,qBAAA;AAAA,IAAA;AAAA,MACC,aAAe,EAAA,mBAAA;AAAA,MACf,oBAAA,EAAsB,EAAE,iBAAkB,EAAA;AAAA,MAC1C,YAAA,EAAc,aAAa,YAAY,CAAA;AAAA,MACvC,WAAa,EAAA,KAAA;AAAA,MACb,YAAA;AAAA,MAEC;AAAA;AAAA,GACH;AAEJ;;;;;"}

package/cjs/datasource-provider/VuuDataSourceProvider.js

@@ -20,7 +20,7 @@ const VuuDataSourceProvider = ({
     websocketUrl
   });
   return /* @__PURE__ */ jsxRuntime.jsx(
-    vuuUtils.DataSourceProvider,
+    vuuUtils.DataProvider,
     {
       VuuDataSource: vuuDataRemote.VuuDataSource,
       getServerAPI,

package/cjs/datasource-provider/VuuDataSourceProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"VuuDataSourceProvider.js","sources":["../../src/datasource-provider/VuuDataSourceProvider.tsx"],"sourcesContent":["import { ConnectionManager, VuuDataSource } from \"@vuu-ui/vuu-data-remote\";\nimport { DataSourceProvider } from \"@vuu-ui/vuu-utils\";\nimport { ReactNode } from \"react\";\nimport { useAutoLoginToVuuServer } from \"./useAutoLoginToVuuServer\";\n\nconst getServerAPI = () => ConnectionManager.serverAPI;\n\nexport const VuuDataSourceProvider = ({\n  authenticate,\n  autoConnect = false,\n  autoLogin = false,\n  children,\n  websocketUrl,\n}: {\n  authenticate?: boolean;\n  autoConnect?: boolean;\n  autoLogin?: boolean;\n  children: ReactNode;\n  websocketUrl?: string;\n}) => {\n  useAutoLoginToVuuServer({\n    authenticate,\n    autoConnect,\n    autoLogin,\n    websocketUrl,\n  });\n  return (\n    <DataSourceProvider\n      VuuDataSource={VuuDataSource}\n      getServerAPI={getServerAPI}\n      isLocalData={false}\n    >\n      {children}\n    </DataSourceProvider>\n  );\n};\n"],"names":["ConnectionManager","useAutoLoginToVuuServer","jsx","DataSourceProvider","VuuDataSource"],"mappings":";;;;;;;AAKA,MAAM,YAAA,GAAe,MAAMA,+BAAkB,CAAA,SAAA;AAEtC,MAAM,wBAAwB,CAAC;AAAA,EACpC,YAAA;AAAA,EACA,WAAc,GAAA,KAAA;AAAA,EACd,SAAY,GAAA,KAAA;AAAA,EACZ,QAAA;AAAA,EACA;AACF,CAMM,KAAA;AACJ,EAAwBC,+CAAA,CAAA;AAAA,IACtB,YAAA;AAAA,IACA,WAAA;AAAA,IACA,SAAA;AAAA,IACA;AAAA,GACD,CAAA;AACD,EACE,uBAAAC,cAAA;AAAA,IAACC,2BAAA;AAAA,IAAA;AAAA,qBACCC,2BAAA;AAAA,MACA,YAAA;AAAA,MACA,WAAa,EAAA,KAAA;AAAA,MAEZ;AAAA;AAAA,GACH;AAEJ;;;;"}
+{"version":3,"file":"VuuDataSourceProvider.js","sources":["../../src/datasource-provider/VuuDataSourceProvider.tsx"],"sourcesContent":["import { ConnectionManager, VuuDataSource } from \"@vuu-ui/vuu-data-remote\";\nimport { DataProvider } from \"@vuu-ui/vuu-utils\";\nimport { ReactNode } from \"react\";\nimport { useAutoLoginToVuuServer } from \"./useAutoLoginToVuuServer\";\n\nconst getServerAPI = () => ConnectionManager.serverAPI;\n\nexport const VuuDataSourceProvider = ({\n  authenticate,\n  autoConnect = false,\n  autoLogin = false,\n  children,\n  websocketUrl,\n}: {\n  authenticate?: boolean;\n  autoConnect?: boolean;\n  autoLogin?: boolean;\n  children: ReactNode;\n  websocketUrl?: string;\n}) => {\n  useAutoLoginToVuuServer({\n    authenticate,\n    autoConnect,\n    autoLogin,\n    websocketUrl,\n  });\n  return (\n    <DataProvider\n      VuuDataSource={VuuDataSource}\n      getServerAPI={getServerAPI}\n      isLocalData={false}\n    >\n      {children}\n    </DataProvider>\n  );\n};\n"],"names":["ConnectionManager","useAutoLoginToVuuServer","jsx","DataProvider","VuuDataSource"],"mappings":";;;;;;;AAKA,MAAM,YAAA,GAAe,MAAMA,+BAAkB,CAAA,SAAA;AAEtC,MAAM,wBAAwB,CAAC;AAAA,EACpC,YAAA;AAAA,EACA,WAAc,GAAA,KAAA;AAAA,EACd,SAAY,GAAA,KAAA;AAAA,EACZ,QAAA;AAAA,EACA;AACF,CAMM,KAAA;AACJ,EAAwBC,+CAAA,CAAA;AAAA,IACtB,YAAA;AAAA,IACA,WAAA;AAAA,IACA,SAAA;AAAA,IACA;AAAA,GACD,CAAA;AACD,EACE,uBAAAC,cAAA;AAAA,IAACC,qBAAA;AAAA,IAAA;AAAA,qBACCC,2BAAA;AAAA,MACA,YAAA;AAAA,MACA,WAAa,EAAA,KAAA;AAAA,MAEZ;AAAA;AAAA,GACH;AAEJ;;;;"}

package/cjs/hooks/useLookupValues.js

@@ -30,7 +30,7 @@ const loadLookupValues = ({
       dataSource.subscribe(
         {
           columns,
-          range: { from: 0, to: 100 }
+          range: vuuUtils.Range(0, 100)
         },
         (message) => {
           if (message.type === "viewport-update") {

package/cjs/hooks/useLookupValues.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLookupValues.js","sources":["../../src/hooks/useLookupValues.ts"],"sourcesContent":["import {\n  ColumnDescriptor,\n  ListOption,\n  LookupTableDetails,\n} from \"@vuu-ui/vuu-table-types\";\nimport { VuuDataSource } from \"@vuu-ui/vuu-data-remote\";\nimport {\n  buildColumnMap,\n  getSelectedOption,\n  isLookupRenderer,\n  isTypeDescriptor,\n  isValueListRenderer,\n  useShellContext,\n} from \"@vuu-ui/vuu-utils\";\nimport { useMemo, useState } from \"react\";\n\nconst NO_VALUES: ListOption[] = [];\n\nconst toListOption = (value: string): ListOption => ({\n  label: value,\n  value,\n});\n\nconst lookupValueMap = new Map<string, Promise<ListOption[]>>();\n\nconst loadLookupValues = ({\n  labelColumn,\n  table,\n  valueColumn,\n}: LookupTableDetails): Promise<ListOption[]> => {\n  const tableKey = `${table.module}:${table.table}`;\n  const lookupValues = lookupValueMap.get(tableKey);\n  if (lookupValues) {\n    return lookupValues;\n  } else {\n    const promise: Promise<ListOption[]> = new Promise((resolve) => {\n      const columns = [valueColumn, labelColumn];\n      const columnMap = buildColumnMap(columns);\n      const dataSource = new VuuDataSource({\n        bufferSize: 0,\n        table,\n      });\n      dataSource.subscribe(\n        {\n          columns,\n          range: { from: 0, to: 100 },\n        },\n        (message) => {\n          if (message.type === \"viewport-update\") {\n            //TODO check we have full dataset\n            if (message.rows) {\n              const listOptions = message.rows.map<ListOption>((row) => ({\n                value: row[columnMap[valueColumn]] as string | number,\n                label: row[columnMap[labelColumn]] as string,\n              }));\n              resolve(listOptions);\n              dataSource.unsubscribe();\n            }\n          }\n        },\n      );\n    });\n    lookupValueMap.set(tableKey, promise);\n    return promise;\n  }\n};\n\ntype LookupState = {\n  initialValue: ListOption | null;\n  values: ListOption[];\n};\n\nconst getLookupDetails = ({ name, type }: ColumnDescriptor) => {\n  if (isTypeDescriptor(type) && isLookupRenderer(type.renderer)) {\n    return type.renderer.lookup;\n  } else {\n    throw Error(\n      `useLookupValues column ${name} is not configured to use lookup values`,\n    );\n  }\n};\n\nexport const useLookupValues = (\n  column: ColumnDescriptor,\n  initialValueProp: number | string,\n) => {\n  const { type: columnType } = column;\n  const { getLookupValues } = useShellContext();\n\n  const initialState = useMemo<LookupState>(() => {\n    if (\n      isTypeDescriptor(columnType) &&\n      isValueListRenderer(columnType?.renderer)\n    ) {\n      const values = columnType.renderer.values.map(toListOption);\n      return {\n        initialValue: getSelectedOption(values, initialValueProp) ?? null,\n        values,\n      };\n    } else {\n      const lookupDetails = getLookupDetails(column);\n      const values = getLookupValues?.(lookupDetails.table) ?? NO_VALUES;\n\n      return {\n        initialValue: getSelectedOption(values, initialValueProp) ?? null,\n        values,\n      };\n    }\n  }, [column, columnType, getLookupValues, initialValueProp]);\n\n  const [{ initialValue, values }, setLookupState] =\n    useState<LookupState>(initialState);\n\n  useMemo(() => {\n    if (values === NO_VALUES) {\n      const lookupDetails = getLookupDetails(column);\n      loadLookupValues(lookupDetails).then((values) =>\n        setLookupState({\n          initialValue: getSelectedOption(values, initialValueProp) ?? null,\n          values,\n        }),\n      );\n    }\n  }, [values, column, initialValueProp]);\n\n  return {\n    initialValue,\n    values,\n  };\n};\n"],"names":["buildColumnMap","VuuDataSource","isTypeDescriptor","isLookupRenderer","useShellContext","useMemo","isValueListRenderer","values","getSelectedOption","useState"],"mappings":"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"}
+{"version":3,"file":"useLookupValues.js","sources":["../../src/hooks/useLookupValues.ts"],"sourcesContent":["import {\n  ColumnDescriptor,\n  ListOption,\n  LookupTableDetails,\n} from \"@vuu-ui/vuu-table-types\";\nimport { VuuDataSource } from \"@vuu-ui/vuu-data-remote\";\nimport {\n  buildColumnMap,\n  getSelectedOption,\n  isLookupRenderer,\n  isTypeDescriptor,\n  isValueListRenderer,\n  Range,\n  useShellContext,\n} from \"@vuu-ui/vuu-utils\";\nimport { useMemo, useState } from \"react\";\n\nconst NO_VALUES: ListOption[] = [];\n\nconst toListOption = (value: string): ListOption => ({\n  label: value,\n  value,\n});\n\nconst lookupValueMap = new Map<string, Promise<ListOption[]>>();\n\nconst loadLookupValues = ({\n  labelColumn,\n  table,\n  valueColumn,\n}: LookupTableDetails): Promise<ListOption[]> => {\n  const tableKey = `${table.module}:${table.table}`;\n  const lookupValues = lookupValueMap.get(tableKey);\n  if (lookupValues) {\n    return lookupValues;\n  } else {\n    const promise: Promise<ListOption[]> = new Promise((resolve) => {\n      const columns = [valueColumn, labelColumn];\n      const columnMap = buildColumnMap(columns);\n      const dataSource = new VuuDataSource({\n        bufferSize: 0,\n        table,\n      });\n      dataSource.subscribe(\n        {\n          columns,\n          range: Range(0, 100),\n        },\n        (message) => {\n          if (message.type === \"viewport-update\") {\n            //TODO check we have full dataset\n            if (message.rows) {\n              const listOptions = message.rows.map<ListOption>((row) => ({\n                value: row[columnMap[valueColumn]] as string | number,\n                label: row[columnMap[labelColumn]] as string,\n              }));\n              resolve(listOptions);\n              dataSource.unsubscribe();\n            }\n          }\n        },\n      );\n    });\n    lookupValueMap.set(tableKey, promise);\n    return promise;\n  }\n};\n\ntype LookupState = {\n  initialValue: ListOption | null;\n  values: ListOption[];\n};\n\nconst getLookupDetails = ({ name, type }: ColumnDescriptor) => {\n  if (isTypeDescriptor(type) && isLookupRenderer(type.renderer)) {\n    return type.renderer.lookup;\n  } else {\n    throw Error(\n      `useLookupValues column ${name} is not configured to use lookup values`,\n    );\n  }\n};\n\nexport const useLookupValues = (\n  column: ColumnDescriptor,\n  initialValueProp: number | string,\n) => {\n  const { type: columnType } = column;\n  const { getLookupValues } = useShellContext();\n\n  const initialState = useMemo<LookupState>(() => {\n    if (\n      isTypeDescriptor(columnType) &&\n      isValueListRenderer(columnType?.renderer)\n    ) {\n      const values = columnType.renderer.values.map(toListOption);\n      return {\n        initialValue: getSelectedOption(values, initialValueProp) ?? null,\n        values,\n      };\n    } else {\n      const lookupDetails = getLookupDetails(column);\n      const values = getLookupValues?.(lookupDetails.table) ?? NO_VALUES;\n\n      return {\n        initialValue: getSelectedOption(values, initialValueProp) ?? null,\n        values,\n      };\n    }\n  }, [column, columnType, getLookupValues, initialValueProp]);\n\n  const [{ initialValue, values }, setLookupState] =\n    useState<LookupState>(initialState);\n\n  useMemo(() => {\n    if (values === NO_VALUES) {\n      const lookupDetails = getLookupDetails(column);\n      loadLookupValues(lookupDetails).then((values) =>\n        setLookupState({\n          initialValue: getSelectedOption(values, initialValueProp) ?? null,\n          values,\n        }),\n      );\n    }\n  }, [values, column, initialValueProp]);\n\n  return {\n    initialValue,\n    values,\n  };\n};\n"],"names":["buildColumnMap","VuuDataSource","Range","isTypeDescriptor","isLookupRenderer","useShellContext","useMemo","isValueListRenderer","values","getSelectedOption","useState"],"mappings":"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"}

package/cjs/hooks/useSessionDataSource.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var vuuUtils = require('@vuu-ui/vuu-utils');
 var vuuLayout = require('@vuu-ui/vuu-layout');
+var vuuUtils = require('@vuu-ui/vuu-utils');
 var react = require('react');
 
 const NO_CONFIG = {};
@@ -10,7 +10,7 @@ const useSessionDataSource = ({
   tableSchema
 }) => {
   const { id, load, save, loadSession, saveSession, title } = vuuLayout.useViewContext();
-  const { VuuDataSource } = vuuUtils.useDataSource();
+  const { VuuDataSource } = vuuUtils.useData();
   const { "datasource-config": dataSourceConfigFromState } = react.useMemo(() => load?.() ?? NO_CONFIG, [load]);
   const handleDataSourceConfigChange = react.useCallback(
     (config, _range, confirmed) => {
@@ -33,7 +33,7 @@ const useSessionDataSource = ({
         ds.applyConfig(dataSourceConfigFromState, true);
       }
       if (ds.range.from > 0) {
-        ds.range = vuuUtils.resetRange(ds.range);
+        ds.range = ds.range.reset;
       }
       return ds;
     }

package/cjs/hooks/useSessionDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSessionDataSource.js","sources":["../../src/hooks/useSessionDataSource.ts"],"sourcesContent":["import {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConfigChangeHandler,\n  TableSchema,\n} from \"@vuu-ui/vuu-data-types\";\nimport { isConfigChanged, resetRange, useDataSource } from \"@vuu-ui/vuu-utils\";\nimport { useViewContext } from \"@vuu-ui/vuu-layout\";\nimport { useCallback, useMemo } from \"react\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\ntype SessionDataSourceConfig = {\n  \"datasource-config\"?: DataSourceConfig;\n};\n\nconst NO_CONFIG: SessionDataSourceConfig = {};\n\nexport const useSessionDataSource = ({\n  dataSourceSessionKey = \"data-source\",\n  tableSchema,\n}: {\n  dataSourceSessionKey?: string;\n  tableSchema: TableSchema;\n}) => {\n  const { id, load, save, loadSession, saveSession, title } = useViewContext();\n  const { VuuDataSource } = useDataSource();\n\n  const { \"datasource-config\": dataSourceConfigFromState } =\n    useMemo<SessionDataSourceConfig>(() => load?.() ?? NO_CONFIG, [load]);\n\n  const handleDataSourceConfigChange =\n    useCallback<DataSourceConfigChangeHandler>(\n      (\n        config: DataSourceConfig | undefined,\n        _range: VuuRange,\n        confirmed?: boolean,\n      ) => {\n        if (confirmed !== false) {\n          const { noChanges } = isConfigChanged(\n            dataSourceConfigFromState,\n            config,\n          );\n          if (noChanges === false) {\n            save?.(config, \"datasource-config\");\n          }\n        }\n      },\n      [dataSourceConfigFromState, save],\n    );\n\n  const dataSource: DataSource = useMemo(() => {\n    let ds = loadSession?.(dataSourceSessionKey) as DataSource;\n    if (ds) {\n      if (dataSourceConfigFromState) {\n        // this won't do anything if dataSource config already matches this\n        // This is only really used when injecting a dataSource into session\n        // state in Showcase examples\n        // DO we definitely need this ? If not apply config can be provate\n        ds.applyConfig(dataSourceConfigFromState, true);\n      }\n\n      if (ds.range.from > 0) {\n        // UI does not currently restore scroll position, so always reset to top of dataset\n        ds.range = resetRange(ds.range);\n      }\n\n      return ds;\n    }\n\n    const columns =\n      dataSourceConfigFromState?.columns ??\n      tableSchema.columns.map((col) => col.name);\n\n    ds = new VuuDataSource({\n      // bufferSize: 0,\n      viewport: id,\n      table: tableSchema.table,\n      ...dataSourceConfigFromState,\n      columns,\n      title,\n    });\n    ds.on(\"config\", handleDataSourceConfigChange);\n    saveSession?.(ds, \"data-source\");\n    return ds;\n  }, [\n    VuuDataSource,\n    dataSourceConfigFromState,\n    dataSourceSessionKey,\n    handleDataSourceConfigChange,\n    id,\n    loadSession,\n    saveSession,\n    tableSchema.columns,\n    tableSchema.table,\n    title,\n  ]);\n\n  return dataSource;\n};\n"],"names":["useViewContext","useDataSource","useMemo","useCallback","isConfigChanged","resetRange"],"mappings":";;;;;;AAeA,MAAM,YAAqC,EAAC;AAErC,MAAM,uBAAuB,CAAC;AAAA,EACnC,oBAAuB,GAAA,aAAA;AAAA,EACvB;AACF,CAGM,KAAA;AACJ,EAAM,MAAA,EAAE,IAAI,IAAM,EAAA,IAAA,EAAM,aAAa,WAAa,EAAA,KAAA,KAAUA,wBAAe,EAAA;AAC3E,EAAM,MAAA,EAAE,aAAc,EAAA,GAAIC,sBAAc,EAAA;AAExC,EAAM,MAAA,EAAE,mBAAqB,EAAA,yBAAA,EAC3B,GAAAC,aAAA,CAAiC,MAAM,IAAA,IAAY,IAAA,SAAA,EAAW,CAAC,IAAI,CAAC,CAAA;AAEtE,EAAA,MAAM,4BACJ,GAAAC,iBAAA;AAAA,IACE,CACE,MACA,EAAA,MAAA,EACA,SACG,KAAA;AACH,MAAA,IAAI,cAAc,KAAO,EAAA;AACvB,QAAM,MAAA,EAAE,WAAc,GAAAC,wBAAA;AAAA,UACpB,yBAAA;AAAA,UACA;AAAA,SACF;AACA,QAAA,IAAI,cAAc,KAAO,EAAA;AACvB,UAAA,IAAA,GAAO,QAAQ,mBAAmB,CAAA;AAAA;AACpC;AACF,KACF;AAAA,IACA,CAAC,2BAA2B,IAAI;AAAA,GAClC;AAEF,EAAM,MAAA,UAAA,GAAyBF,cAAQ,MAAM;AAC3C,IAAI,IAAA,EAAA,GAAK,cAAc,oBAAoB,CAAA;AAC3C,IAAA,IAAI,EAAI,EAAA;AACN,MAAA,IAAI,yBAA2B,EAAA;AAK7B,QAAG,EAAA,CAAA,WAAA,CAAY,2BAA2B,IAAI,CAAA;AAAA;AAGhD,MAAI,IAAA,EAAA,CAAG,KAAM,CAAA,IAAA,GAAO,CAAG,EAAA;AAErB,QAAG,EAAA,CAAA,KAAA,GAAQG,mBAAW,CAAA,EAAA,CAAG,KAAK,CAAA;AAAA;AAGhC,MAAO,OAAA,EAAA;AAAA;AAGT,IAAM,MAAA,OAAA,GACJ,2BAA2B,OAC3B,IAAA,WAAA,CAAY,QAAQ,GAAI,CAAA,CAAC,GAAQ,KAAA,GAAA,CAAI,IAAI,CAAA;AAE3C,IAAA,EAAA,GAAK,IAAI,aAAc,CAAA;AAAA;AAAA,MAErB,QAAU,EAAA,EAAA;AAAA,MACV,OAAO,WAAY,CAAA,KAAA;AAAA,MACnB,GAAG,yBAAA;AAAA,MACH,OAAA;AAAA,MACA;AAAA,KACD,CAAA;AACD,IAAG,EAAA,CAAA,EAAA,CAAG,UAAU,4BAA4B,CAAA;AAC5C,IAAA,WAAA,GAAc,IAAI,aAAa,CAAA;AAC/B,IAAO,OAAA,EAAA;AAAA,GACN,EAAA;AAAA,IACD,aAAA;AAAA,IACA,yBAAA;AAAA,IACA,oBAAA;AAAA,IACA,4BAAA;AAAA,IACA,EAAA;AAAA,IACA,WAAA;AAAA,IACA,WAAA;AAAA,IACA,WAAY,CAAA,OAAA;AAAA,IACZ,WAAY,CAAA,KAAA;AAAA,IACZ;AAAA,GACD,CAAA;AAED,EAAO,OAAA,UAAA;AACT;;;;"}
+{"version":3,"file":"useSessionDataSource.js","sources":["../../src/hooks/useSessionDataSource.ts"],"sourcesContent":["import type {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConfigChangeHandler,\n  TableSchema,\n} from \"@vuu-ui/vuu-data-types\";\nimport { useViewContext } from \"@vuu-ui/vuu-layout\";\nimport type { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport { isConfigChanged, useData } from \"@vuu-ui/vuu-utils\";\nimport { useCallback, useMemo } from \"react\";\n\ntype SessionDataSourceConfig = {\n  \"datasource-config\"?: DataSourceConfig;\n};\n\nconst NO_CONFIG: SessionDataSourceConfig = {};\n\nexport const useSessionDataSource = ({\n  dataSourceSessionKey = \"data-source\",\n  tableSchema,\n}: {\n  dataSourceSessionKey?: string;\n  tableSchema: TableSchema;\n}) => {\n  const { id, load, save, loadSession, saveSession, title } = useViewContext();\n  const { VuuDataSource } = useData();\n\n  const { \"datasource-config\": dataSourceConfigFromState } =\n    useMemo<SessionDataSourceConfig>(() => load?.() ?? NO_CONFIG, [load]);\n\n  const handleDataSourceConfigChange =\n    useCallback<DataSourceConfigChangeHandler>(\n      (\n        config: DataSourceConfig | undefined,\n        _range: VuuRange,\n        confirmed?: boolean,\n      ) => {\n        if (confirmed !== false) {\n          const { noChanges } = isConfigChanged(\n            dataSourceConfigFromState,\n            config,\n          );\n          if (noChanges === false) {\n            save?.(config, \"datasource-config\");\n          }\n        }\n      },\n      [dataSourceConfigFromState, save],\n    );\n\n  const dataSource: DataSource = useMemo(() => {\n    let ds = loadSession?.(dataSourceSessionKey) as DataSource;\n    if (ds) {\n      if (dataSourceConfigFromState) {\n        // this won't do anything if dataSource config already matches this\n        // This is only really used when injecting a dataSource into session\n        // state in Showcase examples\n        // DO we definitely need this ? If not apply config can be provate\n        ds.applyConfig(dataSourceConfigFromState, true);\n      }\n\n      if (ds.range.from > 0) {\n        // UI does not currently restore scroll position, so always reset to top of dataset\n        ds.range = ds.range.reset;\n      }\n\n      return ds;\n    }\n\n    const columns =\n      dataSourceConfigFromState?.columns ??\n      tableSchema.columns.map((col) => col.name);\n\n    ds = new VuuDataSource({\n      // bufferSize: 0,\n      viewport: id,\n      table: tableSchema.table,\n      ...dataSourceConfigFromState,\n      columns,\n      title,\n    });\n    ds.on(\"config\", handleDataSourceConfigChange);\n    saveSession?.(ds, \"data-source\");\n    return ds;\n  }, [\n    VuuDataSource,\n    dataSourceConfigFromState,\n    dataSourceSessionKey,\n    handleDataSourceConfigChange,\n    id,\n    loadSession,\n    saveSession,\n    tableSchema.columns,\n    tableSchema.table,\n    title,\n  ]);\n\n  return dataSource;\n};\n"],"names":["useViewContext","useData","useMemo","useCallback","isConfigChanged"],"mappings":";;;;;;AAeA,MAAM,YAAqC,EAAC;AAErC,MAAM,uBAAuB,CAAC;AAAA,EACnC,oBAAuB,GAAA,aAAA;AAAA,EACvB;AACF,CAGM,KAAA;AACJ,EAAM,MAAA,EAAE,IAAI,IAAM,EAAA,IAAA,EAAM,aAAa,WAAa,EAAA,KAAA,KAAUA,wBAAe,EAAA;AAC3E,EAAM,MAAA,EAAE,aAAc,EAAA,GAAIC,gBAAQ,EAAA;AAElC,EAAM,MAAA,EAAE,mBAAqB,EAAA,yBAAA,EAC3B,GAAAC,aAAA,CAAiC,MAAM,IAAA,IAAY,IAAA,SAAA,EAAW,CAAC,IAAI,CAAC,CAAA;AAEtE,EAAA,MAAM,4BACJ,GAAAC,iBAAA;AAAA,IACE,CACE,MACA,EAAA,MAAA,EACA,SACG,KAAA;AACH,MAAA,IAAI,cAAc,KAAO,EAAA;AACvB,QAAM,MAAA,EAAE,WAAc,GAAAC,wBAAA;AAAA,UACpB,yBAAA;AAAA,UACA;AAAA,SACF;AACA,QAAA,IAAI,cAAc,KAAO,EAAA;AACvB,UAAA,IAAA,GAAO,QAAQ,mBAAmB,CAAA;AAAA;AACpC;AACF,KACF;AAAA,IACA,CAAC,2BAA2B,IAAI;AAAA,GAClC;AAEF,EAAM,MAAA,UAAA,GAAyBF,cAAQ,MAAM;AAC3C,IAAI,IAAA,EAAA,GAAK,cAAc,oBAAoB,CAAA;AAC3C,IAAA,IAAI,EAAI,EAAA;AACN,MAAA,IAAI,yBAA2B,EAAA;AAK7B,QAAG,EAAA,CAAA,WAAA,CAAY,2BAA2B,IAAI,CAAA;AAAA;AAGhD,MAAI,IAAA,EAAA,CAAG,KAAM,CAAA,IAAA,GAAO,CAAG,EAAA;AAErB,QAAG,EAAA,CAAA,KAAA,GAAQ,GAAG,KAAM,CAAA,KAAA;AAAA;AAGtB,MAAO,OAAA,EAAA;AAAA;AAGT,IAAM,MAAA,OAAA,GACJ,2BAA2B,OAC3B,IAAA,WAAA,CAAY,QAAQ,GAAI,CAAA,CAAC,GAAQ,KAAA,GAAA,CAAI,IAAI,CAAA;AAE3C,IAAA,EAAA,GAAK,IAAI,aAAc,CAAA;AAAA;AAAA,MAErB,QAAU,EAAA,EAAA;AAAA,MACV,OAAO,WAAY,CAAA,KAAA;AAAA,MACnB,GAAG,yBAAA;AAAA,MACH,OAAA;AAAA,MACA;AAAA,KACD,CAAA;AACD,IAAG,EAAA,CAAA,EAAA,CAAG,UAAU,4BAA4B,CAAA;AAC5C,IAAA,WAAA,GAAc,IAAI,aAAa,CAAA;AAC/B,IAAO,OAAA,EAAA;AAAA,GACN,EAAA;AAAA,IACD,aAAA;AAAA,IACA,yBAAA;AAAA,IACA,oBAAA;AAAA,IACA,4BAAA;AAAA,IACA,EAAA;AAAA,IACA,WAAA;AAAA,IACA,WAAA;AAAA,IACA,WAAY,CAAA,OAAA;AAAA,IACZ,WAAY,CAAA,KAAA;AAAA,IACZ;AAAA,GACD,CAAA;AAED,EAAO,OAAA,UAAA;AACT;;;;"}

package/cjs/hooks/useTypeaheadSuggestions.js

@@ -10,7 +10,7 @@ const getTypeaheadParams = (table, column, text = "", selectedValues = []) => {
   return [table, column];
 };
 const useTypeaheadSuggestions = () => {
-  const { getServerAPI } = vuuUtils.useDataSource();
+  const { getServerAPI } = vuuUtils.useData();
   return react.useCallback(
     async (params) => {
       const rpcMessage = params.length === 2 ? {

package/cjs/hooks/useTypeaheadSuggestions.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTypeaheadSuggestions.js","sources":["../../src/hooks/useTypeaheadSuggestions.ts"],"sourcesContent":["import { SuggestionFetcher, TableSchemaTable } from \"@vuu-ui/vuu-data-types\";\nimport {\n  VuuRpcServiceRequest,\n  TypeaheadParams,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { useDataSource } from \"@vuu-ui/vuu-utils\";\nimport { useCallback } from \"react\";\n\nexport const getTypeaheadParams = (\n  table: TableSchemaTable,\n  column: string,\n  text = \"\",\n  selectedValues: string[] = [],\n): TypeaheadParams => {\n  if (text !== \"\" && !selectedValues.includes(text.toLowerCase())) {\n    return [table, column, text];\n  }\n  return [table, column];\n};\n\nexport const useTypeaheadSuggestions = () => {\n  const { getServerAPI } = useDataSource();\n  return useCallback<SuggestionFetcher>(\n    async (params: TypeaheadParams) => {\n      const rpcMessage: VuuRpcServiceRequest =\n        params.length === 2\n          ? {\n              type: \"RPC_CALL\",\n              service: \"TypeAheadRpcHandler\",\n              method: \"getUniqueFieldValues\",\n              params,\n            }\n          : {\n              type: \"RPC_CALL\",\n              service: \"TypeAheadRpcHandler\",\n              method: \"getUniqueFieldValuesStartingWith\",\n              params,\n            };\n\n      try {\n        const serverAPI = await getServerAPI();\n        // We don't just return serverAPI.rpcCall . In the case of an\n        // error we will be returning the rejected promise, bypassing\n        // the catch block below.\n        const response = await serverAPI.rpcCall<string[]>(rpcMessage);\n        return response;\n      } catch (err) {\n        return false;\n      }\n    },\n    [getServerAPI],\n  );\n};\n"],"names":["useDataSource","useCallback"],"mappings":";;;;;AAQa,MAAA,kBAAA,GAAqB,CAChC,KACA,EAAA,MAAA,EACA,OAAO,EACP,EAAA,cAAA,GAA2B,EACP,KAAA;AACpB,EAAI,IAAA,IAAA,KAAS,MAAM,CAAC,cAAA,CAAe,SAAS,IAAK,CAAA,WAAA,EAAa,CAAG,EAAA;AAC/D,IAAO,OAAA,CAAC,KAAO,EAAA,MAAA,EAAQ,IAAI,CAAA;AAAA;AAE7B,EAAO,OAAA,CAAC,OAAO,MAAM,CAAA;AACvB;AAEO,MAAM,0BAA0B,MAAM;AAC3C,EAAM,MAAA,EAAE,YAAa,EAAA,GAAIA,sBAAc,EAAA;AACvC,EAAO,OAAAC,iBAAA;AAAA,IACL,OAAO,MAA4B,KAAA;AACjC,MAAM,MAAA,UAAA,GACJ,MAAO,CAAA,MAAA,KAAW,CACd,GAAA;AAAA,QACE,IAAM,EAAA,UAAA;AAAA,QACN,OAAS,EAAA,qBAAA;AAAA,QACT,MAAQ,EAAA,sBAAA;AAAA,QACR;AAAA,OAEF,GAAA;AAAA,QACE,IAAM,EAAA,UAAA;AAAA,QACN,OAAS,EAAA,qBAAA;AAAA,QACT,MAAQ,EAAA,kCAAA;AAAA,QACR;AAAA,OACF;AAEN,MAAI,IAAA;AACF,QAAM,MAAA,SAAA,GAAY,MAAM,YAAa,EAAA;AAIrC,QAAA,MAAM,QAAW,GAAA,MAAM,SAAU,CAAA,OAAA,CAAkB,UAAU,CAAA;AAC7D,QAAO,OAAA,QAAA;AAAA,eACA,GAAK,EAAA;AACZ,QAAO,OAAA,KAAA;AAAA;AACT,KACF;AAAA,IACA,CAAC,YAAY;AAAA,GACf;AACF;;;;;"}
+{"version":3,"file":"useTypeaheadSuggestions.js","sources":["../../src/hooks/useTypeaheadSuggestions.ts"],"sourcesContent":["import { SuggestionFetcher, TableSchemaTable } from \"@vuu-ui/vuu-data-types\";\nimport {\n  VuuRpcServiceRequest,\n  TypeaheadParams,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { useData } from \"@vuu-ui/vuu-utils\";\nimport { useCallback } from \"react\";\n\nexport const getTypeaheadParams = (\n  table: TableSchemaTable,\n  column: string,\n  text = \"\",\n  selectedValues: string[] = [],\n): TypeaheadParams => {\n  if (text !== \"\" && !selectedValues.includes(text.toLowerCase())) {\n    return [table, column, text];\n  }\n  return [table, column];\n};\n\nexport const useTypeaheadSuggestions = () => {\n  const { getServerAPI } = useData();\n  return useCallback<SuggestionFetcher>(\n    async (params: TypeaheadParams) => {\n      const rpcMessage: VuuRpcServiceRequest =\n        params.length === 2\n          ? {\n              type: \"RPC_CALL\",\n              service: \"TypeAheadRpcHandler\",\n              method: \"getUniqueFieldValues\",\n              params,\n            }\n          : {\n              type: \"RPC_CALL\",\n              service: \"TypeAheadRpcHandler\",\n              method: \"getUniqueFieldValuesStartingWith\",\n              params,\n            };\n\n      try {\n        const serverAPI = await getServerAPI();\n        // We don't just return serverAPI.rpcCall . In the case of an\n        // error we will be returning the rejected promise, bypassing\n        // the catch block below.\n        const response = await serverAPI.rpcCall<string[]>(rpcMessage);\n        return response;\n      } catch (err) {\n        return false;\n      }\n    },\n    [getServerAPI],\n  );\n};\n"],"names":["useData","useCallback"],"mappings":";;;;;AAQa,MAAA,kBAAA,GAAqB,CAChC,KACA,EAAA,MAAA,EACA,OAAO,EACP,EAAA,cAAA,GAA2B,EACP,KAAA;AACpB,EAAI,IAAA,IAAA,KAAS,MAAM,CAAC,cAAA,CAAe,SAAS,IAAK,CAAA,WAAA,EAAa,CAAG,EAAA;AAC/D,IAAO,OAAA,CAAC,KAAO,EAAA,MAAA,EAAQ,IAAI,CAAA;AAAA;AAE7B,EAAO,OAAA,CAAC,OAAO,MAAM,CAAA;AACvB;AAEO,MAAM,0BAA0B,MAAM;AAC3C,EAAM,MAAA,EAAE,YAAa,EAAA,GAAIA,gBAAQ,EAAA;AACjC,EAAO,OAAAC,iBAAA;AAAA,IACL,OAAO,MAA4B,KAAA;AACjC,MAAM,MAAA,UAAA,GACJ,MAAO,CAAA,MAAA,KAAW,CACd,GAAA;AAAA,QACE,IAAM,EAAA,UAAA;AAAA,QACN,OAAS,EAAA,qBAAA;AAAA,QACT,MAAQ,EAAA,sBAAA;AAAA,QACR;AAAA,OAEF,GAAA;AAAA,QACE,IAAM,EAAA,UAAA;AAAA,QACN,OAAS,EAAA,qBAAA;AAAA,QACT,MAAQ,EAAA,kCAAA;AAAA,QACR;AAAA,OACF;AAEN,MAAI,IAAA;AACF,QAAM,MAAA,SAAA,GAAY,MAAM,YAAa,EAAA;AAIrC,QAAA,MAAM,QAAW,GAAA,MAAM,SAAU,CAAA,OAAA,CAAkB,UAAU,CAAA;AAC7D,QAAO,OAAA,QAAA;AAAA,eACA,GAAK,EAAA;AACZ,QAAO,OAAA,KAAA;AAAA;AACT,KACF;AAAA,IACA,CAAC,YAAY;AAAA,GACf;AACF;;;;;"}

package/cjs/hooks/useVuuMenuActions.js

@@ -1,13 +1,131 @@
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');
+var core = require('@salt-ds/core');
+var vuuContextMenu = require('@vuu-ui/vuu-context-menu');
+var vuuFilterParser = require('@vuu-ui/vuu-filter-parser');
 var vuuPopups = require('@vuu-ui/vuu-popups');
 var vuuTable = require('@vuu-ui/vuu-table');
 var vuuUtils = require('@vuu-ui/vuu-utils');
-var core = require('@salt-ds/core');
 var react = require('react');
 var SessionEditingForm = require('../session-editing-form/SessionEditingForm.js');
 
+const isRoot = (menu) => menu.name === "ROOT";
+const isCellMenu = (options) => options.context === "cell";
+const isRowMenu = (options) => options.context === "row";
+const isSelectionMenu = (options) => options.context === "selected-rows";
+const getColumnsFromOptions = (options) => {
+  if (options && typeof options === "object" && "columns" in options) {
+    return options.columns;
+  }
+};
+const isVuuMenuItem = (menu) => "rpcName" in menu;
+const isGroupMenuItem = (menu) => "menus" in menu;
+const hasFilter = ({ filter }) => typeof filter === "string" && filter.length > 0;
+const { KEY } = vuuUtils.metadataKeys;
+const getMenuItemOptions = (menu, options) => {
+  switch (menu.context) {
+    case "cell":
+      return {
+        ...menu,
+        field: options.column.name,
+        rowKey: options.row[KEY],
+        value: options.row[options.columnMap[options.column.name]]
+      };
+    case "row":
+      return {
+        ...menu,
+        columns: options.columns,
+        row: vuuUtils.dataSourceRowToDataRowDto(options.row, options.columnMap),
+        rowKey: options.row[KEY]
+      };
+    case "selected-rows":
+      return {
+        ...menu,
+        columns: options.columns
+      };
+    default:
+      return menu;
+  }
+};
+const vuuContextCompatibleWithTableLocation = (uiLocation, vuuContext, selectedRowCount = 0) => {
+  switch (uiLocation) {
+    case "grid":
+      if (vuuContext === "selected-rows") {
+        return selectedRowCount > 0;
+      } else {
+        return true;
+      }
+    case "header":
+      return vuuContext === "grid";
+    default:
+      return false;
+  }
+};
+const gridRowMeetsFilterCriteria = (context, row, selectedRows, filter, columnMap) => {
+  if (context === "cell" || context === "row") {
+    const filterPredicate = vuuFilterParser.getFilterPredicate(columnMap, filter);
+    return filterPredicate(row);
+  } else if (context === "selected-rows") {
+    if (selectedRows.length === 0) {
+      return false;
+    } else {
+      const filterPredicate = vuuFilterParser.getFilterPredicate(columnMap, filter);
+      return selectedRows.every(filterPredicate);
+    }
+  }
+  return true;
+};
+const menuShouldBeRenderedInThisContext = (menuItem, tableLocation, options) => {
+  if (isGroupMenuItem(menuItem)) {
+    return menuItem.menus.some(
+      (childMenu) => menuShouldBeRenderedInThisContext(childMenu, tableLocation, options)
+    );
+  }
+  if (!vuuContextCompatibleWithTableLocation(
+    tableLocation,
+    menuItem.context,
+    options.selectedRows?.length
+  )) {
+    return false;
+  }
+  if (tableLocation === "grid" && hasFilter(menuItem)) {
+    return gridRowMeetsFilterCriteria(
+      menuItem.context,
+      options.row,
+      options.selectedRows,
+      menuItem.filter,
+      options.columnMap
+    );
+  }
+  if (isCellMenu(menuItem) && menuItem.field !== "*") {
+    return menuItem.field === options.column.name;
+  }
+  return true;
+};
+const buildMenuDescriptorFromVuuMenu = (menu, tableLocation, options) => {
+  if (menuShouldBeRenderedInThisContext(menu, tableLocation, options)) {
+    if (isVuuMenuItem(menu)) {
+      return {
+        label: menu.name,
+        id: "MENU_RPC_CALL",
+        options: getMenuItemOptions(menu, options)
+      };
+    } else {
+      const children = menu.menus.map(
+        (childMenu) => buildMenuDescriptorFromVuuMenu(childMenu, tableLocation, options)
+      ).filter(
+        (childMenu) => childMenu !== void 0
+      );
+      if (children.length > 0) {
+        return {
+          label: menu.name,
+          children
+        };
+      }
+    }
+  }
+};
 const keyFirst = (c1, c2) => c1.isKeyField ? -1 : c2.isKeyField ? 1 : 0;
 const defaultFormConfig = {
   fields: [],
@@ -43,8 +161,8 @@ const useVuuMenuActions = ({
   dataSource,
   onRpcResponse
 }) => {
-  const { VuuDataSource } = vuuUtils.useDataSource();
-  const buildViewserverMenuOptions = react.useCallback(
+  const { VuuDataSource } = vuuUtils.useData();
+  const menuBuilder = react.useCallback(
     (location, options) => {
       const descriptors = [];
       if (dataSource) {
@@ -56,18 +174,18 @@ const useVuuMenuActions = ({
             const label = linkLabel ? linkLabel : link.toTable;
             descriptors.push({
               label: `Link to ${label}`,
-              action: "link-table",
+              id: "link-table",
               options: linkDescriptor
             });
           });
         }
-        if (menu && vuuUtils.isTableLocation(location)) {
-          const menuDescriptor = vuuUtils.buildMenuDescriptorFromVuuMenu(
+        if (menu && vuuTable.isTableLocation(location)) {
+          const menuDescriptor = buildMenuDescriptorFromVuuMenu(
             menu,
             location,
             options
           );
-          if (vuuUtils.isRoot(menu) && vuuUtils.isGroupMenuItemDescriptor(menuDescriptor)) {
+          if (isRoot(menu) && vuuContextMenu.isGroupMenuItemDescriptor(menuDescriptor)) {
             descriptors.push(...menuDescriptor.children);
           } else if (menuDescriptor) {
             descriptors.push(menuDescriptor);
@@ -148,12 +266,41 @@ const useVuuMenuActions = ({
     },
     [closeDialog, showDialog]
   );
-  const handleMenuAction = react.useCallback(
-    ({ menuId, options }) => {
-      if (clientSideMenuActionHandler?.(menuId, options)) {
+  const getMenuRpcRequest = (options) => {
+    const { rpcName } = options;
+    if (isCellMenu(options)) {
+      return {
+        field: options.field,
+        rowKey: options.rowKey,
+        rpcName,
+        value: options.value,
+        type: "VIEW_PORT_MENU_CELL_RPC"
+      };
+    } else if (isRowMenu(options)) {
+      return {
+        rowKey: options.rowKey,
+        row: options.row,
+        rpcName,
+        type: "VIEW_PORT_MENU_ROW_RPC"
+      };
+    } else if (isSelectionMenu(options)) {
+      return {
+        rpcName,
+        type: "VIEW_PORT_MENUS_SELECT_RPC"
+      };
+    } else {
+      return {
+        rpcName,
+        type: "VIEW_PORT_MENU_TABLE_RPC"
+      };
+    }
+  };
+  const menuActionHandler = react.useCallback(
+    (menuItemId, options) => {
+      if (clientSideMenuActionHandler?.(menuItemId, options)) {
         return true;
-      } else if (menuId === "MENU_RPC_CALL") {
-        const rpcRequest = vuuUtils.getMenuRpcRequest(options);
+      } else if (menuItemId === "MENU_RPC_CALL") {
+        const rpcRequest = getMenuRpcRequest(options);
         dataSource?.menuRpcCall(rpcRequest).then((rpcResponse) => {
           if (rpcResponse) {
             if (onRpcResponse?.(rpcResponse) === true) {
@@ -173,7 +320,7 @@ const useVuuMenuActions = ({
                 showBulkEditDialog(
                   dataSource,
                   rpcResponse.action.table,
-                  options.columns
+                  getColumnsFromOptions(options)
                 );
               } else if (vuuUtils.isSessionTableActionMessage(rpcResponse)) {
                 showSessionEditingForm(dataSource, rpcResponse.action);
@@ -182,14 +329,14 @@ const useVuuMenuActions = ({
           }
         });
         return true;
-      } else if (menuId === "link-table") {
+      } else if (menuItemId === "link-table") {
         if (dataSource) {
           dataSource.visualLink = options;
         }
         return true;
       } else {
         console.log(
-          `useViewServer handleMenuAction,  can't handle action type ${menuId}`
+          `useViewServer handleMenuAction,  can't handle action type ${menuItemId}`
         );
       }
       return false;
@@ -204,10 +351,12 @@ const useVuuMenuActions = ({
     ]
   );
   return {
-    buildViewserverMenuOptions,
-    handleMenuAction
+    menuBuilder,
+    menuActionHandler
   };
 };
 
+exports.isRowMenu = isRowMenu;
+exports.isSelectionMenu = isSelectionMenu;
 exports.useVuuMenuActions = useVuuMenuActions;
 //# sourceMappingURL=useVuuMenuActions.js.map