@canmingir/link 1.2.63 → 1.2.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canmingir/link",
-  "version": "1.2.63",
+  "version": "1.2.65",
   "license": "Apache-2.0",
   "type": "module",
   "bin": {

package/src/components/settings/context/settings-provider.jsx

@@ -5,7 +5,7 @@ import { useLocalStorage } from "../../../hooks/use-local-storage";
 
 import { useCallback, useMemo, useState } from "react";
 
-const STORAGE_KEY = "settings";
+const STORAGE_KEY = "link.settings";
 
 export function SettingsProvider({ children, defaultSettings }) {
   const { state, update, reset } = useLocalStorage(

package/src/http/index.js

@@ -14,7 +14,7 @@ const instance = axios.create({
 
 instance.interceptors.request.use((request) => {
   const { base } = config();
-  const accessToken = storage.get("link", "accessToken");
+  const accessToken = storage.get("link", "accesstoken");
 
   if (!accessToken) {
     window.location.href = base === "/" ? "/login" : `${base}/login`;
@@ -40,11 +40,11 @@ function processQueue(error, token = null) {
 
 async function doRefresh() {
   const { appId } = config();
-  const projectId = storage.get("projectId");
-  const identityProvider = storage.get("link", "identityProvider");
+  const projectId = storage.get("link", "projectid");
+  const identityProvider = storage.get("link", "identityprovider");
 
   const { data } = await oauth.post("/oauth", {
-    refreshToken: storage.get("link", "refreshToken"),
+    refreshToken: storage.get("link", "refreshtoken"),
     appId,
     projectId,
     identityProvider,
@@ -54,9 +54,9 @@ async function doRefresh() {
     }),
   });
 
-  storage.set("link", "accessToken", data.accessToken);
+  storage.set("link", "accesstoken", data.accessToken);
   if (data.refreshToken) {
-    storage.set("link", "refreshToken", data.refreshToken);
+    storage.set("link", "refreshtoken", data.refreshToken);
   }
   return data.accessToken;
 }
@@ -81,7 +81,7 @@ instance.interceptors.response.use(
         "Bearer ",
         ""
       );
-      const storedToken = storage.get("link", "accessToken");
+      const storedToken = storage.get("link", "accesstoken");
 
       if (storedToken && storedToken !== usedToken) {
         originalRequest.headers["Authorization"] = `Bearer ${storedToken}`;
@@ -107,8 +107,8 @@ instance.interceptors.response.use(
       } catch (refreshError) {
         processQueue(refreshError, null);
         const { base } = config();
-        storage.remove("link", "accessToken");
-        storage.remove("link", "refreshToken");
+        storage.remove("link", "accesstoken");
+        storage.remove("link", "refreshtoken");
         window.location.href = `${window.location.origin}${base}/login`;
         return Promise.reject(refreshError);
       } finally {

package/src/http/user.js

@@ -13,7 +13,7 @@ const instance = axios.create({
 });
 
 instance.interceptors.request.use(async (request) => {
-  const refreshToken = await storage.get("link", "refreshToken");
+  const refreshToken = await storage.get("link", "refreshtoken");
   if (refreshToken) {
     request.headers["Authorization"] = `Bearer ${refreshToken}`;
   }
@@ -22,7 +22,7 @@ instance.interceptors.request.use(async (request) => {
 
 instance.getUserDetails = async () => {
   try {
-    const refreshToken = storage.get("link", "refreshToken");
+    const refreshToken = storage.get("link", "refreshtoken");
 
     if (!refreshToken) {
       return null;
@@ -47,8 +47,8 @@ instance.getUserDetails = async () => {
 
 instance.getPermittedUsers = async () => {
   const { appId } = config();
-  const projectId = storage.get("projectId");
-  const identityProvider = storage.get("link", "identityProvider");
+  const projectId = storage.get("link", "projectid");
+  const identityProvider = storage.get("link", "identityprovider");
 
   const response = await http.get("/permissions");
 
@@ -110,7 +110,7 @@ instance.getPermittedUsers = async () => {
   }
 
   if (identityProvider?.toUpperCase() === "COGNITO") {
-    const accessToken = await storage.get("link", "accessToken");
+    const accessToken = await storage.get("link", "accesstoken");
     let currentUserId = null;
 
     try {

package/src/layouts/DashboardLayout/nav-vertical.jsx

@@ -1,6 +1,3 @@
-import { Button, Typography } from "@mui/material";
-import { useEffect, useState } from "react";
-
 import Box from "@mui/material/Box";
 import Drawer from "@mui/material/Drawer";
 import Iconify from "../../components/Iconify";
@@ -20,6 +17,9 @@ import { usePathname } from "../../routes/hooks/use-pathname";
 import { useResponsive } from "../../hooks/use-responsive";
 import { useUser } from "../../hooks/use-user";
 
+import { Button, Typography } from "@mui/material";
+import { useEffect, useState } from "react";
+
 // ----------------------------------------------------------------------
 
 export default function NavVertical({ openNav, onCloseNav }) {
@@ -31,15 +31,9 @@ export default function NavVertical({ openNav, onCloseNav }) {
   const lgUp = useResponsive("up", "lg");
   const { beta, name } = config();
 
-  useEffect(() => {
-    const index = sideMenu.findIndex(
-      (item) => item.subheader === hideSubheader.subheader,
-    );
-
-    if (index !== -1) {
-      sideMenu.splice(index, 1);
-    }
-  }, [hideSubheader]);
+  const filteredSideMenu = sideMenu.filter(
+    (item) => item.subheader !== hideSubheader.subheader
+  );
 
   useEffect(() => {
     if (openNav) {
@@ -105,7 +99,8 @@ export default function NavVertical({ openNav, onCloseNav }) {
             mt: 3,
           }}
         >
-          <Logo maxSize={name ? 100 : 150} sx={{ ml: name ? 4 : -10 }} />
+          <Logo maxSize={name ? 100 : 150} sx={{ ml: name ? -8 : -10 }} />
+
           <Typography
             sx={{
               ml: 2,
@@ -116,7 +111,7 @@ export default function NavVertical({ openNav, onCloseNav }) {
         </Box>
       )}
       <NavSectionVertical
-        data={sideMenu}
+        data={filteredSideMenu}
         slotProps={{
           currentRole: user?.role,
         }}

package/src/layouts/common/ProjectBar/index.jsx

@@ -45,7 +45,7 @@ function ProjectBar() {
   }, [projectCreated]);
 
   const id = window.matchMedia("projectId").matches;
-  const [selectedProjectId] = useStorage("projectId", id);
+  const [selectedProjectId] = useStorage("link", "projectid", id);
 
   const [selectedProject, setSelectedProject] = useState();
 
@@ -91,7 +91,7 @@ function ProjectBar() {
   const handleSelect = (project) => {
     const { id: projectId } = project;
 
-    const identityProviderRaw = storage.get("link", "identityProvider");
+    const identityProviderRaw = storage.get("link", "identityprovider");
     const identityProvider = identityProviderRaw?.toUpperCase();
 
     const payload = {
@@ -104,7 +104,7 @@ function ProjectBar() {
       payload.username = "admin";
       payload.password = "admin";
     } else {
-      payload.refreshToken = storage.get("link", "refreshToken");
+      payload.refreshToken = storage.get("link", "refreshtoken");
     }
 
     const request = oauth.post("/oauth", payload);
@@ -112,9 +112,9 @@ function ProjectBar() {
     request
       .then(({ data }) => {
         const { refreshToken, accessToken } = data;
-        storage.set("link", "accessToken", accessToken);
-        storage.set("link", "refreshToken", refreshToken);
-        storage.set("projectId", projectId);
+        storage.set("link", "accesstoken", accessToken);
+        storage.set("link", "refreshtoken", refreshToken);
+        storage.set("link", "projectid", projectId);
       })
       .finally(() => {
         setSelectedProject(project);

package/src/lib/{NucDialog/NucDialog.jsx → APITreeDialog/APITreeDialog.jsx}

@@ -1,5 +1,3 @@
-import React from "react";
-
 import { Close, Fullscreen, FullscreenExit } from "@mui/icons-material";
 import {
   Dialog,
@@ -8,9 +6,9 @@ import {
   DialogTitle,
   IconButton,
 } from "@mui/material";
-import { storage, useStorage } from "@nucleoidjs/webstorage";
+import React, { useState } from "react";
 
-function NucDialog({
+function APITreeDialog({
   title,
   minWidth = 600,
   children,
@@ -20,7 +18,7 @@ function NucDialog({
   maximizedDimensions = { width: "65rem", height: "50rem" },
   minimizedDimensions = { width: "55rem", height: "40rem" },
 }) {
-  const [maximized] = useStorage("platform", title, "maximized", false);
+  const [maximized, setMaximized] = useState(false);
   const currentDimensions = maximized
     ? maximizedDimensions
     : minimizedDimensions;
@@ -63,7 +61,7 @@ function NucDialog({
       {maximized ? (
         <IconButton
           aria-label="collapse"
-          onClick={() => storage.set("platform", title, "maximized", false)}
+          onClick={() => setMaximized(false)}
           sx={{
             position: "absolute",
             right: 48,
@@ -76,7 +74,7 @@ function NucDialog({
       ) : (
         <IconButton
           aria-label="expand"
-          onClick={() => storage.set("platform", title, "maximized", true)}
+          onClick={() => setMaximized(true)}
           sx={{
             position: "absolute",
             right: 48,
@@ -105,4 +103,4 @@ function NucDialog({
   );
 }
 
-export default NucDialog;
+export default APITreeDialog;

package/src/lib/APITreeDialog/index.js

@@ -0,0 +1 @@
+export { default } from "./APITreeDialog";