@canmingir/link 1.2.63 → 1.2.65

package/src/stories/APITree.stories.jsx

@@ -2,10 +2,10 @@ import APIDialogAction from "../lib/APIDialogAction/APIDialogAction";
 import APIParams from "../lib/APIParams/APIParams";
 import APIPath from "../lib/APIPath/APIPath";
 import APITree from "../lib/APITree/APITree";
+import APITreeDialog from "../lib/APITreeDialog/APITreeDialog";
 import APITypes from "../lib/APITypes/APITypes";
 import CssBaseline from "@mui/material/CssBaseline";
 import NewAPIBody from "../lib/NewApiBody/NewAPIBody";
-import NucDialog from "../lib/NucDialog/NucDialog";
 
 import { Box, Divider } from "@mui/material";
 import React, { useEffect, useRef, useState } from "react";
@@ -80,7 +80,8 @@ export default {
       description: {
         component:
           "APITree displays API endpoints in a tree structure grouped by path segments. " +
-          "It supports context menus for editing/deleting methods and a resource menu for adding new endpoints.",
+          "It is a controlled component: selection and expansion are driven by the " +
+          "selected/expanded props and reported via onSelect/onExpand.",
       },
     },
     layout: "centered",
@@ -92,6 +93,8 @@ const ALL_METHODS = ["GET", "POST", "PUT", "DELETE", "PATCH"];
 const APIWorkspace = () => {
   const [view, setView] = useState("PARAMS");
   const [dialogKey, setDialogKey] = useState(0);
+  const [expanded, setExpanded] = useState(["/", "/items"]);
+  const [selectedItem, setSelectedItem] = useState(null);
 
   const methodRef = useRef("GET");
   const pathRef = useRef("/");
@@ -337,10 +340,17 @@ const APIWorkspace = () => {
   return (
     <Box sx={{ display: "flex", height: "100%", gap: 2 }}>
       <Box sx={{ width: 280, flexShrink: 0, height: "100%" }}>
-        <APITree />
+        <APITree
+          api={api}
+          theme={theme}
+          expanded={expanded}
+          selected={selectedItem}
+          onExpand={(_event, itemIds) => setExpanded(itemIds)}
+          onSelect={(_event, itemId) => setSelectedItem(itemId)}
+        />
       </Box>
 
-      <NucDialog
+      <APITreeDialog
         title={dialogTitle}
         open={dialog.open}
         handleClose={handleCloseDialog}
@@ -398,7 +408,7 @@ const APIWorkspace = () => {
             <APITypes tstypes={[]} nuctypes={types} typesRef={typesRef} />
           )}
         </Box>
-      </NucDialog>
+      </APITreeDialog>
     </Box>
   );
 };
@@ -420,9 +430,9 @@ export const APITreeWorkspace = {
     docs: {
       description: {
         story:
-          "Full workspace: right-click a path node or click the + FAB to open the ResourceMenu, " +
-          "then choose Resource, Method, or Delete. Adding a resource or method opens the API dialog " +
-          "where you can configure the path, method, params, and body before saving.",
+          "Full workspace: click a method node to select it, then use the API dialog " +
+          "events (API_DIALOG_OPEN) to add or edit endpoints, configuring the path, " +
+          "method, params, and body before saving.",
       },
     },
   },

package/src/widgets/Login/CognitoLogin.jsx

@@ -69,9 +69,9 @@ export default function CognitoLogin() {
 
       const data = await res.json();
 
-      storage.set("link", "accessToken", data.accessToken);
-      storage.set("link", "refreshToken", data.refreshToken);
-      storage.set("link", "identityProvider", "COGNITO");
+      storage.set("link", "accesstoken", data.accessToken);
+      storage.set("link", "refreshtoken", data.refreshToken);
+      storage.set("link", "identityprovider", "COGNITO");
 
       navigate("/");
     } catch (e) {

package/src/widgets/Login/DemoLogin.jsx

@@ -43,9 +43,9 @@ export default function DemoLogin() {
 
     const data = await res.json();
 
-    storage.set("link", "accessToken", data.accessToken);
-    storage.set("link", "refreshToken", data.refreshToken);
-    storage.set("link", "identityProvider", "DEMO");
+    storage.set("link", "accesstoken", data.accessToken);
+    storage.set("link", "refreshtoken", data.refreshToken);
+    storage.set("link", "identityprovider", "DEMO");
 
     navigate("/");
   }

package/src/widgets/Login/Login.jsx

@@ -18,8 +18,8 @@ export default function Auth0LoginView() {
 
   function token() {
     if (
-      storage.get("link", "refreshToken") &&
-      storage.get("link", "accessToken")
+      storage.get("link", "refreshtoken") &&
+      storage.get("link", "accesstoken")
     ) {
       return true;
     } else {

package/src/widgets/SettingsDialog.jsx

@@ -1,3 +1,11 @@
+import Iconify from "../components/Iconify";
+import config from "../config/config";
+import { useEvent } from "@nucleoidai/react-event";
+import useSettings from "../hooks/useSettings";
+import { useSettingsContext } from "../components/settings/context";
+import { useStorage } from "@nucleoidjs/webstorage";
+import { useUser } from "../hooks/use-user";
+
 import {
   Avatar,
   Box,
@@ -23,13 +31,6 @@ import {
 import { Button, Dialog, DialogActions, DialogContent } from "@mui/material";
 import React, { useEffect, useState } from "react";
 
-import Iconify from "../components/Iconify";
-import config from "../config/config";
-import { useEvent } from "@nucleoidai/react-event";
-import useSettings from "../hooks/useSettings";
-import { useSettingsContext } from "../components/settings/context";
-import { useUser } from "../hooks/use-user";
-
 let pkg = {
   name: "",
   version: "",
@@ -296,7 +297,7 @@ const Permission = () => {
 };
 
 const Settings = () => {
-  const projectId = localStorage.getItem("projectId");
+  const [projectId] = useStorage("link", "projectid");
   const { settings, updateSettings } = useSettings(projectId);
   const { beta, onUpdate } = useSettingsContext();
 

package/src/ContextProvider/ContextProvider.jsx

@@ -1,19 +0,0 @@
-import React from "react";
-
-const ContextStore = React.createContext();
-ContextStore.displayName = "ContextStore";
-
-const useContext = () => React.useContext(ContextStore);
-
-const ContextProvider = ({ children, state, reducer }) => {
-  const [contextState, contextDispatch] = React.useReducer(reducer, state);
-
-  return (
-    <ContextStore.Provider value={[contextState, contextDispatch]}>
-      {children}
-    </ContextStore.Provider>
-  );
-};
-
-export { useContext };
-export default ContextProvider;

package/src/context/Context.js

@@ -1,98 +0,0 @@
-class Context {
-  constructor(data = {}) {
-    this.login = data.login !== undefined ? data.login : false;
-    this.itemId = data.itemId || null;
-
-    this.specification = {
-      api: [],
-      functions: [],
-      types: [],
-      declarations: [],
-      ...(data.specification || {}),
-    };
-
-    this.pages = {
-      api: {
-        selected: { path: "/", method: "get" },
-        dialog: {
-          type: null,
-          action: null,
-          open: false,
-          view: null,
-          map: {},
-          params: {},
-        },
-        resourceMenu: {
-          open: false,
-          anchor: null,
-          path: null,
-        },
-        ...(data.pages?.api || {}),
-      },
-      functions: {
-        selected: null,
-        dialog: {
-          type: null,
-          open: false,
-        },
-        AIDialog: {
-          open: false,
-        },
-        ...(data.pages?.functions || {}),
-      },
-      logic: {
-        selected: null,
-        AIDialog: {
-          open: false,
-        },
-        ...(data.pages?.logic || {}),
-      },
-      query: {
-        results: null,
-        ...(data.pages?.query || {}),
-      },
-      ...(data.pages || {}),
-    };
-  }
-
-  static copy(context) {
-    const copied = new Context();
-
-    copied.login = context.login;
-    copied.itemId = context.itemId;
-
-    copied.specification = {
-      api: context.specification?.api ? [...context.specification.api] : [],
-      functions: context.specification?.functions
-        ? [...context.specification.functions]
-        : [],
-      types: context.specification?.types
-        ? [...context.specification.types]
-        : [],
-      declarations: context.specification?.declarations
-        ? [...context.specification.declarations]
-        : [],
-    };
-
-    copied.pages = JSON.parse(JSON.stringify(context.pages || {}));
-
-    return copied;
-  }
-
-  get(path) {
-    const keys = path.split(".");
-    let result = this;
-
-    for (const key of keys) {
-      if (result && typeof result === "object" && key in result) {
-        result = result[key];
-      } else {
-        return undefined;
-      }
-    }
-
-    return result;
-  }
-}
-
-export default Context;