Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP

bowatts · bowatts · commit 7c7d60867433 · 2025-05-29T08:27:57.000-05:00
diff --git a/src/pages/_app.js b/src/pages/_app.js
@@ -34,8 +34,8 @@ import { usePathname } from "next/navigation";
 import { useRouter } from "next/router";
 import { persistQueryClient } from "@tanstack/react-query-persist-client";
 import { createSyncStoragePersister } from "@tanstack/query-sync-storage-persister";
+
 TimeAgo.addDefaultLocale(en);
-import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 
 const queryClient = new QueryClient();
 const clientSideEmotionCache = createEmotionCache();
@@ -70,7 +70,7 @@ const App = (props) => {
               if (!queryKey || !queryKey.length) {
                 return false;
               }
-              const queryKeyString = String(queryKey[0] || '');
+              const queryKeyString = String(queryKey[0] || "");
               const excludeFromPersisting = excludeQueryKeys.some((key) =>
                 queryKeyString.includes(key)
               );
@@ -132,6 +132,12 @@ const App = (props) => {
     },
   ];
 
+  const ReactQueryDevtoolsProduction = React.lazy(() =>
+    import("@tanstack/react-query-devtools/build/modern/production.js").then((d) => ({
+      default: d.ReactQueryDevtools,
+    }))
+  );
+
   return (
     <CacheProvider value={emotionCache}>
       <Head>
@@ -178,7 +184,7 @@ const App = (props) => {
                       </ThemeProvider>
                       {settings.isInitialized && settings?.showDevtools === true ? (
                         <React.Suspense fallback={null}>
-                          <ReactQueryDevtools />
+                          <ReactQueryDevtoolsProduction />
                         </React.Suspense>
                       ) : null}
                     </>
diff --git a/src/pages/cipp/super-admin/cipp-roles/index.js b/src/pages/cipp/super-admin/cipp-roles/index.js
@@ -12,14 +12,10 @@ const Page = () => {
       <CardContent>
         <Stack spacing={2}>
           <Typography variant="body2">
-            CIPP roles can be used to restrict permissions for users with the 'editor' or
-            'readonly' roles in CIPP. They can be limited to a subset of tenants and API
-            permissions. To restrict direct API access, create a role with the name 'CIPP-API'.
+            CIPP roles can be used to restrict permissions for users with the 'editor' or 'readonly'
+            roles in CIPP. They can be limited to a subset of tenants and API permissions. To
+            restrict direct API access, create a role with the name 'CIPP-API'.
           </Typography>
-          <Alert color="warning" icon={<WarningAmberOutlined />}>
-            This functionality is in beta and should be treated as such. The custom role must be
-            added to the user in SWA in conjunction with the base role. (e.g. editor,mycustomrole)
-          </Alert>
           <CippRoles />
         </Stack>
       </CardContent>
