@trops/dash-core 0.1.127 → 0.1.128

package/dist/index.js

@@ -4008,13 +4008,21 @@ var LayoutManagerModal = function LayoutManagerModal(_ref) {
   // Reset state when modal opens
   React.useEffect(function () {
     if (open) {
+      var _Object$entries$sort$;
       setCreationMethod(null);
       setDashboardName("");
       setActiveStep(0);
       setLocalMenuItems(menuItems || []);
       setSelectedMenuId(menuItems && menuItems.length > 0 ? menuItems[0].id : 1);
       setSelectedTemplate(layoutTemplates[0]);
-      setSelectedThemeKey(null);
+      var fallback = themes ? ((_Object$entries$sort$ = Object.entries(themes).sort(function (_ref2, _ref3) {
+        var _ref4 = _slicedToArray(_ref2, 2),
+          a = _ref4[1];
+        var _ref5 = _slicedToArray(_ref3, 2),
+          b = _ref5[1];
+        return (a.name || "").localeCompare(b.name || "");
+      })[0]) === null || _Object$entries$sort$ === void 0 ? void 0 : _Object$entries$sort$[0]) || null : null;
+      setSelectedThemeKey(appThemeKey || fallback);
       setImportedWorkspace(null);
       setSelectedFile(null);
       setIsCreatingFolder(false);
@@ -4340,7 +4348,7 @@ var LayoutManagerModal = function LayoutManagerModal(_ref) {
           textColor: "text-gray-300"
         }), /*#__PURE__*/jsxRuntime.jsx("p", {
           className: "text-base font-normal text-gray-400",
-          children: "Choose a theme for this dashboard, or use the application default."
+          children: "Choose a theme for this dashboard."
         }), selectedThemeKey !== null && themes && themes[selectedThemeKey] && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "flex flex-row items-center space-x-2 mt-4 pt-4 border-t border-gray-700",
@@ -4361,45 +4369,19 @@ var LayoutManagerModal = function LayoutManagerModal(_ref) {
               className: "w-8 h-8 rounded bg-".concat(themes[selectedThemeKey].tertiary, "-500")
             })]
           })]
-        }), selectedThemeKey === null && /*#__PURE__*/jsxRuntime.jsxs("div", {
-          className: "flex flex-row items-center space-x-2 mt-4 pt-4 border-t border-gray-700",
-          children: [/*#__PURE__*/jsxRuntime.jsx(DashReact.FontAwesomeIcon, {
-            icon: "palette",
-            className: "text-blue-400"
-          }), /*#__PURE__*/jsxRuntime.jsx("span", {
-            className: "text-sm font-medium text-gray-300",
-            children: "App Default"
-          })]
         })]
-      }), /*#__PURE__*/jsxRuntime.jsxs("div", {
+      }), /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex flex-col w-2/3 p-6 overflow-y-auto space-y-2",
-        children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
-          className: "flex flex-row items-center px-4 py-3 rounded-lg cursor-pointer transition-all ".concat(selectedThemeKey === null ? "ring-2 ring-blue-500 bg-gray-700" : "hover:bg-gray-750 hover:ring-1 hover:ring-gray-600 bg-gray-800/50"),
-          onClick: function onClick() {
-            return setSelectedThemeKey(null);
-          },
-          children: [/*#__PURE__*/jsxRuntime.jsx(DashReact.FontAwesomeIcon, {
-            icon: "palette",
-            className: "w-5 h-5 mr-3 ".concat(selectedThemeKey === null ? "text-blue-400" : "text-gray-400")
-          }), /*#__PURE__*/jsxRuntime.jsx("span", {
-            className: "text-sm font-medium ".concat(selectedThemeKey === null ? "text-blue-300" : "text-gray-300"),
-            children: "App Default"
-          }), /*#__PURE__*/jsxRuntime.jsx("div", {
-            className: "flex flex-row space-x-1 ml-auto",
-            children: themes && appThemeKey && themes[appThemeKey] && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-              children: [themes[appThemeKey].primary && /*#__PURE__*/jsxRuntime.jsx("div", {
-                className: "w-4 h-4 rounded bg-".concat(themes[appThemeKey].primary, "-500")
-              }), themes[appThemeKey].secondary && /*#__PURE__*/jsxRuntime.jsx("div", {
-                className: "w-4 h-4 rounded bg-".concat(themes[appThemeKey].secondary, "-500")
-              }), themes[appThemeKey].tertiary && /*#__PURE__*/jsxRuntime.jsx("div", {
-                className: "w-4 h-4 rounded bg-".concat(themes[appThemeKey].tertiary, "-500")
-              })]
-            })
-          })]
-        }), themes && Object.entries(themes).map(function (_ref2) {
-          var _ref3 = _slicedToArray(_ref2, 2),
-            key = _ref3[0],
-            t = _ref3[1];
+        children: themes && Object.entries(themes).sort(function (_ref6, _ref7) {
+          var _ref8 = _slicedToArray(_ref6, 2),
+            a = _ref8[1];
+          var _ref9 = _slicedToArray(_ref7, 2),
+            b = _ref9[1];
+          return (a.name || "").localeCompare(b.name || "");
+        }).map(function (_ref0) {
+          var _ref1 = _slicedToArray(_ref0, 2),
+            key = _ref1[0],
+            t = _ref1[1];
           var isThemeSelected = selectedThemeKey === key;
           return /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "flex flex-row items-center px-4 py-3 rounded-lg cursor-pointer transition-all ".concat(isThemeSelected ? "ring-2 ring-blue-500 bg-gray-700" : "hover:bg-gray-750 hover:ring-1 hover:ring-gray-600 bg-gray-800/50"),
@@ -4423,7 +4405,7 @@ var LayoutManagerModal = function LayoutManagerModal(_ref) {
               })]
             })]
           }, key);
-        })]
+        })
       })]
     });
   }
@@ -32782,18 +32764,21 @@ var DashboardDetail = function DashboardDetail(_ref2) {
       value: String(m.id)
     };
   });
-  var themeOptions = [{
-    label: "App Default",
-    value: ""
-  }].concat(_toConsumableArray(Object.entries(themes || {}).map(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-      key = _ref4[0],
-      t = _ref4[1];
+  var themeOptions = _toConsumableArray(Object.entries(themes || {}).sort(function (_ref3, _ref4) {
+    var _ref5 = _slicedToArray(_ref3, 2),
+      a = _ref5[1];
+    var _ref6 = _slicedToArray(_ref4, 2),
+      b = _ref6[1];
+    return (a.name || "").localeCompare(b.name || "");
+  }).map(function (_ref7) {
+    var _ref8 = _slicedToArray(_ref7, 2),
+      key = _ref8[0],
+      t = _ref8[1];
     return {
       label: t.name || key,
       value: key
     };
-  })));
+  }));
   function handleChangeFolder(val) {
     if (!dashApi || !appId) return;
     var updated = DashReact.deepCopy(ws);
@@ -32880,7 +32865,7 @@ var DashboardDetail = function DashboardDetail(_ref2) {
             return handleChangeTheme(val);
           },
           options: themeOptions,
-          placeholder: "App Default"
+          placeholder: "Select a theme"
         }), /*#__PURE__*/jsxRuntime.jsxs("div", {
           className: "flex flex-row items-center gap-2",
           children: [/*#__PURE__*/jsxRuntime.jsx(DashReact.FontAwesomeIcon, {
@@ -42211,10 +42196,16 @@ var DashboardHeader = function DashboardHeader(_ref) {
           className: "w-40 shrink-0"
         }), onThemeChange && Object.keys(resolvedThemes).length > 0 && /*#__PURE__*/jsxRuntime.jsx(DashReact.SelectInput, {
           value: workspaceSelected.themeKey || "",
-          options: Object.entries(resolvedThemes).map(function (_ref2) {
-            var _ref3 = _slicedToArray(_ref2, 2),
-              key = _ref3[0],
-              t = _ref3[1];
+          options: Object.entries(resolvedThemes).sort(function (_ref2, _ref3) {
+            var _ref4 = _slicedToArray(_ref2, 2),
+              a = _ref4[1];
+            var _ref5 = _slicedToArray(_ref3, 2),
+              b = _ref5[1];
+            return (a.name || "").localeCompare(b.name || "");
+          }).map(function (_ref6) {
+            var _ref7 = _slicedToArray(_ref6, 2),
+              key = _ref7[0],
+              t = _ref7[1];
             return {
               label: t.name || key,
               value: key,
@@ -42222,7 +42213,7 @@ var DashboardHeader = function DashboardHeader(_ref) {
             };
           }),
           onChange: onThemeChange,
-          placeholder: "Theme",
+          placeholder: "Select a theme",
           backgroundColor: currentTheme["bg-primary-very-dark"],
           textColor: currentTheme["text-primary-medium"],
           borderColor: currentTheme["border-primary-dark"],