From a749efc72f57cf38e929ca251dbbc713599e8813 Mon Sep 17 00:00:00 2001 From: Zack Braksa Date: Fri, 2 Aug 2024 15:42:43 +0100 Subject: [PATCH] Simplify returned value from modify:edit actions --- dist/voxgig-model-react.es.js | 164 +++++++++++++++------------- dist/voxgig-model-react.umd.js | 164 +++++++++++++++------------- src/lib/BasicEntityEdit.tsx | 22 +--- src/lib/BasicLed.tsx | 49 +++++---- src/lib/VxgBasicEntityEditPlugin.ts | 28 ++--- src/lib/VxgBasicLedPlugin.ts | 10 +- 6 files changed, 219 insertions(+), 218 deletions(-) diff --git a/dist/voxgig-model-react.es.js b/dist/voxgig-model-react.es.js index 22682cd..e05345f 100644 --- a/dist/voxgig-model-react.es.js +++ b/dist/voxgig-model-react.es.js @@ -1030,15 +1030,21 @@ function requireReactJsxRuntime_development() { } return reactJsxRuntime_development; } -var jsxRuntime = jsxRuntime$2.exports; -"use strict"; -if (process.env.NODE_ENV === "production") { - jsxRuntime$2.exports = requireReactJsxRuntime_production_min(); -} else { - jsxRuntime$2.exports = requireReactJsxRuntime_development(); +var jsxRuntime$1 = jsxRuntime$2.exports; +var hasRequiredJsxRuntime; +function requireJsxRuntime() { + if (hasRequiredJsxRuntime) return jsxRuntime$2.exports; + hasRequiredJsxRuntime = 1; + "use strict"; + if (process.env.NODE_ENV === "production") { + jsxRuntime$2.exports = requireReactJsxRuntime_production_min(); + } else { + jsxRuntime$2.exports = requireReactJsxRuntime_development(); + } + return jsxRuntime$2.exports; } -var jsxRuntimeExports = jsxRuntime$2.exports; -const jsxRuntime$1 = /* @__PURE__ */ getDefaultExportFromCjs(jsxRuntimeExports); +var jsxRuntimeExports = requireJsxRuntime(); +const jsxRuntime = /* @__PURE__ */ getDefaultExportFromCjs(jsxRuntimeExports); var gubu_min$2 = { exports: {} }; var gubu_min = gubu_min$2.exports; (function(module, exports) { @@ -25305,7 +25311,7 @@ Object.defineProperty(ArrowDownward, "__esModule", { }); var default_1$x = ArrowDownward.default = void 0; var _createSvgIcon$x = _interopRequireDefault$x(requireCreateSvgIcon()); -var _jsxRuntime$x = jsxRuntimeExports; +var _jsxRuntime$x = requireJsxRuntime(); var _default$x = default_1$x = ArrowDownward.default = (0, _createSvgIcon$x.default)(/* @__PURE__ */ (0, _jsxRuntime$x.jsx)("path", { d: "m20 12-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8z" }), "ArrowDownward"); @@ -25318,7 +25324,7 @@ Object.defineProperty(ArrowRight, "__esModule", { }); var default_1$w = ArrowRight.default = void 0; var _createSvgIcon$w = _interopRequireDefault$w(requireCreateSvgIcon()); -var _jsxRuntime$w = jsxRuntimeExports; +var _jsxRuntime$w = requireJsxRuntime(); var _default$w = default_1$w = ArrowRight.default = (0, _createSvgIcon$w.default)(/* @__PURE__ */ (0, _jsxRuntime$w.jsx)("path", { d: "m10 17 5-5-5-5z" }), "ArrowRight"); @@ -25331,7 +25337,7 @@ Object.defineProperty(Cancel, "__esModule", { }); var default_1$v = Cancel.default = void 0; var _createSvgIcon$v = _interopRequireDefault$v(requireCreateSvgIcon()); -var _jsxRuntime$v = jsxRuntimeExports; +var _jsxRuntime$v = requireJsxRuntime(); var _default$v = default_1$v = Cancel.default = (0, _createSvgIcon$v.default)(/* @__PURE__ */ (0, _jsxRuntime$v.jsx)("path", { d: "M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2m5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12z" }), "Cancel"); @@ -25344,7 +25350,7 @@ Object.defineProperty(ChevronLeft, "__esModule", { }); var default_1$u = ChevronLeft.default = void 0; var _createSvgIcon$u = _interopRequireDefault$u(requireCreateSvgIcon()); -var _jsxRuntime$u = jsxRuntimeExports; +var _jsxRuntime$u = requireJsxRuntime(); var _default$u = default_1$u = ChevronLeft.default = (0, _createSvgIcon$u.default)(/* @__PURE__ */ (0, _jsxRuntime$u.jsx)("path", { d: "M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z" }), "ChevronLeft"); @@ -25357,7 +25363,7 @@ Object.defineProperty(ChevronRight, "__esModule", { }); var default_1$t = ChevronRight.default = void 0; var _createSvgIcon$t = _interopRequireDefault$t(requireCreateSvgIcon()); -var _jsxRuntime$t = jsxRuntimeExports; +var _jsxRuntime$t = requireJsxRuntime(); var _default$t = default_1$t = ChevronRight.default = (0, _createSvgIcon$t.default)(/* @__PURE__ */ (0, _jsxRuntime$t.jsx)("path", { d: "M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" }), "ChevronRight"); @@ -25370,7 +25376,7 @@ Object.defineProperty(ClearAll, "__esModule", { }); var default_1$s = ClearAll.default = void 0; var _createSvgIcon$s = _interopRequireDefault$s(requireCreateSvgIcon()); -var _jsxRuntime$s = jsxRuntimeExports; +var _jsxRuntime$s = requireJsxRuntime(); var _default$s = default_1$s = ClearAll.default = (0, _createSvgIcon$s.default)(/* @__PURE__ */ (0, _jsxRuntime$s.jsx)("path", { d: "M5 13h14v-2H5zm-2 4h14v-2H3zM7 7v2h14V7z" }), "ClearAll"); @@ -25383,7 +25389,7 @@ Object.defineProperty(Close, "__esModule", { }); var default_1$r = Close.default = void 0; var _createSvgIcon$r = _interopRequireDefault$r(requireCreateSvgIcon()); -var _jsxRuntime$r = jsxRuntimeExports; +var _jsxRuntime$r = requireJsxRuntime(); var _default$r = default_1$r = Close.default = (0, _createSvgIcon$r.default)(/* @__PURE__ */ (0, _jsxRuntime$r.jsx)("path", { d: "M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" }), "Close"); @@ -25396,7 +25402,7 @@ Object.defineProperty(ContentCopy, "__esModule", { }); var default_1$q = ContentCopy.default = void 0; var _createSvgIcon$q = _interopRequireDefault$q(requireCreateSvgIcon()); -var _jsxRuntime$q = jsxRuntimeExports; +var _jsxRuntime$q = requireJsxRuntime(); var _default$q = default_1$q = ContentCopy.default = (0, _createSvgIcon$q.default)(/* @__PURE__ */ (0, _jsxRuntime$q.jsx)("path", { d: "M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2m0 16H8V7h11z" }), "ContentCopy"); @@ -25409,7 +25415,7 @@ Object.defineProperty(DensityLarge, "__esModule", { }); var default_1$p = DensityLarge.default = void 0; var _createSvgIcon$p = _interopRequireDefault$p(requireCreateSvgIcon()); -var _jsxRuntime$p = jsxRuntimeExports; +var _jsxRuntime$p = requireJsxRuntime(); var _default$p = default_1$p = DensityLarge.default = (0, _createSvgIcon$p.default)(/* @__PURE__ */ (0, _jsxRuntime$p.jsx)("path", { d: "M3 3h18v2H3zm0 16h18v2H3z" }), "DensityLarge"); @@ -25422,7 +25428,7 @@ Object.defineProperty(DensityMedium, "__esModule", { }); var default_1$o = DensityMedium.default = void 0; var _createSvgIcon$o = _interopRequireDefault$o(requireCreateSvgIcon()); -var _jsxRuntime$o = jsxRuntimeExports; +var _jsxRuntime$o = requireJsxRuntime(); var _default$o = default_1$o = DensityMedium.default = (0, _createSvgIcon$o.default)(/* @__PURE__ */ (0, _jsxRuntime$o.jsx)("path", { d: "M3 3h18v2H3zm0 16h18v2H3zm0-8h18v2H3z" }), "DensityMedium"); @@ -25435,7 +25441,7 @@ Object.defineProperty(DensitySmall, "__esModule", { }); var default_1$n = DensitySmall.default = void 0; var _createSvgIcon$n = _interopRequireDefault$n(requireCreateSvgIcon()); -var _jsxRuntime$n = jsxRuntimeExports; +var _jsxRuntime$n = requireJsxRuntime(); var _default$n = default_1$n = DensitySmall.default = (0, _createSvgIcon$n.default)(/* @__PURE__ */ (0, _jsxRuntime$n.jsx)("path", { d: "M3 2h18v2H3zm0 18h18v2H3zm0-6h18v2H3zm0-6h18v2H3z" }), "DensitySmall"); @@ -25448,7 +25454,7 @@ Object.defineProperty(DragHandle, "__esModule", { }); var default_1$m = DragHandle.default = void 0; var _createSvgIcon$m = _interopRequireDefault$m(requireCreateSvgIcon()); -var _jsxRuntime$m = jsxRuntimeExports; +var _jsxRuntime$m = requireJsxRuntime(); var _default$m = default_1$m = DragHandle.default = (0, _createSvgIcon$m.default)(/* @__PURE__ */ (0, _jsxRuntime$m.jsx)("path", { d: "M20 9H4v2h16zM4 15h16v-2H4z" }), "DragHandle"); @@ -25461,7 +25467,7 @@ Object.defineProperty(DynamicFeed, "__esModule", { }); var default_1$l = DynamicFeed.default = void 0; var _createSvgIcon$l = _interopRequireDefault$l(requireCreateSvgIcon()); -var _jsxRuntime$l = jsxRuntimeExports; +var _jsxRuntime$l = requireJsxRuntime(); var _default$l = default_1$l = DynamicFeed.default = (0, _createSvgIcon$l.default)([/* @__PURE__ */ (0, _jsxRuntime$l.jsx)("path", { d: "M8 8H6v7c0 1.1.9 2 2 2h9v-2H8z" }, "0"), /* @__PURE__ */ (0, _jsxRuntime$l.jsx)("path", { @@ -25476,7 +25482,7 @@ Object.defineProperty(Edit, "__esModule", { }); var default_1$k = Edit.default = void 0; var _createSvgIcon$k = _interopRequireDefault$k(requireCreateSvgIcon()); -var _jsxRuntime$k = jsxRuntimeExports; +var _jsxRuntime$k = requireJsxRuntime(); var _default$k = default_1$k = Edit.default = (0, _createSvgIcon$k.default)(/* @__PURE__ */ (0, _jsxRuntime$k.jsx)("path", { d: "M3 17.25V21h3.75L17.81 9.94l-3.75-3.75zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.9959.9959 0 0 0-1.41 0l-1.83 1.83 3.75 3.75z" }), "Edit"); @@ -25489,7 +25495,7 @@ Object.defineProperty(ExpandMore, "__esModule", { }); var default_1$j = ExpandMore.default = void 0; var _createSvgIcon$j = _interopRequireDefault$j(requireCreateSvgIcon()); -var _jsxRuntime$j = jsxRuntimeExports; +var _jsxRuntime$j = requireJsxRuntime(); var _default$j = default_1$j = ExpandMore.default = (0, _createSvgIcon$j.default)(/* @__PURE__ */ (0, _jsxRuntime$j.jsx)("path", { d: "M16.59 8.59 12 13.17 7.41 8.59 6 10l6 6 6-6z" }), "ExpandMore"); @@ -25502,7 +25508,7 @@ Object.defineProperty(FilterAlt, "__esModule", { }); var default_1$i = FilterAlt.default = void 0; var _createSvgIcon$i = _interopRequireDefault$i(requireCreateSvgIcon()); -var _jsxRuntime$i = jsxRuntimeExports; +var _jsxRuntime$i = requireJsxRuntime(); var _default$i = default_1$i = FilterAlt.default = (0, _createSvgIcon$i.default)(/* @__PURE__ */ (0, _jsxRuntime$i.jsx)("path", { d: "M4.25 5.61C6.27 8.2 10 13 10 13v6c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-6s3.72-4.8 5.74-7.39c.51-.66.04-1.61-.79-1.61H5.04c-.83 0-1.3.95-.79 1.61" }), "FilterAlt"); @@ -25515,7 +25521,7 @@ Object.defineProperty(FilterList, "__esModule", { }); var default_1$h = FilterList.default = void 0; var _createSvgIcon$h = _interopRequireDefault$h(requireCreateSvgIcon()); -var _jsxRuntime$h = jsxRuntimeExports; +var _jsxRuntime$h = requireJsxRuntime(); var _default$h = default_1$h = FilterList.default = (0, _createSvgIcon$h.default)(/* @__PURE__ */ (0, _jsxRuntime$h.jsx)("path", { d: "M10 18h4v-2h-4zM3 6v2h18V6zm3 7h12v-2H6z" }), "FilterList"); @@ -25528,7 +25534,7 @@ Object.defineProperty(FilterListOff, "__esModule", { }); var default_1$g = FilterListOff.default = void 0; var _createSvgIcon$g = _interopRequireDefault$g(requireCreateSvgIcon()); -var _jsxRuntime$g = jsxRuntimeExports; +var _jsxRuntime$g = requireJsxRuntime(); var _default$g = default_1$g = FilterListOff.default = (0, _createSvgIcon$g.default)(/* @__PURE__ */ (0, _jsxRuntime$g.jsx)("path", { d: "M10.83 8H21V6H8.83zm5 5H18v-2h-4.17zM14 16.83V18h-4v-2h3.17l-3-3H6v-2h2.17l-3-3H3V6h.17L1.39 4.22 2.8 2.81l18.38 18.38-1.41 1.41z" }), "FilterListOff"); @@ -25541,7 +25547,7 @@ Object.defineProperty(FirstPage, "__esModule", { }); var default_1$f = FirstPage.default = void 0; var _createSvgIcon$f = _interopRequireDefault$f(requireCreateSvgIcon()); -var _jsxRuntime$f = jsxRuntimeExports; +var _jsxRuntime$f = requireJsxRuntime(); var _default$f = default_1$f = FirstPage.default = (0, _createSvgIcon$f.default)(/* @__PURE__ */ (0, _jsxRuntime$f.jsx)("path", { d: "M18.41 16.59 13.82 12l4.59-4.59L17 6l-6 6 6 6zM6 6h2v12H6z" }), "FirstPage"); @@ -25554,7 +25560,7 @@ Object.defineProperty(Fullscreen, "__esModule", { }); var default_1$e = Fullscreen.default = void 0; var _createSvgIcon$e = _interopRequireDefault$e(requireCreateSvgIcon()); -var _jsxRuntime$e = jsxRuntimeExports; +var _jsxRuntime$e = requireJsxRuntime(); var _default$e = default_1$e = Fullscreen.default = (0, _createSvgIcon$e.default)(/* @__PURE__ */ (0, _jsxRuntime$e.jsx)("path", { d: "M7 14H5v5h5v-2H7zm-2-4h2V7h3V5H5zm12 7h-3v2h5v-5h-2zM14 5v2h3v3h2V5z" }), "Fullscreen"); @@ -25567,7 +25573,7 @@ Object.defineProperty(FullscreenExit, "__esModule", { }); var default_1$d = FullscreenExit.default = void 0; var _createSvgIcon$d = _interopRequireDefault$d(requireCreateSvgIcon()); -var _jsxRuntime$d = jsxRuntimeExports; +var _jsxRuntime$d = requireJsxRuntime(); var _default$d = default_1$d = FullscreenExit.default = (0, _createSvgIcon$d.default)(/* @__PURE__ */ (0, _jsxRuntime$d.jsx)("path", { d: "M5 16h3v3h2v-5H5zm3-8H5v2h5V5H8zm6 11h2v-3h3v-2h-5zm2-11V5h-2v5h5V8z" }), "FullscreenExit"); @@ -25580,7 +25586,7 @@ Object.defineProperty(KeyboardDoubleArrowDown, "__esModule", { }); var default_1$c = KeyboardDoubleArrowDown.default = void 0; var _createSvgIcon$c = _interopRequireDefault$c(requireCreateSvgIcon()); -var _jsxRuntime$c = jsxRuntimeExports; +var _jsxRuntime$c = requireJsxRuntime(); var _default$c = default_1$c = KeyboardDoubleArrowDown.default = (0, _createSvgIcon$c.default)([/* @__PURE__ */ (0, _jsxRuntime$c.jsx)("path", { d: "M18 6.41 16.59 5 12 9.58 7.41 5 6 6.41l6 6z" }, "0"), /* @__PURE__ */ (0, _jsxRuntime$c.jsx)("path", { @@ -25595,7 +25601,7 @@ Object.defineProperty(LastPage, "__esModule", { }); var default_1$b = LastPage.default = void 0; var _createSvgIcon$b = _interopRequireDefault$b(requireCreateSvgIcon()); -var _jsxRuntime$b = jsxRuntimeExports; +var _jsxRuntime$b = requireJsxRuntime(); var _default$b = default_1$b = LastPage.default = (0, _createSvgIcon$b.default)(/* @__PURE__ */ (0, _jsxRuntime$b.jsx)("path", { d: "M5.59 7.41 10.18 12l-4.59 4.59L7 18l6-6-6-6zM16 6h2v12h-2z" }), "LastPage"); @@ -25608,7 +25614,7 @@ Object.defineProperty(MoreHoriz, "__esModule", { }); var default_1$a = MoreHoriz.default = void 0; var _createSvgIcon$a = _interopRequireDefault$a(requireCreateSvgIcon()); -var _jsxRuntime$a = jsxRuntimeExports; +var _jsxRuntime$a = requireJsxRuntime(); var _default$a = default_1$a = MoreHoriz.default = (0, _createSvgIcon$a.default)(/* @__PURE__ */ (0, _jsxRuntime$a.jsx)("path", { d: "M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" }), "MoreHoriz"); @@ -25621,7 +25627,7 @@ Object.defineProperty(MoreVert, "__esModule", { }); var default_1$9 = MoreVert.default = void 0; var _createSvgIcon$9 = _interopRequireDefault$9(requireCreateSvgIcon()); -var _jsxRuntime$9 = jsxRuntimeExports; +var _jsxRuntime$9 = requireJsxRuntime(); var _default$9 = default_1$9 = MoreVert.default = (0, _createSvgIcon$9.default)(/* @__PURE__ */ (0, _jsxRuntime$9.jsx)("path", { d: "M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" }), "MoreVert"); @@ -25634,7 +25640,7 @@ Object.defineProperty(PushPin, "__esModule", { }); var default_1$8 = PushPin.default = void 0; var _createSvgIcon$8 = _interopRequireDefault$8(requireCreateSvgIcon()); -var _jsxRuntime$8 = jsxRuntimeExports; +var _jsxRuntime$8 = requireJsxRuntime(); var _default$8 = default_1$8 = PushPin.default = (0, _createSvgIcon$8.default)(/* @__PURE__ */ (0, _jsxRuntime$8.jsx)("path", { fillRule: "evenodd", d: "M16 9V4h1c.55 0 1-.45 1-1s-.45-1-1-1H7c-.55 0-1 .45-1 1s.45 1 1 1h1v5c0 1.66-1.34 3-3 3v2h5.97v7l1 1 1-1v-7H19v-2c-1.66 0-3-1.34-3-3" @@ -25648,7 +25654,7 @@ Object.defineProperty(RestartAlt, "__esModule", { }); var default_1$7 = RestartAlt.default = void 0; var _createSvgIcon$7 = _interopRequireDefault$7(requireCreateSvgIcon()); -var _jsxRuntime$7 = jsxRuntimeExports; +var _jsxRuntime$7 = requireJsxRuntime(); var _default$7 = default_1$7 = RestartAlt.default = (0, _createSvgIcon$7.default)(/* @__PURE__ */ (0, _jsxRuntime$7.jsx)("path", { d: "M12 5V2L8 6l4 4V7c3.31 0 6 2.69 6 6 0 2.97-2.17 5.43-5 5.91v2.02c3.95-.49 7-3.85 7-7.93 0-4.42-3.58-8-8-8m-6 8c0-1.65.67-3.15 1.76-4.24L6.34 7.34C4.9 8.79 4 10.79 4 13c0 4.08 3.05 7.44 7 7.93v-2.02c-2.83-.48-5-2.94-5-5.91" }), "RestartAlt"); @@ -25661,7 +25667,7 @@ Object.defineProperty(Save, "__esModule", { }); var default_1$6 = Save.default = void 0; var _createSvgIcon$6 = _interopRequireDefault$6(requireCreateSvgIcon()); -var _jsxRuntime$6 = jsxRuntimeExports; +var _jsxRuntime$6 = requireJsxRuntime(); var _default$6 = default_1$6 = Save.default = (0, _createSvgIcon$6.default)(/* @__PURE__ */ (0, _jsxRuntime$6.jsx)("path", { d: "M17 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V7zm-5 16c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3m3-10H5V5h10z" }), "Save"); @@ -25674,7 +25680,7 @@ Object.defineProperty(Search, "__esModule", { }); var default_1$5 = Search.default = void 0; var _createSvgIcon$5 = _interopRequireDefault$5(requireCreateSvgIcon()); -var _jsxRuntime$5 = jsxRuntimeExports; +var _jsxRuntime$5 = requireJsxRuntime(); var _default$5 = default_1$5 = Search.default = (0, _createSvgIcon$5.default)(/* @__PURE__ */ (0, _jsxRuntime$5.jsx)("path", { d: "M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14" }), "Search"); @@ -25687,7 +25693,7 @@ Object.defineProperty(SearchOff, "__esModule", { }); var default_1$4 = SearchOff.default = void 0; var _createSvgIcon$4 = _interopRequireDefault$4(requireCreateSvgIcon()); -var _jsxRuntime$4 = jsxRuntimeExports; +var _jsxRuntime$4 = requireJsxRuntime(); var _default$4 = default_1$4 = SearchOff.default = (0, _createSvgIcon$4.default)([/* @__PURE__ */ (0, _jsxRuntime$4.jsx)("path", { d: "M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3 6.08 3 3.28 5.64 3.03 9h2.02C5.3 6.75 7.18 5 9.5 5 11.99 5 14 7.01 14 9.5S11.99 14 9.5 14c-.17 0-.33-.03-.5-.05v2.02c.17.02.33.03.5.03 1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19z" }, "0"), /* @__PURE__ */ (0, _jsxRuntime$4.jsx)("path", { @@ -25702,7 +25708,7 @@ Object.defineProperty(Sort, "__esModule", { }); var default_1$3 = Sort.default = void 0; var _createSvgIcon$3 = _interopRequireDefault$3(requireCreateSvgIcon()); -var _jsxRuntime$3 = jsxRuntimeExports; +var _jsxRuntime$3 = requireJsxRuntime(); var _default$3 = default_1$3 = Sort.default = (0, _createSvgIcon$3.default)(/* @__PURE__ */ (0, _jsxRuntime$3.jsx)("path", { d: "M3 18h6v-2H3zM3 6v2h18V6zm0 7h12v-2H3z" }), "Sort"); @@ -25715,7 +25721,7 @@ Object.defineProperty(SyncAlt, "__esModule", { }); var default_1$2 = SyncAlt.default = void 0; var _createSvgIcon$2 = _interopRequireDefault$2(requireCreateSvgIcon()); -var _jsxRuntime$2 = jsxRuntimeExports; +var _jsxRuntime$2 = requireJsxRuntime(); var _default$2 = default_1$2 = SyncAlt.default = (0, _createSvgIcon$2.default)(/* @__PURE__ */ (0, _jsxRuntime$2.jsx)("path", { d: "m18 12 4-4-4-4v3H3v2h15zM6 12l-4 4 4 4v-3h15v-2H6z" }), "SyncAlt"); @@ -25728,7 +25734,7 @@ Object.defineProperty(ViewColumn, "__esModule", { }); var default_1$1 = ViewColumn.default = void 0; var _createSvgIcon$1 = _interopRequireDefault$1(requireCreateSvgIcon()); -var _jsxRuntime$1 = jsxRuntimeExports; +var _jsxRuntime$1 = requireJsxRuntime(); var _default$1 = default_1$1 = ViewColumn.default = (0, _createSvgIcon$1.default)(/* @__PURE__ */ (0, _jsxRuntime$1.jsx)("path", { d: "M14.67 5v14H9.33V5zm1 14H21V5h-5.33zm-7.34 0V5H3v14z" }), "ViewColumn"); @@ -25741,7 +25747,7 @@ Object.defineProperty(VisibilityOff, "__esModule", { }); var default_1 = VisibilityOff.default = void 0; var _createSvgIcon = _interopRequireDefault(requireCreateSvgIcon()); -var _jsxRuntime = jsxRuntimeExports; +var _jsxRuntime = requireJsxRuntime(); var _default = default_1 = VisibilityOff.default = (0, _createSvgIcon.default)(/* @__PURE__ */ (0, _jsxRuntime.jsx)("path", { d: "M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89 3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74.25-3.98.7l2.16 2.16C10.74 7.13 11.35 7 12 7M2 4.27l2.28 2.28.46.46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5 11 7.5 1.55 0 3.03-.3 4.38-.84l.42.42L19.73 22 21 20.73 3.27 3zM7.53 9.8l1.55 1.55c-.05.21-.08.43-.08.65 0 1.66 1.34 3 3 3 .22 0 .44-.03.65-.08l1.55 1.55c-.67.33-1.41.53-2.2.53-2.76 0-5-2.24-5-5 0-.79.2-1.53.53-2.2m4.31-.78 3.15 3.15.02-.16c0-1.66-1.34-3-3-3z" }), "VisibilityOff"); @@ -64872,10 +64878,10 @@ function BasicEntitySliderField(props) { const { spec } = props; const basicEntityAutocompleteField = BasicEntitySliderFieldSpecShape(spec); const { control, field, getValues, errors } = basicEntityAutocompleteField; - const val = getValues(field.name); + const val = getValues(field.name + "_uival$"); const err = errors[field.name]; const { field: controllerField } = useController({ - name: field.name, + name: field.name + "_uival$", control, defaultValue: val || field.ux.min }); @@ -65660,15 +65666,14 @@ function VxgBasicEntityEditPlugin(options) { function modify_edit_Date(msg) { return __async(this, null, function* () { const out = yield this.prior(msg); - let { item } = out; - item = __spreadValues({}, item); + let item = __spreadValues({}, out); if (!item[field.name + "_orig$"]) { const dt = util$1.dateTimeFromUTC(item[field.name]); item[field.name + "_orig$"] = item[field.name]; item[field.name + "_udm$"] = dt.udm; item[field.name] = dt.localt; } - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }); } ); @@ -65678,15 +65683,14 @@ function VxgBasicEntityEditPlugin(options) { function modify_edit_Time(msg) { return __async(this, null, function* () { const out = yield this.prior(msg); - let { item } = out; - item = __spreadValues({}, item); + let item = __spreadValues({}, out); if (!item[field.name + "_orig$"]) { const dt = util$1.dateTimeFromUTC(item[field.name]); item[field.name + "_orig$"] = item[field.name]; item[field.name + "_udm$"] = dt.udm; item[field.name] = dt.localt; } - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }); } ); @@ -65696,31 +65700,30 @@ function VxgBasicEntityEditPlugin(options) { function modify_edit_Datetime(msg) { return __async(this, null, function* () { const out = yield this.prior(msg); - let { item } = out; - item = __spreadValues({}, item); + console.log("out", out); + let item = __spreadValues({}, out); if (!item[field.name + "_orig$"]) { const dt = util$1.dateTimeFromUTC(item[field.name]); item[field.name + "_orig$"] = item[field.name]; item[field.name + "_udm$"] = dt.udm; item[field.name] = dt.locald + "T" + dt.localt; } - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }); } ); } else if ("Slider" === field.ux.kind) { seneca.add( - "aim:app,on:BasicLed,modify:edit,view:" + spec.name, + "aim:app,on:BasicLed,modify:edit", + { view: spec.name }, function modify_edit_Slider(msg) { return __async(this, null, function* () { const out = yield this.prior(msg); - let { item } = out; - item = __spreadValues({}, item); - if (!item[field.name + "_orig$"]) { - item[field.name + "_orig$"] = item[field.name]; - item[field.name] = Number(item[field.name]) / 60; + let item = __spreadValues({}, out); + if (!item[field.name + "_uival$"]) { + item[field.name + "_uival$"] = Number(item[field.name]) / 60; } - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }); } ); @@ -65794,6 +65797,7 @@ const makeResolver = (seneca, spec) => useCallback( const { ent, name } = spec; const view = name; let entity = seneca.entity(ent); + console.log("makeResolver", "data", data); entity = entity.make$().data$(data); let errors = entity.valid$({ errors: true }); seneca.act("aim:app,on:BasicLed,entity:valid", { @@ -65847,25 +65851,17 @@ function BasicEntityEdit(props) { let item = useSelector((state) => selectItem(state)); useEffect(() => { const fetchData = () => __async(this, null, function* () { - console.log( - "BasicEntityEdit", - "useEffect", - "modify:edit", - "init", - "view", - name, - "item", - item == null ? void 0 : item.title - ); + console.log("BEE", "effect", "mod:edit", "init", "view", name); + console.log("BEE", "effect", "mod:edit", "init", "item", item == null ? void 0 : item.title); if (item && name) { - const res = yield seneca.direct("aim:app,on:BasicLed,modify:edit", { + item = yield seneca.direct("aim:app,on:BasicLed,modify:edit", { view: name, item, fields }); - item = res.item; + console.log("BEE", "effect", "resetting", item); + reset(item); } - reset(item); }); fetchData(); }, [item, name]); @@ -66079,7 +66075,7 @@ function VxgBasicLedPlugin(options) { let item = msg.item; if (null == item) return item; item = __spreadValues({}, item); - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }).add("aim:app,on:BasicLed,modify:save", function modify_save(msg) { let item = msg.data; let fields = msg.fields; @@ -66089,7 +66085,7 @@ function VxgBasicLedPlugin(options) { if ("Slider" === field.ux.kind) { console.log("VxgBasicLedPlugin", "modify:save", "field", field); console.log("VxgBasicLedPlugin", "modify:save", "item", item); - item[field.name] = Number(item[field.name]) * 60; + item[field.name] = Number(item[field.name + "_uival$"]) * 60; } } console.log("modify:save", "item", item); @@ -66127,7 +66123,7 @@ function VxgBasicLedPlugin(options) { return __async(this, null, function* () { const data = Object.entries(spec.def.edit.field).filter((n) => false !== n[1].ux.edit).reduce((a, n) => (a[n[0]] = msg.data[n[0]], a), {}); const item = yield seneca.entity(entCanon).save$(data); - navigate("/view/" + name); + navigate("/view/" + name + "/edit/" + item.id); }); } ); @@ -66184,8 +66180,20 @@ function BasicLed(props) { head.active && /* @__PURE__ */ jsxRuntimeExports.jsx(BasicLedHead, { ctx, spec: head }), /* @__PURE__ */ jsxRuntimeExports.jsxs(Routes, { children: [ /* @__PURE__ */ jsxRuntimeExports.jsx(Route, { path: "/", element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityList, { ctx, spec: list }) }), - /* @__PURE__ */ jsxRuntimeExports.jsx(Route, { path: "/edit/:item", element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityEdit, { ctx, spec: edit }) }), - /* @__PURE__ */ jsxRuntimeExports.jsx(Route, { path: "/add", element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityEdit, { ctx, spec: edit }) }) + /* @__PURE__ */ jsxRuntimeExports.jsx( + Route, + { + path: "/edit/:item", + element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityEdit, { ctx, spec: edit }) + } + ), + /* @__PURE__ */ jsxRuntimeExports.jsx( + Route, + { + path: "/add", + element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityEdit, { ctx, spec: edit }) + } + ) ] }), foot.active && /* @__PURE__ */ jsxRuntimeExports.jsx(BasicLedFoot, { ctx, spec: foot }) ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx(BasicLoading, {}); diff --git a/dist/voxgig-model-react.umd.js b/dist/voxgig-model-react.umd.js index be8768e..cb0c7da 100644 --- a/dist/voxgig-model-react.umd.js +++ b/dist/voxgig-model-react.umd.js @@ -1042,15 +1042,21 @@ var __async = (__this, __arguments, generator) => { } return reactJsxRuntime_development; } - var jsxRuntime = jsxRuntime$2.exports; - "use strict"; - if (process.env.NODE_ENV === "production") { - jsxRuntime$2.exports = requireReactJsxRuntime_production_min(); - } else { - jsxRuntime$2.exports = requireReactJsxRuntime_development(); + var jsxRuntime$1 = jsxRuntime$2.exports; + var hasRequiredJsxRuntime; + function requireJsxRuntime() { + if (hasRequiredJsxRuntime) return jsxRuntime$2.exports; + hasRequiredJsxRuntime = 1; + "use strict"; + if (process.env.NODE_ENV === "production") { + jsxRuntime$2.exports = requireReactJsxRuntime_production_min(); + } else { + jsxRuntime$2.exports = requireReactJsxRuntime_development(); + } + return jsxRuntime$2.exports; } - var jsxRuntimeExports = jsxRuntime$2.exports; - const jsxRuntime$1 = /* @__PURE__ */ getDefaultExportFromCjs(jsxRuntimeExports); + var jsxRuntimeExports = requireJsxRuntime(); + const jsxRuntime = /* @__PURE__ */ getDefaultExportFromCjs(jsxRuntimeExports); var gubu_min$2 = { exports: {} }; var gubu_min = gubu_min$2.exports; (function(module2, exports3) { @@ -25317,7 +25323,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$x = ArrowDownward.default = void 0; var _createSvgIcon$x = _interopRequireDefault$x(requireCreateSvgIcon()); - var _jsxRuntime$x = jsxRuntimeExports; + var _jsxRuntime$x = requireJsxRuntime(); var _default$x = default_1$x = ArrowDownward.default = (0, _createSvgIcon$x.default)(/* @__PURE__ */ (0, _jsxRuntime$x.jsx)("path", { d: "m20 12-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8z" }), "ArrowDownward"); @@ -25330,7 +25336,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$w = ArrowRight.default = void 0; var _createSvgIcon$w = _interopRequireDefault$w(requireCreateSvgIcon()); - var _jsxRuntime$w = jsxRuntimeExports; + var _jsxRuntime$w = requireJsxRuntime(); var _default$w = default_1$w = ArrowRight.default = (0, _createSvgIcon$w.default)(/* @__PURE__ */ (0, _jsxRuntime$w.jsx)("path", { d: "m10 17 5-5-5-5z" }), "ArrowRight"); @@ -25343,7 +25349,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$v = Cancel.default = void 0; var _createSvgIcon$v = _interopRequireDefault$v(requireCreateSvgIcon()); - var _jsxRuntime$v = jsxRuntimeExports; + var _jsxRuntime$v = requireJsxRuntime(); var _default$v = default_1$v = Cancel.default = (0, _createSvgIcon$v.default)(/* @__PURE__ */ (0, _jsxRuntime$v.jsx)("path", { d: "M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2m5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12z" }), "Cancel"); @@ -25356,7 +25362,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$u = ChevronLeft.default = void 0; var _createSvgIcon$u = _interopRequireDefault$u(requireCreateSvgIcon()); - var _jsxRuntime$u = jsxRuntimeExports; + var _jsxRuntime$u = requireJsxRuntime(); var _default$u = default_1$u = ChevronLeft.default = (0, _createSvgIcon$u.default)(/* @__PURE__ */ (0, _jsxRuntime$u.jsx)("path", { d: "M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z" }), "ChevronLeft"); @@ -25369,7 +25375,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$t = ChevronRight.default = void 0; var _createSvgIcon$t = _interopRequireDefault$t(requireCreateSvgIcon()); - var _jsxRuntime$t = jsxRuntimeExports; + var _jsxRuntime$t = requireJsxRuntime(); var _default$t = default_1$t = ChevronRight.default = (0, _createSvgIcon$t.default)(/* @__PURE__ */ (0, _jsxRuntime$t.jsx)("path", { d: "M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" }), "ChevronRight"); @@ -25382,7 +25388,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$s = ClearAll.default = void 0; var _createSvgIcon$s = _interopRequireDefault$s(requireCreateSvgIcon()); - var _jsxRuntime$s = jsxRuntimeExports; + var _jsxRuntime$s = requireJsxRuntime(); var _default$s = default_1$s = ClearAll.default = (0, _createSvgIcon$s.default)(/* @__PURE__ */ (0, _jsxRuntime$s.jsx)("path", { d: "M5 13h14v-2H5zm-2 4h14v-2H3zM7 7v2h14V7z" }), "ClearAll"); @@ -25395,7 +25401,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$r = Close.default = void 0; var _createSvgIcon$r = _interopRequireDefault$r(requireCreateSvgIcon()); - var _jsxRuntime$r = jsxRuntimeExports; + var _jsxRuntime$r = requireJsxRuntime(); var _default$r = default_1$r = Close.default = (0, _createSvgIcon$r.default)(/* @__PURE__ */ (0, _jsxRuntime$r.jsx)("path", { d: "M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" }), "Close"); @@ -25408,7 +25414,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$q = ContentCopy.default = void 0; var _createSvgIcon$q = _interopRequireDefault$q(requireCreateSvgIcon()); - var _jsxRuntime$q = jsxRuntimeExports; + var _jsxRuntime$q = requireJsxRuntime(); var _default$q = default_1$q = ContentCopy.default = (0, _createSvgIcon$q.default)(/* @__PURE__ */ (0, _jsxRuntime$q.jsx)("path", { d: "M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2m0 16H8V7h11z" }), "ContentCopy"); @@ -25421,7 +25427,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$p = DensityLarge.default = void 0; var _createSvgIcon$p = _interopRequireDefault$p(requireCreateSvgIcon()); - var _jsxRuntime$p = jsxRuntimeExports; + var _jsxRuntime$p = requireJsxRuntime(); var _default$p = default_1$p = DensityLarge.default = (0, _createSvgIcon$p.default)(/* @__PURE__ */ (0, _jsxRuntime$p.jsx)("path", { d: "M3 3h18v2H3zm0 16h18v2H3z" }), "DensityLarge"); @@ -25434,7 +25440,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$o = DensityMedium.default = void 0; var _createSvgIcon$o = _interopRequireDefault$o(requireCreateSvgIcon()); - var _jsxRuntime$o = jsxRuntimeExports; + var _jsxRuntime$o = requireJsxRuntime(); var _default$o = default_1$o = DensityMedium.default = (0, _createSvgIcon$o.default)(/* @__PURE__ */ (0, _jsxRuntime$o.jsx)("path", { d: "M3 3h18v2H3zm0 16h18v2H3zm0-8h18v2H3z" }), "DensityMedium"); @@ -25447,7 +25453,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$n = DensitySmall.default = void 0; var _createSvgIcon$n = _interopRequireDefault$n(requireCreateSvgIcon()); - var _jsxRuntime$n = jsxRuntimeExports; + var _jsxRuntime$n = requireJsxRuntime(); var _default$n = default_1$n = DensitySmall.default = (0, _createSvgIcon$n.default)(/* @__PURE__ */ (0, _jsxRuntime$n.jsx)("path", { d: "M3 2h18v2H3zm0 18h18v2H3zm0-6h18v2H3zm0-6h18v2H3z" }), "DensitySmall"); @@ -25460,7 +25466,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$m = DragHandle.default = void 0; var _createSvgIcon$m = _interopRequireDefault$m(requireCreateSvgIcon()); - var _jsxRuntime$m = jsxRuntimeExports; + var _jsxRuntime$m = requireJsxRuntime(); var _default$m = default_1$m = DragHandle.default = (0, _createSvgIcon$m.default)(/* @__PURE__ */ (0, _jsxRuntime$m.jsx)("path", { d: "M20 9H4v2h16zM4 15h16v-2H4z" }), "DragHandle"); @@ -25473,7 +25479,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$l = DynamicFeed.default = void 0; var _createSvgIcon$l = _interopRequireDefault$l(requireCreateSvgIcon()); - var _jsxRuntime$l = jsxRuntimeExports; + var _jsxRuntime$l = requireJsxRuntime(); var _default$l = default_1$l = DynamicFeed.default = (0, _createSvgIcon$l.default)([/* @__PURE__ */ (0, _jsxRuntime$l.jsx)("path", { d: "M8 8H6v7c0 1.1.9 2 2 2h9v-2H8z" }, "0"), /* @__PURE__ */ (0, _jsxRuntime$l.jsx)("path", { @@ -25488,7 +25494,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$k = Edit.default = void 0; var _createSvgIcon$k = _interopRequireDefault$k(requireCreateSvgIcon()); - var _jsxRuntime$k = jsxRuntimeExports; + var _jsxRuntime$k = requireJsxRuntime(); var _default$k = default_1$k = Edit.default = (0, _createSvgIcon$k.default)(/* @__PURE__ */ (0, _jsxRuntime$k.jsx)("path", { d: "M3 17.25V21h3.75L17.81 9.94l-3.75-3.75zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.9959.9959 0 0 0-1.41 0l-1.83 1.83 3.75 3.75z" }), "Edit"); @@ -25501,7 +25507,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$j = ExpandMore.default = void 0; var _createSvgIcon$j = _interopRequireDefault$j(requireCreateSvgIcon()); - var _jsxRuntime$j = jsxRuntimeExports; + var _jsxRuntime$j = requireJsxRuntime(); var _default$j = default_1$j = ExpandMore.default = (0, _createSvgIcon$j.default)(/* @__PURE__ */ (0, _jsxRuntime$j.jsx)("path", { d: "M16.59 8.59 12 13.17 7.41 8.59 6 10l6 6 6-6z" }), "ExpandMore"); @@ -25514,7 +25520,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$i = FilterAlt.default = void 0; var _createSvgIcon$i = _interopRequireDefault$i(requireCreateSvgIcon()); - var _jsxRuntime$i = jsxRuntimeExports; + var _jsxRuntime$i = requireJsxRuntime(); var _default$i = default_1$i = FilterAlt.default = (0, _createSvgIcon$i.default)(/* @__PURE__ */ (0, _jsxRuntime$i.jsx)("path", { d: "M4.25 5.61C6.27 8.2 10 13 10 13v6c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-6s3.72-4.8 5.74-7.39c.51-.66.04-1.61-.79-1.61H5.04c-.83 0-1.3.95-.79 1.61" }), "FilterAlt"); @@ -25527,7 +25533,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$h = FilterList.default = void 0; var _createSvgIcon$h = _interopRequireDefault$h(requireCreateSvgIcon()); - var _jsxRuntime$h = jsxRuntimeExports; + var _jsxRuntime$h = requireJsxRuntime(); var _default$h = default_1$h = FilterList.default = (0, _createSvgIcon$h.default)(/* @__PURE__ */ (0, _jsxRuntime$h.jsx)("path", { d: "M10 18h4v-2h-4zM3 6v2h18V6zm3 7h12v-2H6z" }), "FilterList"); @@ -25540,7 +25546,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$g = FilterListOff.default = void 0; var _createSvgIcon$g = _interopRequireDefault$g(requireCreateSvgIcon()); - var _jsxRuntime$g = jsxRuntimeExports; + var _jsxRuntime$g = requireJsxRuntime(); var _default$g = default_1$g = FilterListOff.default = (0, _createSvgIcon$g.default)(/* @__PURE__ */ (0, _jsxRuntime$g.jsx)("path", { d: "M10.83 8H21V6H8.83zm5 5H18v-2h-4.17zM14 16.83V18h-4v-2h3.17l-3-3H6v-2h2.17l-3-3H3V6h.17L1.39 4.22 2.8 2.81l18.38 18.38-1.41 1.41z" }), "FilterListOff"); @@ -25553,7 +25559,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$f = FirstPage.default = void 0; var _createSvgIcon$f = _interopRequireDefault$f(requireCreateSvgIcon()); - var _jsxRuntime$f = jsxRuntimeExports; + var _jsxRuntime$f = requireJsxRuntime(); var _default$f = default_1$f = FirstPage.default = (0, _createSvgIcon$f.default)(/* @__PURE__ */ (0, _jsxRuntime$f.jsx)("path", { d: "M18.41 16.59 13.82 12l4.59-4.59L17 6l-6 6 6 6zM6 6h2v12H6z" }), "FirstPage"); @@ -25566,7 +25572,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$e = Fullscreen.default = void 0; var _createSvgIcon$e = _interopRequireDefault$e(requireCreateSvgIcon()); - var _jsxRuntime$e = jsxRuntimeExports; + var _jsxRuntime$e = requireJsxRuntime(); var _default$e = default_1$e = Fullscreen.default = (0, _createSvgIcon$e.default)(/* @__PURE__ */ (0, _jsxRuntime$e.jsx)("path", { d: "M7 14H5v5h5v-2H7zm-2-4h2V7h3V5H5zm12 7h-3v2h5v-5h-2zM14 5v2h3v3h2V5z" }), "Fullscreen"); @@ -25579,7 +25585,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$d = FullscreenExit.default = void 0; var _createSvgIcon$d = _interopRequireDefault$d(requireCreateSvgIcon()); - var _jsxRuntime$d = jsxRuntimeExports; + var _jsxRuntime$d = requireJsxRuntime(); var _default$d = default_1$d = FullscreenExit.default = (0, _createSvgIcon$d.default)(/* @__PURE__ */ (0, _jsxRuntime$d.jsx)("path", { d: "M5 16h3v3h2v-5H5zm3-8H5v2h5V5H8zm6 11h2v-3h3v-2h-5zm2-11V5h-2v5h5V8z" }), "FullscreenExit"); @@ -25592,7 +25598,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$c = KeyboardDoubleArrowDown.default = void 0; var _createSvgIcon$c = _interopRequireDefault$c(requireCreateSvgIcon()); - var _jsxRuntime$c = jsxRuntimeExports; + var _jsxRuntime$c = requireJsxRuntime(); var _default$c = default_1$c = KeyboardDoubleArrowDown.default = (0, _createSvgIcon$c.default)([/* @__PURE__ */ (0, _jsxRuntime$c.jsx)("path", { d: "M18 6.41 16.59 5 12 9.58 7.41 5 6 6.41l6 6z" }, "0"), /* @__PURE__ */ (0, _jsxRuntime$c.jsx)("path", { @@ -25607,7 +25613,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$b = LastPage.default = void 0; var _createSvgIcon$b = _interopRequireDefault$b(requireCreateSvgIcon()); - var _jsxRuntime$b = jsxRuntimeExports; + var _jsxRuntime$b = requireJsxRuntime(); var _default$b = default_1$b = LastPage.default = (0, _createSvgIcon$b.default)(/* @__PURE__ */ (0, _jsxRuntime$b.jsx)("path", { d: "M5.59 7.41 10.18 12l-4.59 4.59L7 18l6-6-6-6zM16 6h2v12h-2z" }), "LastPage"); @@ -25620,7 +25626,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$a = MoreHoriz.default = void 0; var _createSvgIcon$a = _interopRequireDefault$a(requireCreateSvgIcon()); - var _jsxRuntime$a = jsxRuntimeExports; + var _jsxRuntime$a = requireJsxRuntime(); var _default$a = default_1$a = MoreHoriz.default = (0, _createSvgIcon$a.default)(/* @__PURE__ */ (0, _jsxRuntime$a.jsx)("path", { d: "M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" }), "MoreHoriz"); @@ -25633,7 +25639,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$9 = MoreVert.default = void 0; var _createSvgIcon$9 = _interopRequireDefault$9(requireCreateSvgIcon()); - var _jsxRuntime$9 = jsxRuntimeExports; + var _jsxRuntime$9 = requireJsxRuntime(); var _default$9 = default_1$9 = MoreVert.default = (0, _createSvgIcon$9.default)(/* @__PURE__ */ (0, _jsxRuntime$9.jsx)("path", { d: "M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" }), "MoreVert"); @@ -25646,7 +25652,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$8 = PushPin.default = void 0; var _createSvgIcon$8 = _interopRequireDefault$8(requireCreateSvgIcon()); - var _jsxRuntime$8 = jsxRuntimeExports; + var _jsxRuntime$8 = requireJsxRuntime(); var _default$8 = default_1$8 = PushPin.default = (0, _createSvgIcon$8.default)(/* @__PURE__ */ (0, _jsxRuntime$8.jsx)("path", { fillRule: "evenodd", d: "M16 9V4h1c.55 0 1-.45 1-1s-.45-1-1-1H7c-.55 0-1 .45-1 1s.45 1 1 1h1v5c0 1.66-1.34 3-3 3v2h5.97v7l1 1 1-1v-7H19v-2c-1.66 0-3-1.34-3-3" @@ -25660,7 +25666,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$7 = RestartAlt.default = void 0; var _createSvgIcon$7 = _interopRequireDefault$7(requireCreateSvgIcon()); - var _jsxRuntime$7 = jsxRuntimeExports; + var _jsxRuntime$7 = requireJsxRuntime(); var _default$7 = default_1$7 = RestartAlt.default = (0, _createSvgIcon$7.default)(/* @__PURE__ */ (0, _jsxRuntime$7.jsx)("path", { d: "M12 5V2L8 6l4 4V7c3.31 0 6 2.69 6 6 0 2.97-2.17 5.43-5 5.91v2.02c3.95-.49 7-3.85 7-7.93 0-4.42-3.58-8-8-8m-6 8c0-1.65.67-3.15 1.76-4.24L6.34 7.34C4.9 8.79 4 10.79 4 13c0 4.08 3.05 7.44 7 7.93v-2.02c-2.83-.48-5-2.94-5-5.91" }), "RestartAlt"); @@ -25673,7 +25679,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$6 = Save.default = void 0; var _createSvgIcon$6 = _interopRequireDefault$6(requireCreateSvgIcon()); - var _jsxRuntime$6 = jsxRuntimeExports; + var _jsxRuntime$6 = requireJsxRuntime(); var _default$6 = default_1$6 = Save.default = (0, _createSvgIcon$6.default)(/* @__PURE__ */ (0, _jsxRuntime$6.jsx)("path", { d: "M17 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V7zm-5 16c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3m3-10H5V5h10z" }), "Save"); @@ -25686,7 +25692,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$5 = Search.default = void 0; var _createSvgIcon$5 = _interopRequireDefault$5(requireCreateSvgIcon()); - var _jsxRuntime$5 = jsxRuntimeExports; + var _jsxRuntime$5 = requireJsxRuntime(); var _default$5 = default_1$5 = Search.default = (0, _createSvgIcon$5.default)(/* @__PURE__ */ (0, _jsxRuntime$5.jsx)("path", { d: "M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14" }), "Search"); @@ -25699,7 +25705,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$4 = SearchOff.default = void 0; var _createSvgIcon$4 = _interopRequireDefault$4(requireCreateSvgIcon()); - var _jsxRuntime$4 = jsxRuntimeExports; + var _jsxRuntime$4 = requireJsxRuntime(); var _default$4 = default_1$4 = SearchOff.default = (0, _createSvgIcon$4.default)([/* @__PURE__ */ (0, _jsxRuntime$4.jsx)("path", { d: "M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3 6.08 3 3.28 5.64 3.03 9h2.02C5.3 6.75 7.18 5 9.5 5 11.99 5 14 7.01 14 9.5S11.99 14 9.5 14c-.17 0-.33-.03-.5-.05v2.02c.17.02.33.03.5.03 1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19z" }, "0"), /* @__PURE__ */ (0, _jsxRuntime$4.jsx)("path", { @@ -25714,7 +25720,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$3 = Sort.default = void 0; var _createSvgIcon$3 = _interopRequireDefault$3(requireCreateSvgIcon()); - var _jsxRuntime$3 = jsxRuntimeExports; + var _jsxRuntime$3 = requireJsxRuntime(); var _default$3 = default_1$3 = Sort.default = (0, _createSvgIcon$3.default)(/* @__PURE__ */ (0, _jsxRuntime$3.jsx)("path", { d: "M3 18h6v-2H3zM3 6v2h18V6zm0 7h12v-2H3z" }), "Sort"); @@ -25727,7 +25733,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$2 = SyncAlt.default = void 0; var _createSvgIcon$2 = _interopRequireDefault$2(requireCreateSvgIcon()); - var _jsxRuntime$2 = jsxRuntimeExports; + var _jsxRuntime$2 = requireJsxRuntime(); var _default$2 = default_1$2 = SyncAlt.default = (0, _createSvgIcon$2.default)(/* @__PURE__ */ (0, _jsxRuntime$2.jsx)("path", { d: "m18 12 4-4-4-4v3H3v2h15zM6 12l-4 4 4 4v-3h15v-2H6z" }), "SyncAlt"); @@ -25740,7 +25746,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1$1 = ViewColumn.default = void 0; var _createSvgIcon$1 = _interopRequireDefault$1(requireCreateSvgIcon()); - var _jsxRuntime$1 = jsxRuntimeExports; + var _jsxRuntime$1 = requireJsxRuntime(); var _default$1 = default_1$1 = ViewColumn.default = (0, _createSvgIcon$1.default)(/* @__PURE__ */ (0, _jsxRuntime$1.jsx)("path", { d: "M14.67 5v14H9.33V5zm1 14H21V5h-5.33zm-7.34 0V5H3v14z" }), "ViewColumn"); @@ -25753,7 +25759,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha }); var default_1 = VisibilityOff.default = void 0; var _createSvgIcon = _interopRequireDefault(requireCreateSvgIcon()); - var _jsxRuntime = jsxRuntimeExports; + var _jsxRuntime = requireJsxRuntime(); var _default = default_1 = VisibilityOff.default = (0, _createSvgIcon.default)(/* @__PURE__ */ (0, _jsxRuntime.jsx)("path", { d: "M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89 3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74.25-3.98.7l2.16 2.16C10.74 7.13 11.35 7 12 7M2 4.27l2.28 2.28.46.46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5 11 7.5 1.55 0 3.03-.3 4.38-.84l.42.42L19.73 22 21 20.73 3.27 3zM7.53 9.8l1.55 1.55c-.05.21-.08.43-.08.65 0 1.66 1.34 3 3 3 .22 0 .44-.03.65-.08l1.55 1.55c-.67.33-1.41.53-2.2.53-2.76 0-5-2.24-5-5 0-.79.2-1.53.53-2.2m4.31-.78 3.15 3.15.02-.16c0-1.66-1.34-3-3-3z" }), "VisibilityOff"); @@ -64884,10 +64890,10 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha const { spec } = props; const basicEntityAutocompleteField = BasicEntitySliderFieldSpecShape(spec); const { control, field, getValues, errors } = basicEntityAutocompleteField; - const val = getValues(field.name); + const val = getValues(field.name + "_uival$"); const err = errors[field.name]; const { field: controllerField } = useController({ - name: field.name, + name: field.name + "_uival$", control, defaultValue: val || field.ux.min }); @@ -65672,15 +65678,14 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha function modify_edit_Date(msg) { return __async(this, null, function* () { const out = yield this.prior(msg); - let { item } = out; - item = __spreadValues({}, item); + let item = __spreadValues({}, out); if (!item[field.name + "_orig$"]) { const dt = util$1.dateTimeFromUTC(item[field.name]); item[field.name + "_orig$"] = item[field.name]; item[field.name + "_udm$"] = dt.udm; item[field.name] = dt.localt; } - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }); } ); @@ -65690,15 +65695,14 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha function modify_edit_Time(msg) { return __async(this, null, function* () { const out = yield this.prior(msg); - let { item } = out; - item = __spreadValues({}, item); + let item = __spreadValues({}, out); if (!item[field.name + "_orig$"]) { const dt = util$1.dateTimeFromUTC(item[field.name]); item[field.name + "_orig$"] = item[field.name]; item[field.name + "_udm$"] = dt.udm; item[field.name] = dt.localt; } - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }); } ); @@ -65708,31 +65712,30 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha function modify_edit_Datetime(msg) { return __async(this, null, function* () { const out = yield this.prior(msg); - let { item } = out; - item = __spreadValues({}, item); + console.log("out", out); + let item = __spreadValues({}, out); if (!item[field.name + "_orig$"]) { const dt = util$1.dateTimeFromUTC(item[field.name]); item[field.name + "_orig$"] = item[field.name]; item[field.name + "_udm$"] = dt.udm; item[field.name] = dt.locald + "T" + dt.localt; } - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }); } ); } else if ("Slider" === field.ux.kind) { seneca.add( - "aim:app,on:BasicLed,modify:edit,view:" + spec.name, + "aim:app,on:BasicLed,modify:edit", + { view: spec.name }, function modify_edit_Slider(msg) { return __async(this, null, function* () { const out = yield this.prior(msg); - let { item } = out; - item = __spreadValues({}, item); - if (!item[field.name + "_orig$"]) { - item[field.name + "_orig$"] = item[field.name]; - item[field.name] = Number(item[field.name]) / 60; + let item = __spreadValues({}, out); + if (!item[field.name + "_uival$"]) { + item[field.name + "_uival$"] = Number(item[field.name]) / 60; } - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }); } ); @@ -65806,6 +65809,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha const { ent, name } = spec; const view = name; let entity = seneca.entity(ent); + console.log("makeResolver", "data", data); entity = entity.make$().data$(data); let errors = entity.valid$({ errors: true }); seneca.act("aim:app,on:BasicLed,entity:valid", { @@ -65859,25 +65863,17 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha let item = reactRedux.useSelector((state) => selectItem(state)); React$1.useEffect(() => { const fetchData = () => __async(this, null, function* () { - console.log( - "BasicEntityEdit", - "useEffect", - "modify:edit", - "init", - "view", - name, - "item", - item == null ? void 0 : item.title - ); + console.log("BEE", "effect", "mod:edit", "init", "view", name); + console.log("BEE", "effect", "mod:edit", "init", "item", item == null ? void 0 : item.title); if (item && name) { - const res = yield seneca.direct("aim:app,on:BasicLed,modify:edit", { + item = yield seneca.direct("aim:app,on:BasicLed,modify:edit", { view: name, item, fields }); - item = res.item; + console.log("BEE", "effect", "resetting", item); + reset(item); } - reset(item); }); fetchData(); }, [item, name]); @@ -66091,7 +66087,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha let item = msg.item; if (null == item) return item; item = __spreadValues({}, item); - return __spreadProps(__spreadValues({}, msg), { item }); + return item; }).add("aim:app,on:BasicLed,modify:save", function modify_save(msg) { let item = msg.data; let fields = msg.fields; @@ -66101,7 +66097,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha if ("Slider" === field.ux.kind) { console.log("VxgBasicLedPlugin", "modify:save", "field", field); console.log("VxgBasicLedPlugin", "modify:save", "item", item); - item[field.name] = Number(item[field.name]) * 60; + item[field.name] = Number(item[field.name + "_uival$"]) * 60; } } console.log("modify:save", "item", item); @@ -66139,7 +66135,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha return __async(this, null, function* () { const data = Object.entries(spec.def.edit.field).filter((n) => false !== n[1].ux.edit).reduce((a, n) => (a[n[0]] = msg.data[n[0]], a), {}); const item = yield seneca.entity(entCanon).save$(data); - navigate("/view/" + name); + navigate("/view/" + name + "/edit/" + item.id); }); } ); @@ -66196,8 +66192,20 @@ To suppress this warning, you need to explicitly provide the \`palette.${key}Cha head.active && /* @__PURE__ */ jsxRuntimeExports.jsx(BasicLedHead, { ctx, spec: head }), /* @__PURE__ */ jsxRuntimeExports.jsxs(reactRouterDom.Routes, { children: [ /* @__PURE__ */ jsxRuntimeExports.jsx(reactRouterDom.Route, { path: "/", element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityList, { ctx, spec: list }) }), - /* @__PURE__ */ jsxRuntimeExports.jsx(reactRouterDom.Route, { path: "/edit/:item", element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityEdit, { ctx, spec: edit }) }), - /* @__PURE__ */ jsxRuntimeExports.jsx(reactRouterDom.Route, { path: "/add", element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityEdit, { ctx, spec: edit }) }) + /* @__PURE__ */ jsxRuntimeExports.jsx( + reactRouterDom.Route, + { + path: "/edit/:item", + element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityEdit, { ctx, spec: edit }) + } + ), + /* @__PURE__ */ jsxRuntimeExports.jsx( + reactRouterDom.Route, + { + path: "/add", + element: /* @__PURE__ */ jsxRuntimeExports.jsx(BasicEntityEdit, { ctx, spec: edit }) + } + ) ] }), foot.active && /* @__PURE__ */ jsxRuntimeExports.jsx(BasicLedFoot, { ctx, spec: foot }) ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx(BasicLoading, {}); diff --git a/src/lib/BasicEntityEdit.tsx b/src/lib/BasicEntityEdit.tsx index 7a86927..003a981 100644 --- a/src/lib/BasicEntityEdit.tsx +++ b/src/lib/BasicEntityEdit.tsx @@ -116,28 +116,18 @@ function BasicEntityEdit (props: any) { useEffect(() => { const fetchData = async () => { - console.log( - 'BasicEntityEdit', - 'useEffect', - 'modify:edit', - 'init', - 'view', - name, - 'item', - item?.title - ) + console.log('BEE', 'effect', 'mod:edit', 'init', 'view', name) + console.log('BEE', 'effect', 'mod:edit', 'init', 'item', item?.title) if (item && name) { - // console.log('BasicEntityEdit', 'useEffect', 'modify:edit', 'init') - const res = await seneca.direct('aim:app,on:BasicLed,modify:edit', { + // console.log('BEE', 'effect', 'modify:edit', 'init') + item = await seneca.direct('aim:app,on:BasicLed,modify:edit', { view: name, item, fields, }) - item = res.item - // console.log('BasicEntityEdit', 'useEffect', 'modify:edit', 'got-item') - // console.log('BasicEntityEdit', 'useEffect', 'resetting') + console.log('BEE', 'effect', 'resetting', item) + reset(item) } - reset(item) } fetchData() diff --git a/src/lib/BasicLed.tsx b/src/lib/BasicLed.tsx index 189c079..d6eaeac 100644 --- a/src/lib/BasicLed.tsx +++ b/src/lib/BasicLed.tsx @@ -5,7 +5,6 @@ import { Box } from '@mui/material' import { Gubu } from 'gubu' - import type { BasicProps, Spec } from './basic-types' import { BasicEntityList } from './BasicEntityList' @@ -16,50 +15,54 @@ import { BasicLoading } from './BasicLoading' import { VxgBasicLedPlugin } from './VxgBasicLedPlugin' - const CMPNAME = 'BasicLed' - // BasicLed renders a list of entities (with BasicList) or a form to edit them (with BasicEdit) function BasicLed (props: any) { const { ctx } = props const { seneca } = ctx() const name = props.spec.name + // TODO: const cid = seneca.util.nid() - + // tag = props.spec.name + const navigate = useNavigate() - - const led = useSelector((state:any)=>state.main.view[name]) + + const led = useSelector((state: any) => state.main.view[name]) const ready = true === led?.ready - - if(!ready) { + + if (!ready) { seneca.use({ tag: name, define: VxgBasicLedPlugin, - options:{ + options: { spec: props.spec, navigate, - } + }, }) } - const { head, list, edit, foot } = seneca.export('VxgBasicLedPlugin$'+name+'/spec') || {} + const { head, list, edit, foot } = + seneca.export('VxgBasicLedPlugin$' + name + '/spec') || {} - return ( - ready ? - - { head.active && } + return ready ? ( + + {head.active && } - } /> - } /> - } /> + } /> + } + /> + } + /> - { foot.active && } + {foot.active && } - : - + ) : ( + ) } -export { - BasicLed -} +export { BasicLed } diff --git a/src/lib/VxgBasicEntityEditPlugin.ts b/src/lib/VxgBasicEntityEditPlugin.ts index 317b87f..2e303f5 100644 --- a/src/lib/VxgBasicEntityEditPlugin.ts +++ b/src/lib/VxgBasicEntityEditPlugin.ts @@ -36,9 +36,7 @@ function VxgBasicEntityEditPlugin (this: any, options: any) { async function modify_edit_Date (this: any, msg: any) { const out = await this.prior(msg) - let { item } = out - - item = { ...item } + let item = { ...out } if (!item[field.name + '_orig$']) { const dt = util.dateTimeFromUTC(item[field.name]) @@ -47,7 +45,7 @@ function VxgBasicEntityEditPlugin (this: any, options: any) { item[field.name] = dt.localt } - return { ...msg, item } + return item } ) } else if ('Time' === field.ux.kind) { @@ -56,9 +54,7 @@ function VxgBasicEntityEditPlugin (this: any, options: any) { async function modify_edit_Time (this: any, msg: any) { const out = await this.prior(msg) - let { item } = out - - item = { ...item } + let item = { ...out } if (!item[field.name + '_orig$']) { const dt = util.dateTimeFromUTC(item[field.name]) @@ -67,7 +63,7 @@ function VxgBasicEntityEditPlugin (this: any, options: any) { item[field.name] = dt.localt } - return { ...msg, item } + return item } ) } else if ('DateTime' === field.ux.kind) { @@ -76,9 +72,7 @@ function VxgBasicEntityEditPlugin (this: any, options: any) { async function modify_edit_Datetime (this: any, msg: any) { const out = await this.prior(msg) - let { item } = out - - item = { ...item } + let item = { ...out } if (!item[field.name + '_orig$']) { const dt = util.dateTimeFromUTC(item[field.name]) @@ -87,26 +81,26 @@ function VxgBasicEntityEditPlugin (this: any, options: any) { item[field.name] = dt.locald + 'T' + dt.localt } - return { ...msg, item } + return item } ) } else if ('Slider' === field.ux.kind) { // console.log('VxgBasicEntityEditPlugin', 'Slider') seneca.add( - 'aim:app,on:BasicLed,modify:edit,view:' + spec.name, + 'aim:app,on:BasicLed,modify:edit', + { view: spec.name }, async function modify_edit_Slider (this: any, msg: any) { const out = await this.prior(msg) - let { item } = out - - item = { ...item } + let item = { ...out } if (!item[field.name + '_orig$']) { item[field.name + '_orig$'] = item[field.name] item[field.name] = Number(item[field.name]) / 60 } - return { ...msg, item } + // return { ...msg, item } + return item } ) } diff --git a/src/lib/VxgBasicLedPlugin.ts b/src/lib/VxgBasicLedPlugin.ts index e20ce32..ad8820d 100644 --- a/src/lib/VxgBasicLedPlugin.ts +++ b/src/lib/VxgBasicLedPlugin.ts @@ -98,7 +98,7 @@ function VxgBasicLedPlugin (this: any, options: any) { item = { ...item } - return { ...msg, item } + return item }) .add('aim:app,on:BasicLed,modify:save', function modify_save (msg: any) { @@ -112,8 +112,8 @@ function VxgBasicLedPlugin (this: any, options: any) { // This code does not belong here for (const field of fields) { if ('Slider' === field.ux.kind) { - console.log('VxgBasicLedPlugin', 'modify:save', 'field', field) - console.log('VxgBasicLedPlugin', 'modify:save', 'item', item) + // console.log('VxgBasicLedPlugin', 'modify:save', 'field', field) + // console.log('VxgBasicLedPlugin', 'modify:save', 'item', item) item[field.name] = Number(item[field.name]) * 60 } } @@ -160,9 +160,7 @@ function VxgBasicLedPlugin (this: any, options: any) { .reduce((a: any, n: any[]) => ((a[n[0]] = msg.data[n[0]]), a), {}) const item = await seneca.entity(entCanon).save$(data) - // TODO: navigate to edit view - // navigate('/view/' + name + '/edit/' + item.id) - navigate('/view/' + name) + navigate('/view/' + name + '/edit/' + item.id) } )