quidproquo-web-admin 0.0.263 → 0.1.1

package/lib/esm/LogViewer/logic/actionComponentMap/webserver/webserverOpenApiSpecActionComponentMap.d.ts

@@ -0,0 +1,2 @@
+declare const webserverOpenApiSpecActionComponentMap: Record<string, string[]>;
+export default webserverOpenApiSpecActionComponentMap;

package/lib/esm/LogViewer/logic/actionComponentMap/webserver/webserverOpenApiSpecActionComponentMap.js

@@ -0,0 +1,5 @@
+import { OpenApiSpecActionType } from 'quidproquo-webserver';
+const webserverOpenApiSpecActionComponentMap = {
+    [OpenApiSpecActionType.GetOpenApiSpec]: ['askGetOpenApiSpec'],
+};
+export default webserverOpenApiSpecActionComponentMap;

package/lib/esm/LogViewer/logic/actionComponentMap/webserver/webserverRouteAuthValidationActionComponentMap.d.ts

@@ -0,0 +1,2 @@
+declare const webserverRouteAuthValidationActionComponentMap: Record<string, string[]>;
+export default webserverRouteAuthValidationActionComponentMap;

package/lib/esm/LogViewer/logic/actionComponentMap/webserver/webserverRouteAuthValidationActionComponentMap.js

@@ -0,0 +1,5 @@
+import { RouteAuthValidationActionType } from 'quidproquo-webserver';
+const webserverRouteAuthValidationActionComponentMap = {
+    [RouteAuthValidationActionType.Decode]: ['askRouteAuthValidationDecode', 'event', 'routeAuthSettings', 'ignoreExpiration'],
+};
+export default webserverRouteAuthValidationActionComponentMap;

package/lib/esm/LogViewer/logic/actionComponentMap/webserver/webserverServiceActionComponentMap.d.ts

@@ -0,0 +1,2 @@
+declare const webserverServiceActionComponentMap: Record<string, string[]>;
+export default webserverServiceActionComponentMap;

package/lib/esm/LogViewer/logic/actionComponentMap/webserver/webserverServiceActionComponentMap.js

@@ -0,0 +1,5 @@
+import { ServiceActionType } from 'quidproquo-webserver';
+const webserverServiceActionComponentMap = {
+    [ServiceActionType.Request]: ['askServiceRequest', 'serviceName', 'method', 'payload'],
+};
+export default webserverServiceActionComponentMap;

package/lib/esm/LogViewer/logic/actionComponentMap/webserver/webserverWebEntryActionComponentMap.js

@@ -1,5 +1,5 @@
 import { WebEntryActionType } from 'quidproquo-webserver';
 const webserverWebEntryActionComponentMap = {
-    [WebEntryActionType.InvalidateCache]: ['askWebEntryInvalidateCache', 'entryName'],
+    [WebEntryActionType.InvalidateCache]: ['askWebEntryInvalidateCache', 'webEntryName', 'paths'],
 };
 export default webserverWebEntryActionComponentMap;

package/lib/esm/LogViewer/logic/index.d.ts

@@ -2,7 +2,6 @@ export * from './createHierarchy';
 export * from './filterLogs';
 export * from './findLogDirectChildren';
 export * from './findRootLog';
-export * from './getFederationManifestUrl';
 export * from './getLogHierarchy';
 export * from './getLogs';
 export * from './getLogUrl';

package/lib/esm/LogViewer/logic/index.js

@@ -2,7 +2,6 @@ export * from './createHierarchy';
 export * from './filterLogs';
 export * from './findLogDirectChildren';
 export * from './findRootLog';
-export * from './getFederationManifestUrl';
 export * from './getLogHierarchy';
 export * from './getLogs';
 export * from './getLogUrl';

package/lib/esm/components/AdminDialog.d.ts

@@ -20,5 +20,5 @@ interface AdminDialogProps {
     }[];
     children: React.ReactNode;
 }
-export declare const AdminDialog: ({ open, handleClose, title, selectedTab, onSelectTab, tabs, buttons, children }: AdminDialogProps) => import("react/jsx-runtime").JSX.Element;
+export declare const AdminDialog: ({ open, handleClose, title, selectedTab, onSelectTab, tabs, buttons, children }: AdminDialogProps) => import("react").JSX.Element;
 export {};

package/lib/esm/components/AsyncButton.d.ts

@@ -1,9 +1,9 @@
-import { ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 interface AsyncButtonProps {
     onClick: (event: any) => Promise<void>;
     children?: ReactNode;
     disabled?: boolean;
     type?: 'button' | 'submit' | 'reset';
 }
-export declare function AsyncButton({ onClick, children, disabled, type }: AsyncButtonProps): import("react/jsx-runtime").JSX.Element;
+export declare function AsyncButton({ onClick, children, disabled, type }: AsyncButtonProps): React.JSX.Element;
 export {};

package/lib/esm/components/DataGrid.d.ts

@@ -13,4 +13,4 @@ export interface DataGridProps<T extends object> {
     columns: DataGridColumDefinitions<T>[];
     onRowClick?: (row: T) => void;
 }
-export declare const DataGrid: <T extends object>({ items, columns, onRowClick }: DataGridProps<T>) => import("react/jsx-runtime").JSX.Element;
+export declare const DataGrid: <T extends object>({ items, columns, onRowClick }: DataGridProps<T>) => import("react").JSX.Element;

package/lib/esm/components/DataGridPagination/DataGridPagination.d.ts

@@ -1 +1 @@
-export declare function DataGridPagination(): import("react/jsx-runtime").JSX.Element;
+export declare function DataGridPagination(): import("react").JSX.Element;

package/lib/esm/components/LastSeen/LastSeen.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("react").MemoExoticComponent<(props: any) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: any) => import("react").JSX.Element>;
 export default _default;

package/lib/esm/components/LoadingBox/LoadingBox.d.ts

@@ -4,5 +4,5 @@ interface LoadingBoxProps<T> {
     renderItem: (item: T) => React.ReactNode;
     renderLoading?: () => React.ReactNode;
 }
-export declare const LoadingBox: <T>({ path, renderItem, renderLoading }: LoadingBoxProps<T>) => import("react/jsx-runtime").JSX.Element;
+export declare const LoadingBox: <T>({ path, renderItem, renderLoading }: LoadingBoxProps<T>) => React.JSX.Element;
 export {};

package/lib/esm/components/MainLayout/MainLayout.d.ts

@@ -1 +1 @@
-export declare function MainLayout(): import("react/jsx-runtime").JSX.Element;
+export declare function MainLayout(): import("react").JSX.Element;

package/lib/esm/components/MainLayout/MainLayout.js

@@ -1,11 +1,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useQpqRuntime } from 'quidproquo-web-react';
+import LogoutIcon from '@mui/icons-material/Logout';
 import { BottomNavigation, BottomNavigationAction, CircularProgress } from '@mui/material';
 import Box from '@mui/material/Box';
+import { authRuntime } from '../../Auth/logic';
 import { useUrlFields } from '../../queryParams';
 import { useTabs } from './hooks/useTabs';
 export function MainLayout() {
     const { tabs, loading } = useTabs();
     const { tab, handleTabOnChange } = useUrlFields();
+    const [authApi] = useQpqRuntime(authRuntime);
     return (_jsxs(Box, { sx: {
             display: 'flex',
             flexDirection: 'column',
@@ -17,7 +21,12 @@ export function MainLayout() {
                     pb: '56px', // <— prevent content from being hidden behind bottom nav
                 }, children: tabs
                     .filter((t, index) => index === tab)
-                    .map((tab) => (_jsx(tab.View, {}, tab.name))) }), _jsxs(BottomNavigation, { value: tab, onChange: (event, newValue) => handleTabOnChange(event, newValue), showLabels: true, sx: {
+                    .map((tab) => (_jsx(tab.View, {}, tab.name))) }), _jsxs(BottomNavigation, { value: tab, onChange: (event, newValue) => {
+                    // The trailing Logout / Loading actions are not tabs
+                    if (newValue < tabs.length) {
+                        handleTabOnChange(event, newValue);
+                    }
+                }, showLabels: true, sx: {
                     position: 'fixed',
                     bottom: 0,
                     left: 0,
@@ -26,5 +35,5 @@ export function MainLayout() {
                     borderTop: 1,
                     borderColor: 'divider',
                     bgcolor: 'background.paper',
-                }, children: [tabs.map((t) => (_jsx(BottomNavigationAction, { label: t.name, icon: t.icon }, t.name))), loading && _jsx(BottomNavigationAction, { label: "Loading", icon: _jsx(CircularProgress, { size: 18 }), disabled: true })] })] }));
+                }, children: [tabs.map((t) => (_jsx(BottomNavigationAction, { label: t.name, icon: t.icon }, t.name))), loading && _jsx(BottomNavigationAction, { label: "Loading", icon: _jsx(CircularProgress, { size: 18 }), disabled: true }), _jsx(BottomNavigationAction, { label: "Logout", icon: _jsx(LogoutIcon, {}), onClick: () => authApi.authLogout() })] })] }));
 }

package/lib/esm/index.d.ts

@@ -1,3 +1,5 @@
 export * from './addonSupport';
 export * from './App';
 export * from './components';
+export * from './FederatedAddon';
+export * from './FederatedAddonProvider';

package/lib/esm/index.js

@@ -1,3 +1,5 @@
 export * from './addonSupport';
 export * from './App';
 export * from './components';
+export * from './FederatedAddon';
+export * from './FederatedAddonProvider';

package/lib/esm/logic/platform/apiRequest.js

@@ -1,28 +1,41 @@
-import axios from 'axios';
+import { preformNetworkRequest } from 'quidproquo-webserver';
 const getHeaders = (accessToken) => ({
     'Content-Type': 'application/json',
     ...(accessToken ? { Authorization: `Bearer ${accessToken}` } : {}),
 });
-const getAxiosInstance = (apiBaseUrl, accessToken) => {
-    const instance = axios.create({
-        baseURL: apiBaseUrl,
-        headers: getHeaders(accessToken),
-    });
-    return instance;
+const unwrap = (response) => {
+    if (response.status < 200 || response.status >= 300) {
+        throw new Error(`Request failed with status ${response.status}`);
+    }
+    return response.data;
 };
 export const apiRequestPost = async (path, body, apiBaseUrl, accessToken) => {
-    const res = await getAxiosInstance(apiBaseUrl, accessToken).post(path, body);
-    return res.data;
+    const response = await preformNetworkRequest({
+        method: 'POST',
+        url: path,
+        basePath: apiBaseUrl,
+        headers: getHeaders(accessToken),
+        body,
+        responseType: 'json',
+    });
+    return unwrap(response);
 };
 export const apiRequestGet = async (path, apiBaseUrl, accessToken) => {
-    const res = await getAxiosInstance(apiBaseUrl, accessToken).get(path);
-    return res.data;
+    const response = await preformNetworkRequest({
+        method: 'GET',
+        url: path,
+        basePath: apiBaseUrl,
+        headers: getHeaders(accessToken),
+        responseType: 'json',
+    });
+    return unwrap(response);
 };
 export const externalRequestGet = async (path) => {
-    const res = await axios
-        .create({
+    const response = await preformNetworkRequest({
+        method: 'GET',
+        url: path,
         headers: getHeaders(),
-    })
-        .get(path);
-    return res.data;
+        responseType: 'json',
+    });
+    return unwrap(response);
 };

package/lib/esm/useFederatedAddon.js

@@ -1,46 +1,17 @@
 import { useAuthAccessToken, useBaseUrlResolvers } from 'quidproquo-web-react';
 import { useEffect, useState } from 'react';
-import { loadRemote, registerRemotes } from '@module-federation/enhanced/runtime';
-import { getFederationManifest } from './LogViewer/logic';
+import { useLoadFederatedAddons } from './FederatedAddonProvider';
 export function useFederatedAddon() {
     const [federatedAddons, setFederatedAddons] = useState([]);
     const [loading, setLoading] = useState(false);
     const accessToken = useAuthAccessToken();
     const baseUrlResolvers = useBaseUrlResolvers();
+    const loadAddons = useLoadFederatedAddons();
     useEffect(() => {
         const doAsyncWork = async () => {
             setLoading(true);
-            const manifestUrl = `${baseUrlResolvers.getMFManifestUrl()}/mf-manifest.json`;
-            console.log(`manifestUrl: [${manifestUrl}]`);
-            if (!manifestUrl) {
-                console.log(`Missing manifest Url`);
-                return;
-            }
-            console.log(`Reading manifest: [${manifestUrl}]`);
-            const manifest = await getFederationManifest(baseUrlResolvers.getApiUrl(), manifestUrl);
-            if (!manifest.id) {
-                console.log(`Manifest missing id`);
-                return;
-            }
-            // Update the remote
-            console.log(`Updating remote: [${manifest.id}]`);
-            registerRemotes([
-                {
-                    name: manifest.id,
-                    entry: manifestUrl,
-                },
-            ], { force: true });
-            // Load the remote
-            console.log(`Loading remote: [${manifest.id}]`);
-            const remote = await loadRemote(`${manifest.id}/shared`, {
-                from: 'runtime',
-            });
-            if (remote && typeof remote === 'object') {
-                const allAddons = Object.values(remote)
-                    .filter((possibleAddon) => typeof possibleAddon === 'object')
-                    .filter((possibleAddon) => possibleAddon.isQpqAdminFederatedAddon);
-                setFederatedAddons(allAddons);
-            }
+            const addons = await loadAddons({ baseUrlResolvers, accessToken });
+            setFederatedAddons(addons);
         };
         doAsyncWork()
             .catch((e) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-web-admin",
-  "version": "0.0.263",
+  "version": "0.1.1",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -34,7 +34,6 @@
   "dependencies": {
     "@emotion/react": "^11.10.8",
     "@emotion/styled": "^11.10.8",
-    "@module-federation/enhanced": "^0.22.0",
     "@mui/icons-material": "^5.11.16",
     "@mui/lab": "^5.0.0-alpha.128",
     "@mui/material": "^5.12.2",
@@ -45,13 +44,13 @@
     "date-fns": "^2.30.0",
     "dayjs": "^1.11.7",
     "javascript-time-ago": "^2.5.9",
-    "quidproquo-core": "0.0.263",
-    "quidproquo-tsconfig": "0.0.263",
-    "quidproquo-web": "0.0.263",
-    "quidproquo-web-react": "0.0.263",
-    "quidproquo-webserver": "0.0.263",
+    "quidproquo-core": "0.1.1",
+    "quidproquo-tsconfig": "0.1.1",
+    "quidproquo-web": "0.1.1",
+    "quidproquo-web-react": "0.1.1",
+    "quidproquo-webserver": "0.1.1",
     "react": ">=18.3.1",
-    "react-d3-tree": "^3.6.0",
+    "react-d3-tree": "^3.6.6",
     "react-dom": "18.3.1",
     "react-icons": "^4.8.0",
     "react-inspector": "^6.0.2",
@@ -61,23 +60,12 @@
     "recharts": "^2.12.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.5",
-    "@babel/plugin-transform-react-jsx": "^7.21.5",
-    "@babel/preset-env": "^7.21.5",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.21.5",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/react": "^16.3.2",
     "@types/node": "^22.13.13",
     "@types/react-dom": "^18.3.0",
-    "@types/webpack": "^5.28.5",
-    "@types/webpack-dev-server": "^4.7.2",
-    "babel-loader": "^9.1.2",
-    "html-webpack-plugin": "^5.5.1",
-    "path-browserify": "^1.0.1",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.8.2",
-    "webpack": "^5.98.0",
-    "webpack-cli": "^5.0.2",
-    "webpack-dev-server": "^5.2.2"
+    "typescript": "^5.8.2"
   },
   "peerDependencies": {
     "react": ">=18.3.1"

package/lib/commonjs/LogViewer/logic/getFederationManifestUrl.d.ts

@@ -1,3 +0,0 @@
-export declare function getFederationManifest(apiBaseUrl: string, url: string): Promise<{
-    id: string;
-}>;

package/lib/commonjs/LogViewer/logic/getFederationManifestUrl.js

@@ -1,19 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFederationManifest = getFederationManifest;
-const logic_1 = require("../../logic");
-function getFederationManifest(apiBaseUrl, url) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const manifestUrlJson = yield (0, logic_1.apiRequestGet)(url, apiBaseUrl);
-        return manifestUrlJson;
-    });
-}

package/lib/esm/LogViewer/logic/getFederationManifestUrl.d.ts

@@ -1,3 +0,0 @@
-export declare function getFederationManifest(apiBaseUrl: string, url: string): Promise<{
-    id: string;
-}>;

package/lib/esm/LogViewer/logic/getFederationManifestUrl.js

@@ -1,5 +0,0 @@
-import { apiRequestGet } from '../../logic';
-export async function getFederationManifest(apiBaseUrl, url) {
-    const manifestUrlJson = await apiRequestGet(url, apiBaseUrl);
-    return manifestUrlJson;
-}