Log In v6
diff --git a/apps/ui-community/src/components/layouts/root/index.tsx b/apps/ui-community/src/components/layouts/root/index.tsx
index aacfceedd..cfb258222 100644
--- a/apps/ui-community/src/components/layouts/root/index.tsx
+++ b/apps/ui-community/src/components/layouts/root/index.tsx
@@ -1,7 +1,5 @@
import { SectionLayout } from './section-layout.tsx';
export const Root: React.FC = () => {
- return (
-
- )
-}
\ No newline at end of file
+ return
;
+};
diff --git a/apps/ui-community/src/components/layouts/root/pages/cms-page.stories.tsx b/apps/ui-community/src/components/layouts/root/pages/cms-page.stories.tsx
index 80b1721b9..57bc8ef53 100644
--- a/apps/ui-community/src/components/layouts/root/pages/cms-page.stories.tsx
+++ b/apps/ui-community/src/components/layouts/root/pages/cms-page.stories.tsx
@@ -3,23 +3,23 @@ import { expect, within } from 'storybook/test';
import { Root } from '../index.tsx';
const meta = {
- title: 'Pages/Root/Cms Page',
- component: Root,
- parameters: {
- layout: 'fullscreen',
- },
+ title: 'Pages/Root/Cms Page',
+ component: Root,
+ parameters: {
+ layout: 'fullscreen',
+ },
} satisfies Meta
;
export default meta;
type Story = StoryObj;
export const Default: Story = {
- args: {},
- play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
+ args: {},
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
- // Verify the CMS page text is present
- const cmsText = await canvas.findByText('Pretend this is a CMS page');
- expect(cmsText).toBeInTheDocument();
- },
-};
\ No newline at end of file
+ // Verify the CMS page text is present
+ const cmsText = await canvas.findByText('Pretend this is a CMS page');
+ expect(cmsText).toBeInTheDocument();
+ },
+};
diff --git a/apps/ui-community/src/components/layouts/root/pages/cms-page.tsx b/apps/ui-community/src/components/layouts/root/pages/cms-page.tsx
index 7d936c201..c171746dc 100644
--- a/apps/ui-community/src/components/layouts/root/pages/cms-page.tsx
+++ b/apps/ui-community/src/components/layouts/root/pages/cms-page.tsx
@@ -3,12 +3,11 @@ import { Typography } from 'antd';
const { Text } = Typography;
export const CmsPage: React.FC = () => {
-
- return (
-
- Pretend this is a CMS page
- With some additional content
-
- );
-}
\ No newline at end of file
+ return (
+
+ Pretend this is a CMS page
+ With some additional content
+
+ );
+};
diff --git a/apps/ui-community/src/components/layouts/root/section-layout.tsx b/apps/ui-community/src/components/layouts/root/section-layout.tsx
index 17d421bf5..e9429e9b4 100644
--- a/apps/ui-community/src/components/layouts/root/section-layout.tsx
+++ b/apps/ui-community/src/components/layouts/root/section-layout.tsx
@@ -1,12 +1,11 @@
-
import { Header } from './components/header.tsx';
import { CmsPage } from './pages/cms-page.tsx';
export const SectionLayout: React.FC = () => {
- return (
-
-
-
- );
+ return (
+
+
+
+ );
};
diff --git a/apps/ui-community/src/components/layouts/shared/components/menu-component.stories.tsx b/apps/ui-community/src/components/layouts/shared/components/menu-component.stories.tsx
new file mode 100644
index 000000000..3a0e2193d
--- /dev/null
+++ b/apps/ui-community/src/components/layouts/shared/components/menu-component.stories.tsx
@@ -0,0 +1,181 @@
+import { HomeOutlined, SettingOutlined, TeamOutlined } from '@ant-design/icons';
+import type { Meta, StoryObj } from '@storybook/react';
+import { BrowserRouter } from 'react-router-dom';
+import { expect, within } from 'storybook/test';
+import type { Member } from '../../../../generated.tsx';
+import { MenuComponent, type PageLayoutProps } from './menu-component.tsx';
+
+const mockPageLayouts: PageLayoutProps[] = [
+ {
+ path: '',
+ title: 'Home',
+ icon:
+
+
+
+ ),
+ ],
+} satisfies Meta;
+
+export default meta;
+type Story = StoryObj;
+
+export const Default: Story = {
+ args: {
+ pageLayouts: mockPageLayouts,
+ theme: 'light',
+ mode: 'inline',
+ },
+ play: ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ // Verify menu items are rendered
+ expect(canvas.getByText('Home')).toBeInTheDocument();
+ expect(canvas.getByText('Settings')).toBeInTheDocument();
+ expect(canvas.getByText('Members')).toBeInTheDocument();
+ },
+};
+
+export const DarkTheme: Story = {
+ args: {
+ pageLayouts: mockPageLayouts,
+ theme: 'dark',
+ mode: 'inline',
+ },
+};
+
+export const HorizontalMode: Story = {
+ args: {
+ pageLayouts: mockPageLayouts,
+ theme: 'light',
+ mode: 'horizontal',
+ },
+};
+
+export const WithMemberData: Story = {
+ args: {
+ pageLayouts: mockPageLayouts,
+ theme: 'light',
+ mode: 'inline',
+ memberData: mockMember,
+ },
+};
+
+export const WithPermissions: Story = {
+ args: {
+ pageLayouts: [
+ {
+ path: '',
+ title: 'Home',
+ icon: = ({
+ pageLayouts,
+ memberData,
+ ...props
+}) => {
+ const params = useParams();
+ const location = useLocation();
+
+ const createPath = (path: string): string => {
+ return generatePath(path.replaceAll('*', ''), params);
+ };
+
+ const buildMenu = (
+ parentId: string | number,
+ ): React.ReactNode[] | undefined => {
+ const children = pageLayouts.filter((x) => x.parent === parentId);
+ if (!children || children.length === 0) {
+ return;
+ }
+ return children
+ .map((x) => {
+ const child = pageLayouts.find((y) => y.id === x.id);
+ if (!child) return null;
+
+ const grandChildren = pageLayouts.filter(
+ (gc) => gc.parent === child.id,
+ );
+
+ if (
+ memberData &&
+ child.hasPermissions &&
+ !child.hasPermissions(memberData)
+ ) {
+ return null;
+ }
+
+ return grandChildren && grandChildren.length > 0 ? (
+
+
+
+ {buildMenu(child.id)}
+
+ ) : (
+
+
+ );
+ })
+ .filter(Boolean);
+ };
+
+ const topMenu = () => {
+ const root = pageLayouts.find((x) => x.id === 'ROOT');
+ if (!root) return null;
+
+ const matchedPages = matchRoutes(pageLayouts as RouteObject[], location);
+ const matchedIds = matchedPages
+ ? matchedPages.map((x) => x.route.id?.toString() ?? '')
+ : [];
+
+ return (
+
+
+
+ {buildMenu(root.id)}
+
+ );
+ };
+
+ return topMenu();
+};
diff --git a/apps/ui-community/src/components/ui/molecules/auth-landing/auth-landing.stories.tsx b/apps/ui-community/src/components/ui/molecules/auth-landing/auth-landing.stories.tsx
index db393b742..5794ab0d1 100644
--- a/apps/ui-community/src/components/ui/molecules/auth-landing/auth-landing.stories.tsx
+++ b/apps/ui-community/src/components/ui/molecules/auth-landing/auth-landing.stories.tsx
@@ -1,31 +1,31 @@
import type { Meta, StoryObj } from '@storybook/react';
-import { expect } from 'storybook/test';
import { MemoryRouter } from 'react-router-dom';
+import { expect } from 'storybook/test';
import { AuthLanding } from './index.tsx';
const meta = {
- title: 'Components/UI/Molecules/AuthLanding',
- component: AuthLanding,
- parameters: {
- layout: 'fullscreen',
- },
- decorators: [
- (Story) => (
-
-
- ),
- ],
+ title: 'Components/UI/Molecules/AuthLanding',
+ component: AuthLanding,
+ parameters: {
+ layout: 'fullscreen',
+ },
+ decorators: [
+ (Story) => (
+
+
+ ),
+ ],
} satisfies Meta;
export default meta;
type Story = StoryObj;
export const Default: Story = {
- args: {},
- play: ({ canvasElement }) => {
- // The AuthLanding component renders a Navigate component which doesn't render visible content
- // We can only verify that the component doesn't throw an error during rendering
- expect(canvasElement).toBeTruthy();
- },
-};
\ No newline at end of file
+ args: {},
+ play: ({ canvasElement }) => {
+ // The AuthLanding component renders a Navigate component which doesn't render visible content
+ // We can only verify that the component doesn't throw an error during rendering
+ expect(canvasElement).toBeTruthy();
+ },
+};
diff --git a/apps/ui-community/src/components/ui/molecules/auth-landing/index.tsx b/apps/ui-community/src/components/ui/molecules/auth-landing/index.tsx
index 89c690ccd..94aac3a69 100644
--- a/apps/ui-community/src/components/ui/molecules/auth-landing/index.tsx
+++ b/apps/ui-community/src/components/ui/molecules/auth-landing/index.tsx
@@ -1,7 +1,5 @@
-import { Navigate } from "react-router-dom";
+import { Navigate } from 'react-router-dom';
export const AuthLanding: React.FC = () => {
- return (
- ,
+ getItem(key: string) {
+ return this.store[key] || null;
+ },
+ setItem(key: string, value: string) {
+ this.store[key] = value;
+ },
+ removeItem(key: string) {
+ delete this.store[key];
+ },
+ clear() {
+ this.store = {};
+ },
+ key: (index: number) => Object.keys(mockStorage.store)[index] || null,
+ get length() {
+ return Object.keys(this.store).length;
+ },
};
// Setup global mocks
-Object.defineProperty(window, 'sessionStorage', { value: mockStorage, writable: true });
-Object.defineProperty(window, 'localStorage', { value: mockStorage, writable: true });
+Object.defineProperty(globalThis, 'sessionStorage', {
+ value: mockStorage,
+ writable: true,
+});
+Object.defineProperty(globalThis, 'localStorage', {
+ value: mockStorage,
+ writable: true,
+});
// Mock import.meta.env
-Object.defineProperty(import.meta, 'env', {
- value: mockEnv,
- writable: true,
-});
+try {
+ Object.defineProperty(import.meta, 'env', {
+ value: mockEnv,
+ writable: true,
+ });
+} catch (e) {
+ console.warn('Could not mock import.meta.env', e);
+}
const meta = {
- title: 'Components/UI/Organisms/ApolloConnection/Apollo Client Links',
- parameters: {
- layout: 'fullscreen',
- docs: {
- description: {
- component: 'Utility functions for creating Apollo Client links with authentication, custom headers, and GraphQL server configuration. These stories demonstrate how the link functions work within the ApolloConnection component.',
- },
- },
- },
- decorators: [
- (Story) => (
-
-
-
-
-
-
- ),
- ],
-} satisfies Meta;
+ title: 'Components/UI/Organisms/ApolloConnection/Apollo Client Links',
+ parameters: {
+ layout: 'fullscreen',
+ },
+} satisfies Meta;
export default meta;
-type Story = StoryObj;
-// Test component that verifies Apollo link functionality
-const ApolloLinkTester = () => {
- const apolloClient = useApolloClient();
- const [authResult, setAuthResult] = useState(null);
- const [headersResult, setHeadersResult] = useState(null);
- const authButtonRef = useRef(null);
- const headersButtonRef = useRef(null);
+// Terminating link for testing
+const mockTerminatingLink = new ApolloLink((_operation) => {
+ return new Observable((observer) => {
+ observer.next({
+ data: {
+ __typename: 'Query',
+ test: 'success',
+ },
+ });
+ observer.complete();
+ });
+});
- const testAuthHeader = async () => {
- try {
- // This will test if the auth header link is working
- const result = await apolloClient.query({
- query: gql`
+// Test component that verifies Apollo link functionality
+const ApolloLinkTester = ({ customClient }: { customClient?: ApolloClient }) => {
+ const defaultClient = useApolloClient();
+ const activeClient = customClient || defaultClient;
+ const [authResult, setAuthResult] = useState(null);
+ const [headersResult, setHeadersResult] = useState(null);
+
+ const testAuthHeader = async () => {
+ try {
+ // We use a query that will trigger the link chain
+ // We don't care about the actual result, just that it doesn't throw before the link runs
+ const result = await activeClient.query({
+ query: gql`
query TestQuery {
__typename
}
`,
- fetchPolicy: 'network-only'
- });
- const resultData = { success: true, data: result.data };
- setAuthResult(JSON.stringify(resultData));
- return resultData;
- } catch (error: unknown) {
- const errorMessage = error instanceof Error ? error.message : 'Unknown error';
- const resultData = { success: false, error: errorMessage };
- setAuthResult(JSON.stringify(resultData));
- return resultData;
- }
- };
-
- const testCustomHeaders = () => {
- // Test that custom headers are being set
- const { link } = apolloClient;
- const resultData = { linkType: link.constructor.name };
- setHeadersResult(JSON.stringify(resultData));
- return resultData;
- };
-
- return (
-
-
- Test Auth Header
-
-
- Test Custom Headers
-
-
- Client Link Chain: {apolloClient.link.constructor.name}
-
-
+
+ Test Auth Header
+
+
+ Test Custom Headers
+
+
{authResult}
+
{headersResult}
+
+ Client Link Chain: {activeClient.link?.constructor.name || 'None'}
+
+
-
- ),
- play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
- const canvas = within(canvasElement);
- const tester = await canvas.findByTestId('apollo-link-tester');
+export const AuthHeaderNoToken: StoryObj = {
+ render: () => {
+ const auth: MockAuth = { user: null, isAuthenticated: false };
+ mockStorage.clear();
+ return } />;
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ await canvas.findByTestId('test-headers-button').then(b => b.click());
+ const result = await canvas.findByTestId('headers-result');
+ expect(result.textContent).toContain('Link');
+ }
+};
- // Verify all test buttons are present within the connection context
- const authButton = await canvas.findByTestId('test-auth-button');
- const headersButton = await canvas.findByTestId('test-headers-button');
- expect(authButton).toBeInTheDocument();
- expect(headersButton).toBeInTheDocument();
+export const ApolloConnectionIntegration: StoryObj = {
+ render: () => (
+
+
+
+
+
+
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ expect(await canvas.findByTestId('apollo-link-tester')).toBeInTheDocument();
+ }
+};
- // Verify client info is displayed
- const clientInfo = await canvas.findByTestId('client-info');
- expect(clientInfo).toHaveTextContent('Client Link Chain');
- },
-};
\ No newline at end of file
diff --git a/apps/ui-community/src/components/ui/organisms/apollo-connection/apollo-client-links.tsx b/apps/ui-community/src/components/ui/organisms/apollo-connection/apollo-client-links.tsx
index 97f73295b..87f9d4d1c 100644
--- a/apps/ui-community/src/components/ui/organisms/apollo-connection/apollo-client-links.tsx
+++ b/apps/ui-community/src/components/ui/organisms/apollo-connection/apollo-client-links.tsx
@@ -1,4 +1,10 @@
-import { ApolloClient, ApolloLink, type DefaultContext, from, InMemoryCache } from '@apollo/client';
+import {
+ ApolloClient,
+ ApolloLink,
+ type DefaultContext,
+ from,
+ InMemoryCache,
+} from '@apollo/client';
import { BatchHttpLink } from '@apollo/client/link/batch-http';
import { setContext } from '@apollo/client/link/context';
import type { UriFunction } from '@apollo/client/link/http';
@@ -7,101 +13,124 @@ import type { AuthContextProps } from 'react-oidc-context';
// apollo client instance
export const client = new ApolloClient({
- cache: new InMemoryCache(),
- // biome-ignore lint:useLiteralKeys
- connectToDevTools: import.meta.env['NODE_ENV'] !== 'production'
+ cache: new InMemoryCache(),
+ devtools: {
+ // biome-ignore lint:useLiteralKeys
+ enabled: import.meta.env['NODE_ENV'] !== 'production',
+ },
});
-
// base apollo link with no customizations
// could be used as a base for the link chain
-export const BaseApolloLink = (): ApolloLink => setContext((_, { headers }) => {
- return {
- headers: {
- ...headers
- }
- };
-});
-
+export const BaseApolloLink = (): ApolloLink =>
+ setContext((_, { headers }) => {
+ return {
+ headers: {
+ ...headers,
+ },
+ };
+ });
// apollo link to add auth header
-export const ApolloLinkToAddAuthHeader = (auth: AuthContextProps): ApolloLink =>
- setContext((_, { headers }) => {
- // Prefer token from react-oidc-context if available; otherwise, fall back to storage.
- let access_token: string | undefined = auth.user?.access_token;
- // In development, fall back to storage to avoid a brief race on refresh.
- // In production, rely solely on react-oidc-context to provide the user/token.
- if (!access_token && typeof window !== 'undefined' && !import.meta.env.PROD) {
- try {
- // biome-ignore lint:useLiteralKeys
- const authority = import.meta.env['VITE_AAD_B2C_ACCOUNT_AUTHORITY'] ?? '';
- // biome-ignore lint:useLiteralKeys
- const client_id = import.meta.env['VITE_AAD_B2C_ACCOUNT_CLIENTID'] ?? '';
- const storageKey = `oidc.user:${authority}:${client_id}`;
- const raw = window.sessionStorage.getItem(storageKey) ?? window.localStorage.getItem(storageKey);
- if (raw) {
- const parsed = JSON.parse(raw);
- access_token = typeof parsed?.access_token === 'string' ? parsed.access_token : undefined;
- }
- } catch {
- // ignore parse/storage errors and proceed without auth header
- }
- }
- return {
- headers: {
- ...headers,
- ...(access_token && { Authorization: `Bearer ${access_token}` })
- }
- };
-});
+export const ApolloLinkToAddAuthHeader = (auth: AuthContextProps): ApolloLink =>
+ setContext((_, { headers }) => {
+ // Prefer token from react-oidc-context if available; otherwise, fall back to storage.
+ let access_token: string | undefined = auth.user?.access_token;
+ // In development, fall back to storage to avoid a brief race on refresh.
+ // In production, rely solely on react-oidc-context to provide the user/token.
+ if (
+ !access_token &&
+ typeof globalThis !== 'undefined' &&
+ !import.meta.env.PROD
+ ) {
+ try {
+ // biome-ignore lint:useLiteralKeys
+ const authority = import.meta.env['VITE_AAD_B2C_ACCOUNT_AUTHORITY'] ?? '';
+ // biome-ignore lint:useLiteralKeys
+ const client_id = import.meta.env['VITE_AAD_B2C_ACCOUNT_CLIENTID'] ?? '';
+ const storageKey = `oidc.user:${authority}:${client_id}`;
+ const raw =
+ globalThis.sessionStorage.getItem(storageKey) ??
+ globalThis.localStorage.getItem(storageKey);
+ if (raw) {
+ const parsed = JSON.parse(raw);
+ access_token =
+ typeof parsed?.access_token === 'string'
+ ? parsed.access_token
+ : undefined;
+ }
+ } catch {
+ // ignore parse/storage errors and proceed without auth header
+ }
+ }
+ return {
+ headers: {
+ ...headers,
+ ...(access_token && { Authorization: `Bearer ${access_token}` }),
+ },
+ };
+ });
// alternate way to add auth header
-export const ApolloLinkToAddAuthHeader1 = (auth: AuthContextProps): ApolloLink => new ApolloLink((operation, forward) => {;
- const access_token = (auth.isAuthenticated) ? auth.user?.access_token : undefined;
- if(!access_token) {
- return forward(operation);
- }
- operation.setContext((prevContext: DefaultContext) => {
- // biome-ignore lint:useLiteralKeys
- prevContext['headers']["Authorization"] = `Bearer ${access_token}`;
- return prevContext;
- });
- return forward(operation);
-});
+export const ApolloLinkToAddAuthHeader1 = (
+ auth: AuthContextProps,
+): ApolloLink =>
+ new ApolloLink((operation, forward) => {
+ const access_token = auth.isAuthenticated
+ ? auth.user?.access_token
+ : undefined;
+ if (!access_token) {
+ return forward(operation);
+ }
+ operation.setContext((prevContext: DefaultContext) => {
+ // biome-ignore lint:useLiteralKeys
+ prevContext['headers']['Authorization'] = `Bearer ${access_token}`;
+ return prevContext;
+ });
+ return forward(operation);
+ });
// alternate way to add auth header
-export const ApolloLinkToAddAuthHeader2 = (auth: AuthContextProps): ApolloLink => {
- return setContext((_, { headers }) => {
- const returnHeaders = { ...headers };
- const access_token = (auth.isAuthenticated === true) ? auth.user?.access_token : undefined;
- if (access_token) {
- // biome-ignore lint:useLiteralKeys
- returnHeaders['Authorization'] = `Bearer ${access_token}`;
- }
- return { headers: returnHeaders };
- });
+export const ApolloLinkToAddAuthHeader2 = (
+ auth: AuthContextProps,
+): ApolloLink => {
+ return setContext((_, { headers }) => {
+ const returnHeaders = { ...headers };
+ const access_token =
+ auth.isAuthenticated === true ? auth.user?.access_token : undefined;
+ if (access_token) {
+ // biome-ignore lint:useLiteralKeys
+ returnHeaders['Authorization'] = `Bearer ${access_token}`;
+ }
+ return { headers: returnHeaders };
+ });
};
-
// apollo link to add custom header
-export const ApolloLinkToAddCustomHeader = (headerName: string, headerValue: string | null | undefined, ifTrue?: boolean): ApolloLink => new ApolloLink((operation, forward) => {
- if(!headerValue || (ifTrue !== undefined && ifTrue === false)) {
- return forward(operation);
- }
- operation.setContext((prevContext: DefaultContext) => {
- // biome-ignore lint:useLiteralKeys
- prevContext['headers'][headerName] = headerValue;
- return prevContext;
- });
- return forward(operation);
-});
-
+export const ApolloLinkToAddCustomHeader = (
+ headerName: string,
+ headerValue: string | null | undefined,
+ ifTrue?: boolean,
+): ApolloLink =>
+ new ApolloLink((operation, forward) => {
+ if (!headerValue || (ifTrue !== undefined && ifTrue === false)) {
+ return forward(operation);
+ }
+ operation.setContext((prevContext: DefaultContext) => {
+ // biome-ignore lint:useLiteralKeys
+ prevContext['headers'][headerName] = headerValue;
+ return prevContext;
+ });
+ return forward(operation);
+ });
// apollo link to batch graphql requests
// includes removeTypenameFromVariables link
-export const TerminatingApolloLinkForGraphqlServer= (config: BatchHttpLink.Options) => {
- const batchHttpLink = new BatchHttpLink({
- uri: config.uri as string | UriFunction,
- batchMax: Number(config.batchMax), // No more than 15 operations per batch
- batchInterval: Number(config.batchInterval) // Wait no more than 50ms after first batched operation
- });
- return from([removeTypenameFromVariables(), batchHttpLink]);
-};
\ No newline at end of file
+export const TerminatingApolloLinkForGraphqlServer = (
+ config: BatchHttpLink.Options,
+) => {
+ const batchHttpLink = new BatchHttpLink({
+ uri: config.uri as string | UriFunction,
+ batchMax: Number(config.batchMax), // No more than 15 operations per batch
+ batchInterval: Number(config.batchInterval), // Wait no more than 50ms after first batched operation
+ });
+ return from([removeTypenameFromVariables(), batchHttpLink]);
+};
diff --git a/apps/ui-community/src/components/ui/organisms/apollo-connection/index.stories.tsx b/apps/ui-community/src/components/ui/organisms/apollo-connection/index.stories.tsx
index 301cef0b5..064cb6541 100644
--- a/apps/ui-community/src/components/ui/organisms/apollo-connection/index.stories.tsx
+++ b/apps/ui-community/src/components/ui/organisms/apollo-connection/index.stories.tsx
@@ -8,206 +8,212 @@ import { ApolloConnection, type ApolloConnectionProps } from './index.tsx';
// Mock environment variables
const mockEnv = {
- VITE_FUNCTION_ENDPOINT: 'https://mock-functions.example.com',
- VITE_AAD_B2C_ACCOUNT_AUTHORITY: 'https://mock-authority.example.com',
- VITE_AAD_B2C_ACCOUNT_CLIENTID: 'mock-client-id',
- NODE_ENV: 'development',
+ VITE_FUNCTION_ENDPOINT: 'https://mock-functions.example.com',
+ VITE_AAD_B2C_ACCOUNT_AUTHORITY: 'https://mock-authority.example.com',
+ VITE_AAD_B2C_ACCOUNT_CLIENTID: 'mock-client-id',
+ NODE_ENV: 'development',
};
// Mock window.sessionStorage and window.localStorage
const mockStorage = {
- getItem: (key: string) => {
- if (key.includes('oidc.user')) {
- return JSON.stringify({
- access_token: '',
- profile: { sub: 'fallback-user' },
- });
- }
- return null;
- },
- setItem: (_key: string, _value: string) => Promise.resolve(),
- removeItem: (_key: string) => Promise.resolve(),
- clear: () => Promise.resolve(),
- key: () => null,
- length: 0,
- set: (_key: string, _value: string) => Promise.resolve(),
- get: (key: string) => Promise.resolve(mockStorage.getItem(key)),
- remove: (key: string) => Promise.resolve(key),
- getAllKeys: () => Promise.resolve([]),
+ getItem: (key: string) => {
+ if (key.includes('oidc.user')) {
+ return JSON.stringify({
+ access_token: '',
+ profile: { sub: 'fallback-user' },
+ });
+ }
+ return null;
+ },
+ setItem: (_key: string, _value: string) => Promise.resolve(),
+ removeItem: (_key: string) => Promise.resolve(),
+ clear: () => Promise.resolve(),
+ key: () => null,
+ length: 0,
+ set: (_key: string, _value: string) => Promise.resolve(),
+ get: (key: string) => Promise.resolve(mockStorage.getItem(key)),
+ remove: (key: string) => Promise.resolve(key),
+ getAllKeys: () => Promise.resolve([]),
};
// Setup global mocks
-Object.defineProperty(window, 'sessionStorage', { value: mockStorage, writable: true });
-Object.defineProperty(window, 'localStorage', { value: mockStorage, writable: true });
+Object.defineProperty(window, 'sessionStorage', {
+ value: mockStorage,
+ writable: true,
+});
+Object.defineProperty(window, 'localStorage', {
+ value: mockStorage,
+ writable: true,
+});
// Mock import.meta.env
Object.defineProperty(import.meta, 'env', {
- value: mockEnv,
- writable: true,
+ value: mockEnv,
+ writable: true,
});
const meta = {
- title: 'Components/UI/Organisms/ApolloConnection',
- component: ApolloConnection,
- parameters: {
- layout: 'fullscreen',
- },
- decorators: [
- (Story) => (
-
-
-
-
- ),
- ],
- argTypes: {
- children: {
- control: { type: 'text' },
- description: 'Child components to be wrapped by ApolloConnection',
- },
- },
+ title: 'Components/UI/Organisms/ApolloConnection',
+ component: ApolloConnection,
+ parameters: {
+ layout: 'fullscreen',
+ },
+ decorators: [
+ (Story) => (
+
+
+
+
+ ),
+ ],
+ argTypes: {
+ children: {
+ control: { type: 'text' },
+ description: 'Child components to be wrapped by ApolloConnection',
+ },
+ },
} satisfies Meta;
export default meta;
type Story = StoryObj;
export const Default: Story = {
- args: {
- children: Test Child Component
,
- } satisfies ApolloConnectionProps,
- decorators: [
- (Story) => (
-
-
- ),
- ],
- play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
- const canvas = within(canvasElement);
-
- // Verify that the component renders without errors
- expect(canvasElement).toBeTruthy();
-
- // Verify that the child component is rendered
- const childElement = await canvas.findByTestId('test-child');
- expect(childElement).toBeInTheDocument();
- expect(childElement).toHaveTextContent('Test Child Component');
- },
+ args: {
+ children: Test Child Component
,
+ } satisfies ApolloConnectionProps,
+ decorators: [
+ (Story) => (
+
+
+ ),
+ ],
+ play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+ const canvas = within(canvasElement);
+
+ // Verify that the component renders without errors
+ expect(canvasElement).toBeTruthy();
+
+ // Verify that the child component is rendered
+ const childElement = await canvas.findByTestId('test-child');
+ expect(childElement).toBeInTheDocument();
+ expect(childElement).toHaveTextContent('Test Child Component');
+ },
};
export const WithCommunityRoute: Story = {
- args: {
- children: Community Page Content
,
- },
- decorators: [
- (Story) => (
-
-
- ),
- ],
- play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
- const canvas = within(canvasElement);
-
- // Verify that the component renders with community context
- expect(canvasElement).toBeTruthy();
-
- // Verify that the child component is rendered
- const childElement = await canvas.findByTestId('community-child');
- expect(childElement).toBeInTheDocument();
- expect(childElement).toHaveTextContent('Community Page Content');
- },
+ args: {
+ children: Community Page Content
,
+ },
+ decorators: [
+ (Story) => (
+
+
+ ),
+ ],
+ play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+ const canvas = within(canvasElement);
+
+ // Verify that the component renders with community context
+ expect(canvasElement).toBeTruthy();
+
+ // Verify that the child component is rendered
+ const childElement = await canvas.findByTestId('community-child');
+ expect(childElement).toBeInTheDocument();
+ expect(childElement).toHaveTextContent('Community Page Content');
+ },
};
export const WithAccountsRoute: Story = {
- args: {
- children: Accounts Page Content
,
- },
- decorators: [
- (Story) => (
-
-
- ),
- ],
- play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
- const canvas = within(canvasElement);
-
- // Verify that the component renders with accounts context
- expect(canvasElement).toBeTruthy();
-
- // Verify that the child component is rendered
- const childElement = await canvas.findByTestId('accounts-child');
- expect(childElement).toBeInTheDocument();
- expect(childElement).toHaveTextContent('Accounts Page Content');
- },
+ args: {
+ children: Accounts Page Content
,
+ },
+ decorators: [
+ (Story) => (
+
+
+ ),
+ ],
+ play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+ const canvas = within(canvasElement);
+
+ // Verify that the component renders with accounts context
+ expect(canvasElement).toBeTruthy();
+
+ // Verify that the child component is rendered
+ const childElement = await canvas.findByTestId('accounts-child');
+ expect(childElement).toBeInTheDocument();
+ expect(childElement).toHaveTextContent('Accounts Page Content');
+ },
};
export const Unauthenticated: Story = {
- args: {
- children: Unauthenticated Content
,
- },
- decorators: [
- (Story) => (
- {
- // Mock unauthenticated state
- return Promise.resolve();
- }}
- >
-
-
-
-
-
- ),
- ],
- play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
- const canvas = within(canvasElement);
-
- // Verify that the component renders even when unauthenticated
- expect(canvasElement).toBeTruthy();
-
- // Verify that the child component is rendered
- const childElement = await canvas.findByTestId('unauth-child');
- expect(childElement).toBeInTheDocument();
- expect(childElement).toHaveTextContent('Unauthenticated Content');
- },
+ args: {
+ children: Unauthenticated Content
,
+ },
+ decorators: [
+ (Story) => (
+ {
+ // Mock unauthenticated state
+ return Promise.resolve();
+ }}
+ >
+
+
+
+
+
+ ),
+ ],
+ play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+ const canvas = within(canvasElement);
+
+ // Verify that the component renders even when unauthenticated
+ expect(canvasElement).toBeTruthy();
+
+ // Verify that the child component is rendered
+ const childElement = await canvas.findByTestId('unauth-child');
+ expect(childElement).toBeInTheDocument();
+ expect(childElement).toHaveTextContent('Unauthenticated Content');
+ },
};
export const WithAdminRoute: Story = {
- args: {
- children: Admin Page Content
,
- },
- decorators: [
- (Story) => (
-
-
- ),
- ],
- play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
- const canvas = within(canvasElement);
-
- // Verify that the component renders with admin context
- expect(canvasElement).toBeTruthy();
-
- // Verify that the child component is rendered
- const childElement = await canvas.findByTestId('admin-child');
- expect(childElement).toBeInTheDocument();
- expect(childElement).toHaveTextContent('Admin Page Content');
- },
-};
\ No newline at end of file
+ args: {
+ children: Admin Page Content
,
+ },
+ decorators: [
+ (Story) => (
+
+
+ ),
+ ],
+ play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+ const canvas = within(canvasElement);
+
+ // Verify that the component renders with admin context
+ expect(canvasElement).toBeTruthy();
+
+ // Verify that the child component is rendered
+ const childElement = await canvas.findByTestId('admin-child');
+ expect(childElement).toBeInTheDocument();
+ expect(childElement).toHaveTextContent('Admin Page Content');
+ },
+};
diff --git a/apps/ui-community/src/components/ui/organisms/apollo-connection/index.tsx b/apps/ui-community/src/components/ui/organisms/apollo-connection/index.tsx
index 0d1087fcb..83025309f 100644
--- a/apps/ui-community/src/components/ui/organisms/apollo-connection/index.tsx
+++ b/apps/ui-community/src/components/ui/organisms/apollo-connection/index.tsx
@@ -1,63 +1,79 @@
-import { ApolloLink, ApolloProvider, from } from "@apollo/client";
+import { ApolloLink, ApolloProvider, from } from '@apollo/client';
import { RestLink } from 'apollo-link-rest';
-import { type FC, useEffect } from "react";
-import { useAuth } from "react-oidc-context";
-import { useParams } from "react-router-dom";
-import { ApolloLinkToAddAuthHeader, ApolloLinkToAddCustomHeader, BaseApolloLink, client, TerminatingApolloLinkForGraphqlServer } from "./apollo-client-links.js";
+import { type FC, useCallback, useEffect } from 'react';
+import { useAuth } from 'react-oidc-context';
+import { useLocation } from 'react-router-dom';
+import {
+ ApolloLinkToAddAuthHeader,
+ ApolloLinkToAddCustomHeader,
+ BaseApolloLink,
+ client,
+ TerminatingApolloLinkForGraphqlServer,
+} from './apollo-client-links.js';
export interface ApolloConnectionProps {
- children: React.ReactNode;
+ children: React.ReactNode;
}
-export const ApolloConnection: FC = (props: ApolloConnectionProps) => {
- const auth = useAuth();
- const params = useParams(); // useParams.memberId won't work here because ApolloConnection wraps the Routes, not inside a Route
- const communityId = params['*']?.slice(0, 24) ?? null;
- const memberId = params['*']?.match(/(member|admin)\/([\w\d]+)/)?.[2] ?? null;
-
-
- const apolloLinkChainForGraphqlDataSource = from([
- BaseApolloLink(),
- ApolloLinkToAddAuthHeader(auth),
- ApolloLinkToAddCustomHeader('community', communityId, (communityId !== 'accounts')),
- ApolloLinkToAddCustomHeader('member', memberId),
- TerminatingApolloLinkForGraphqlServer({
- // biome-ignore lint:useLiteralKeys
- uri: `${import.meta.env['VITE_FUNCTION_ENDPOINT']}`,
- batchMax: 15,
- batchInterval: 50
- })
- ]);
-
- const apolloLinkChainForCountryDataSource = from([
- new RestLink({
- uri: 'https://countries.trevorblades.com/'
- })
- ]);
-
- const linkMap = {
- CountryDetails: apolloLinkChainForCountryDataSource,
- default: apolloLinkChainForGraphqlDataSource
- };
-
- const updateLink = () => {
- return ApolloLink.from([
- ApolloLink.split(
- // various options to split:
- // 1. use a custom property in context: (operation) => operation.getContext().dataSource === some DataSourceEnum,
- // 2. check for string name of the query if it is named: (operation) => operation.operationName === "CountryDetails",
- (operation) => operation.operationName in linkMap,
- new ApolloLink((operation, forward) => {
- const link = linkMap[operation.operationName as keyof typeof linkMap] || linkMap.default;
- return link.request(operation, forward);
- }),
- apolloLinkChainForGraphqlDataSource
- )
- ]);
- };
-
- useEffect(() => {
- client.setLink(updateLink());
- }, [auth]);
-
- return {props.children} ;
+export const ApolloConnection: FC = (
+ props: ApolloConnectionProps,
+) => {
+ const auth = useAuth();
+ const location = useLocation();
+
+ const communityId =
+ location.pathname.match(/\/community\/([a-f\d]{24})/i)?.[1] ?? null;
+ const memberId =
+ location.pathname.match(/\/(member|admin)\/([a-f\d]{24})/i)?.[2] ?? null;
+
+ const apolloLinkChainForGraphqlDataSource = from([
+ BaseApolloLink(),
+ ApolloLinkToAddAuthHeader(auth),
+ ApolloLinkToAddCustomHeader(
+ 'x-community-id',
+ communityId,
+ communityId !== 'accounts',
+ ),
+ ApolloLinkToAddCustomHeader('x-member-id', memberId),
+ TerminatingApolloLinkForGraphqlServer({
+ // biome-ignore lint:useLiteralKeys
+ uri: `${import.meta.env['VITE_FUNCTION_ENDPOINT']}`,
+ batchMax: 15,
+ batchInterval: 50,
+ }),
+ ]);
+
+ const apolloLinkChainForCountryDataSource = from([
+ new RestLink({
+ uri: 'https://countries.trevorblades.com/',
+ }),
+ ]);
+
+ const updateLink = useCallback(() => {
+ const linkMap = {
+ CountryDetails: apolloLinkChainForCountryDataSource,
+ default: apolloLinkChainForGraphqlDataSource,
+ };
+
+ return ApolloLink.from([
+ ApolloLink.split(
+ // various options to split:
+ // 1. use a custom property in context: (operation) => operation.getContext().dataSource === some DataSourceEnum,
+ // 2. check for string name of the query if it is named: (operation) => operation.operationName === "CountryDetails",
+ (operation) => operation.operationName in linkMap,
+ new ApolloLink((operation, forward) => {
+ const link =
+ linkMap[operation.operationName as keyof typeof linkMap] ||
+ linkMap.default;
+ return link.request(operation, forward);
+ }),
+ apolloLinkChainForGraphqlDataSource,
+ ),
+ ]);
+ }, [apolloLinkChainForGraphqlDataSource, apolloLinkChainForCountryDataSource]);
+
+ useEffect(() => {
+ client.setLink(updateLink());
+ }, [updateLink]);
+
+ return {props.children} ;
};
diff --git a/apps/ui-community/src/components/ui/organisms/dropdown-menu/communities-dropdown.container.graphql b/apps/ui-community/src/components/ui/organisms/dropdown-menu/communities-dropdown.container.graphql
new file mode 100644
index 000000000..6e7a0efc2
--- /dev/null
+++ b/apps/ui-community/src/components/ui/organisms/dropdown-menu/communities-dropdown.container.graphql
@@ -0,0 +1,15 @@
+query SharedCommunitiesDropdownContainerMembers {
+ membersForCurrentEndUser {
+ ...SharedCommunitiesDropdownContainerMembersFields
+ }
+}
+
+fragment SharedCommunitiesDropdownContainerMembersFields on Member {
+ id
+ memberName
+ isAdmin
+ community {
+ id
+ name
+ }
+}
diff --git a/apps/ui-community/src/components/ui/organisms/dropdown-menu/communities-dropdown.container.tsx b/apps/ui-community/src/components/ui/organisms/dropdown-menu/communities-dropdown.container.tsx
new file mode 100644
index 000000000..616e3b0b9
--- /dev/null
+++ b/apps/ui-community/src/components/ui/organisms/dropdown-menu/communities-dropdown.container.tsx
@@ -0,0 +1,40 @@
+import { useQuery } from '@apollo/client';
+import { ComponentQueryLoader } from '@cellix/ui-core';
+import type {
+ Member,
+} from '../../../../generated.tsx';
+import { SharedCommunitiesDropdownContainerMembersDocument } from '../../../../generated.tsx';
+import { CommunitiesDropdown, type CommunitiesDropdownProps } from './communities-dropdown.tsx';
+
+interface CommunitiesDropdownContainerProps {
+ data: {
+ id?: string;
+ };
+}
+
+export const CommunitiesDropdownContainer: React.FC<
+ CommunitiesDropdownContainerProps
+> = (_props) => {
+ const { data, loading, error } = useQuery(
+ SharedCommunitiesDropdownContainerMembersDocument,
+ );
+
+ const communitiesDropdownProps: CommunitiesDropdownProps = {
+ data: {
+ members: (data?.membersForCurrentEndUser as Member[]) ?? [],
+ },
+ };
+
+ return (
+
+
+
+
+ ),
+ ],
+} satisfies Meta;
+
+export default meta;
+type Story = StoryObj;
+
+export const Default: Story = {
+ args: {
+ data: {
+ members: mockMembers,
+ },
+ },
+ play: ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ // Verify dropdown trigger is rendered
+ const dropdownTrigger = canvas.getByText(/Community/i);
+ expect(dropdownTrigger).toBeInTheDocument();
+ },
+};
+
+export const SingleCommunity: Story = {
+ args: {
+ data: {
+ members: [mockMembers[0] as Member],
+ },
+ },
+};
+
+export const MultipleCommunities: Story = {
+ args: {
+ data: {
+ members: mockMembers,
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ // Click dropdown to open
+ const dropdownTrigger = canvas.getByText(/Community One/i);
+ await userEvent.click(dropdownTrigger);
+
+ // Wait for dropdown menu to appear
+ // Note: In actual storybook, the dropdown menu appears in a portal
+ // so this might not work perfectly in the test, but it demonstrates intent
+ },
+};
+
+export const NoMembers: Story = {
+ args: {
+ data: {
+ members: [],
+ },
+ },
+};
+
+export const AdminMember: Story = {
+ parameters: {
+ initialEntries: ['/community/comm1/member/admin1'],
+ },
+ args: {
+ data: {
+ members: [
+ {
+ __typename: 'Member',
+ id: 'admin1',
+ memberName: 'Admin User',
+ isAdmin: true,
+ community: {
+ __typename: 'Community',
+ id: 'comm1',
+ name: 'Admin Community',
+ } as Member['community'],
+ } as Member,
+ ],
+ },
+ },
+ play: ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ // Verify admin member is shown in dropdown
+ expect(canvas.getByText(/Admin Community/i)).toBeInTheDocument();
+ },
+};
diff --git a/apps/ui-community/src/components/ui/organisms/dropdown-menu/communities-dropdown.tsx b/apps/ui-community/src/components/ui/organisms/dropdown-menu/communities-dropdown.tsx
new file mode 100644
index 000000000..ecdb16629
--- /dev/null
+++ b/apps/ui-community/src/components/ui/organisms/dropdown-menu/communities-dropdown.tsx
@@ -0,0 +1,108 @@
+import { DownOutlined } from '@ant-design/icons';
+import { Dropdown, type MenuProps } from 'antd';
+import { useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import type { Member } from '../../../../generated.tsx';
+
+export interface CommunitiesDropdownProps {
+ data: {
+ members: Member[];
+ };
+}
+
+export const CommunitiesDropdown: React.FC = (
+ props,
+) => {
+ const [dropdownVisible, setDropdownVisible] = useState(false);
+ const params = useParams();
+ const navigate = useNavigate();
+
+ const currentMember = props.data.members?.find(
+ // biome-ignore lint:useLiteralKeys
+ (member) => member.id === params['memberId'],
+ );
+
+ const populateItems = (
+ member: Member,
+ itemsMap: {
+ [key: string]: {
+ key: string;
+ label: string | undefined;
+ children: { key: string; label: string; onClick: () => void }[];
+ };
+ },
+ ) => {
+ const communityId = member?.community?.id;
+ if (!communityId) return;
+
+ // Initialize community in itemsMap if it doesn't exist
+ if (!itemsMap[communityId]) {
+ itemsMap[communityId] = {
+ key: communityId,
+ label: member?.community?.name,
+ children: [],
+ };
+ }
+
+ // Add member to the community's children
+ const memberPath = `/community/${communityId}/member/${member?.id}`;
+ const memberItem = {
+ key: member?.id ?? '',
+ label: member?.memberName ?? '',
+ onClick: () => {
+ setDropdownVisible(false);
+ navigate(memberPath);
+ },
+ };
+ itemsMap[communityId].children.push(memberItem);
+
+ // Add admin variant if applicable
+ if (member?.isAdmin) {
+ const adminPath = `/community/${communityId}/admin/${member?.id}`;
+ itemsMap[communityId].children.push({
+ key: `${member?.id}-admin`,
+ label: `${member?.memberName} (Admin)`,
+ onClick: () => {
+ setDropdownVisible(false);
+ navigate(adminPath);
+ },
+ });
+ }
+ };
+
+ const itemsMap: {
+ [key: string]: {
+ key: string;
+ label: string | undefined;
+ children: { key: string; label: string; onClick: () => void }[];
+ };
+ } = {};
+ props.data.members?.forEach((member: Member) =>
+ populateItems(member, itemsMap),
+ );
+
+ const items: MenuProps['items'] = Object.values(itemsMap);
+
+ return (
+ setDropdownVisible(visible)}
+ >
+ e.preventDefault()}
+ className="ant-dropdown-link"
+ style={{ minHeight: '50px', background: 'none', border: 'none', cursor: 'pointer', padding: 0 }}
+ >
+ {currentMember?.community?.name} | {currentMember?.memberName}{' '}
+
+
+ );
+};
diff --git a/apps/ui-community/src/config/oidc-config.tsx b/apps/ui-community/src/config/oidc-config.tsx
index 7b49a3be6..aa6cbca34 100644
--- a/apps/ui-community/src/config/oidc-config.tsx
+++ b/apps/ui-community/src/config/oidc-config.tsx
@@ -1,38 +1,38 @@
type OIDCConfig = {
- authority: string
- client_id: string
- redirect_uri: string
- code_verifier: boolean
- noonce: boolean
- response_type: string
- scope: string
- onSigninCallback: () => void
-}
-
+ authority: string;
+ client_id: string;
+ redirect_uri: string;
+ code_verifier: boolean;
+ noonce: boolean;
+ response_type: string;
+ scope: string;
+ onSigninCallback: () => void;
+};
export const oidcConfig: OIDCConfig = {
- // biome-ignore lint:useLiteralKeys
- authority: import.meta.env['VITE_AAD_B2C_ACCOUNT_AUTHORITY'] ?? "http://localhost:4000",
- // biome-ignore lint:useLiteralKeys
- client_id: import.meta.env['VITE_AAD_B2C_ACCOUNT_CLIENTID'] ?? "mock-client",
- // biome-ignore lint:useLiteralKeys
- redirect_uri: import.meta.env['VITE_AAD_B2C_REDIRECT_URI'] ?? "http://localhost:3000/auth-redirect",
- code_verifier: true,
- noonce: true,
- response_type: 'code',
- // biome-ignore lint:useLiteralKeys
- scope: import.meta.env['VITE_AAD_B2C_ACCOUNT_SCOPES'],
- onSigninCallback: (): void => {
- console.log('onSigninCallback');
- window.history.replaceState(
- {},
- document.title,
- window.location.pathname
- );
- const redirectToPath = window.sessionStorage.getItem('redirectTo');
- if (redirectToPath){
- window.location.pathname = redirectToPath;
- window.sessionStorage.removeItem('redirectTo');
- }
- }
-}
+ authority:
+ // biome-ignore lint:useLiteralKeys
+ import.meta.env['VITE_AAD_B2C_ACCOUNT_AUTHORITY'] ??
+ 'http://localhost:4000',
+ // biome-ignore lint:useLiteralKeys
+ client_id: import.meta.env['VITE_AAD_B2C_ACCOUNT_CLIENTID'] ?? 'mock-client',
+
+ redirect_uri:
+ // biome-ignore lint:useLiteralKeys
+ import.meta.env['VITE_AAD_B2C_REDIRECT_URI'] ??
+ 'http://localhost:3000/auth-redirect',
+ code_verifier: true,
+ noonce: true,
+ response_type: 'code',
+ // biome-ignore lint:useLiteralKeys
+ scope: import.meta.env['VITE_AAD_B2C_ACCOUNT_SCOPES'],
+ onSigninCallback: (): void => {
+ console.log('onSigninCallback');
+ globalThis.history.replaceState({}, document.title, globalThis.location.pathname);
+ const redirectToPath = globalThis.sessionStorage.getItem('redirectTo');
+ if (redirectToPath) {
+ globalThis.location.pathname = redirectToPath;
+ globalThis.sessionStorage.removeItem('redirectTo');
+ }
+ },
+};
diff --git a/apps/ui-community/src/contexts/theme-context.tsx b/apps/ui-community/src/contexts/theme-context.tsx
index c8be3be8e..eb5aebc16 100644
--- a/apps/ui-community/src/contexts/theme-context.tsx
+++ b/apps/ui-community/src/contexts/theme-context.tsx
@@ -1,180 +1,193 @@
import { Button, theme } from 'antd';
import type { SeedToken } from 'antd/lib/theme/interface/index.js';
-import { createContext, type ReactNode, useEffect, useState, } from 'react';
+import { createContext, type ReactNode, useCallback, useEffect, useState } from 'react';
+
// import ModalPopUp from './components/modal-popup.tsx';
// import MaintenanceMessage from '../components/shared/maintenance-message/maintenance-message';
// import ImpendingMessage from '../components/shared/maintenance-message/impending-message';
// import { useMaintenanceMessage } from '../components/shared/maintenance-message';
interface ThemeContextType {
- currentTokens: {
- token: Partial;
- hardCodedTokens: {
- textColor: string | undefined;
- backgroundColor: string | undefined;
- };
- type: string;
- } | undefined;
- setTheme: (tokens: Partial, types: string) => void;
+ currentTokens:
+ | {
+ token: Partial;
+ hardCodedTokens: {
+ textColor: string | undefined;
+ backgroundColor: string | undefined;
+ };
+ type: string;
+ }
+ | undefined;
+ setTheme: (tokens: Partial, types: string) => void;
}
export const ThemeContext = createContext({
- currentTokens: {
- token: theme.defaultSeed,
- hardCodedTokens: {
- textColor: '#000000',
- backgroundColor: '#ffffff'
- },
- type: 'light'
- },
- setTheme: () => { /* no-op */ }
+ currentTokens: {
+ token: theme.defaultSeed,
+ hardCodedTokens: {
+ textColor: '#000000',
+ backgroundColor: '#ffffff',
+ },
+ type: 'light',
+ },
+ setTheme: () => {
+ /* no-op */
+ },
});
export const ThemeProvider = ({ children }: { children: ReactNode }) => {
-// const {
-// isImpending,
-// isMaintenance,
-// impendingMessage,
-// maintenanceMessage,
-// impendingStartTimestamp,
-// maintenanceStartTimestamp,
-// maintenanceEndTimestamp
-// } = useMaintenanceMessage();
- const [currentTokens, setCurrentTokens] = useState({
- token: theme.defaultSeed,
- hardCodedTokens: {
- textColor: '#000000',
- backgroundColor: '#ffffff'
- },
- type: 'light'
- });
- const [isHidden, setIsHidden] = useState(false);
-
- const toggleHidden = () => setIsHidden((prevHidden) => !prevHidden);
+ // const {
+ // isImpending,
+ // isMaintenance,
+ // impendingMessage,
+ // maintenanceMessage,
+ // impendingStartTimestamp,
+ // maintenanceStartTimestamp,
+ // maintenanceEndTimestamp
+ // } = useMaintenanceMessage();
+ const [currentTokens, setCurrentTokens] = useState<
+ ThemeContextType['currentTokens'] | undefined
+ >({
+ token: theme.defaultSeed,
+ hardCodedTokens: {
+ textColor: '#000000',
+ backgroundColor: '#ffffff',
+ },
+ type: 'light',
+ });
+ const [isHidden, setIsHidden] = useState(false);
- // setTheme functions that take tokens as argument
- const setTheme = (tokens: Partial, type: string) => {
- let valueToSet: ThemeContextType['currentTokens'] | undefined;
- if (type === 'light') {
- valueToSet = {
- token: tokens,
- hardCodedTokens: {
- textColor: '#000000',
- backgroundColor: '#ffffff'
- },
- type: 'light'
- };
- } else if (type === 'dark') {
- valueToSet = {
- token: tokens,
- hardCodedTokens: {
- textColor: '#ffffff',
- backgroundColor: '#000000'
- },
- type: 'dark'
- };
- } else if (type === 'custom') {
- valueToSet = {
- token: {
- ...currentTokens?.token
- },
- hardCodedTokens: {
- textColor: tokens?.colorTextBase,
- backgroundColor: tokens?.colorBgBase
- },
- type: 'custom'
- };
- }
- setCurrentTokens(valueToSet);
+ const toggleHidden = useCallback(() => setIsHidden((prevHidden) => !prevHidden), []);
- localStorage.setItem('themeProp', JSON.stringify(valueToSet));
- };
+ // setTheme functions that take tokens as argument
+ const setTheme = useCallback((tokens: Partial, type: string) => {
+ setCurrentTokens((prevTokens) => {
+ let valueToSet: ThemeContextType['currentTokens'] | undefined;
+ if (type === 'light') {
+ valueToSet = {
+ token: tokens,
+ hardCodedTokens: {
+ textColor: '#000000',
+ backgroundColor: '#ffffff',
+ },
+ type: 'light',
+ };
+ } else if (type === 'dark') {
+ valueToSet = {
+ token: tokens,
+ hardCodedTokens: {
+ textColor: '#ffffff',
+ backgroundColor: '#000000',
+ },
+ type: 'dark',
+ };
+ } else if (type === 'custom') {
+ valueToSet = {
+ token: {
+ ...prevTokens?.token,
+ },
+ hardCodedTokens: {
+ textColor: tokens?.colorTextBase,
+ backgroundColor: tokens?.colorBgBase,
+ },
+ type: 'custom',
+ };
+ }
+ localStorage.setItem('themeProp', JSON.stringify(valueToSet));
+ return valueToSet;
+ });
+ }, []);
- useEffect(() => {
- const extractFromLocal = JSON.parse(localStorage.getItem('themeProp') || '{}');
- if (extractFromLocal && extractFromLocal.type === 'dark') {
- setTheme(
- {
- colorTextBase: '#ffffff',
- colorBgBase: '#000000'
- },
- 'dark'
- );
- return;
- } else if (extractFromLocal && extractFromLocal.type === 'light') {
- setTheme(
- {
- colorTextBase: '#000000',
- colorBgBase: '#ffffff'
- },
- 'light'
- );
- return;
- } else if (extractFromLocal && extractFromLocal.type === 'custom') {
- setTheme(
- {
- colorTextBase: extractFromLocal.hardCodedTokens.textColor,
- colorBgBase: extractFromLocal.hardCodedTokens.backgroundColor
- },
- 'custom'
- );
- return;
- } else {
- const valueToSet = {
- type: 'light',
- tokens: theme.defaultSeed,
- hardCodedTokens: {
- textColor: '#000000',
- backgroundColor: '#ffffff'
- }
- };
- localStorage.setItem('themeProp', JSON.stringify(valueToSet));
- setTheme(theme.defaultSeed, 'light');
- return;
- }
- }, []);
+ useEffect(() => {
+ const extractFromLocal = JSON.parse(
+ localStorage.getItem('themeProp') || '{}',
+ );
+ if (extractFromLocal && extractFromLocal.type === 'dark') {
+ setTheme(
+ {
+ colorTextBase: '#ffffff',
+ colorBgBase: '#000000',
+ },
+ 'dark',
+ );
+ return;
+ } else if (extractFromLocal && extractFromLocal.type === 'light') {
+ setTheme(
+ {
+ colorTextBase: '#000000',
+ colorBgBase: '#ffffff',
+ },
+ 'light',
+ );
+ return;
+ } else if (extractFromLocal && extractFromLocal.type === 'custom') {
+ setTheme(
+ {
+ colorTextBase: extractFromLocal.hardCodedTokens.textColor,
+ colorBgBase: extractFromLocal.hardCodedTokens.backgroundColor,
+ },
+ 'custom',
+ );
+ return;
+ } else {
+ const valueToSet = {
+ type: 'light',
+ tokens: theme.defaultSeed,
+ hardCodedTokens: {
+ textColor: '#000000',
+ backgroundColor: '#ffffff',
+ },
+ };
+ localStorage.setItem('themeProp', JSON.stringify(valueToSet));
+ setTheme(theme.defaultSeed, 'light');
+ return;
+ }
+ }, [setTheme]);
- useEffect(() => {
- const handleKeyDown = (event: KeyboardEvent) => {
- if (event.metaKey && event.shiftKey && event.key === 'k') {
- toggleHidden();
- }
- };
+ useEffect(() => {
+ const handleKeyDown = (event: KeyboardEvent) => {
+ if (event.metaKey && event.shiftKey && event.key === 'k') {
+ toggleHidden();
+ }
+ };
- window.addEventListener('keydown', handleKeyDown);
+ window.addEventListener('keydown', handleKeyDown);
- return () => {
- window.removeEventListener('keydown', handleKeyDown);
- };
- }, []);
-// console.log('isImpending', isImpending);
-// console.log('isMaintenance', isMaintenance);
- return (
-
-
-
-
-
{
- if (currentTokens?.type === 'custom' || currentTokens?.type === 'light') {
- setTheme(theme.darkAlgorithm(theme.defaultSeed), 'dark');
- } else if (currentTokens?.type === 'dark') {
- setTheme(theme.defaultSeed, 'light');
- }
- }}
- >
- Toggle Dark/Light
-
+ return () => {
+ window.removeEventListener('keydown', handleKeyDown);
+ };
+ }, [toggleHidden]);
+ // console.log('isImpending', isImpending);
+ // console.log('isMaintenance', isMaintenance);
+ return (
+
+
+
+
+ {
+ if (
+ currentTokens?.type === 'custom' ||
+ currentTokens?.type === 'light'
+ ) {
+ setTheme(theme.darkAlgorithm(theme.defaultSeed), 'dark');
+ } else if (currentTokens?.type === 'dark') {
+ setTheme(theme.defaultSeed, 'light');
+ }
+ }}
+ >
+ Toggle Dark/Light
+
- {/*
-
- Hit Cmd+Shift+K to hide
-
-
- {children}
-
- );
+ {/*
*/}
+
+
+ Hit Cmd+Shift+K to hide
+
+
+ {children}
+
+ );
};
diff --git a/apps/ui-community/src/main.tsx b/apps/ui-community/src/main.tsx
index 59d37192f..ea263e882 100644
--- a/apps/ui-community/src/main.tsx
+++ b/apps/ui-community/src/main.tsx
@@ -1,5 +1,5 @@
import { HelmetProvider } from '@dr.pogodin/react-helmet';
-import { ConfigProvider } from 'antd';
+import { App as AntdApp, ConfigProvider } from 'antd';
import React, { useContext } from 'react';
import { createRoot } from 'react-dom/client';
import { AuthProvider } from 'react-oidc-context';
@@ -27,13 +27,15 @@ const ConfigProviderWrapper = () => {
},
}}
>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
);
};
diff --git a/apps/ui-community/tailwind.config.ts b/apps/ui-community/tailwind.config.ts
index 465d475cd..c83de9ba9 100644
--- a/apps/ui-community/tailwind.config.ts
+++ b/apps/ui-community/tailwind.config.ts
@@ -1,12 +1,12 @@
-import type { Config } from 'tailwindcss'
+import type { Config } from 'tailwindcss';
export default {
- content: ['./src/**/*.{js,jsx,ts,tsx}', './index.html'],
- theme: {
- extend: {},
- },
- plugins: [],
- corePlugins: {
- preflight: false,
- }
-} satisfies Config
\ No newline at end of file
+ content: ['./src/**/*.{js,jsx,ts,tsx}', './index.html'],
+ theme: {
+ extend: {},
+ },
+ plugins: [],
+ corePlugins: {
+ preflight: false,
+ },
+} satisfies Config;
diff --git a/apps/ui-community/tsconfig.app.json b/apps/ui-community/tsconfig.app.json
index 8d94175fd..8618881b4 100644
--- a/apps/ui-community/tsconfig.app.json
+++ b/apps/ui-community/tsconfig.app.json
@@ -1,31 +1,31 @@
{
- "compilerOptions": {
- "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
- "target": "ES2022",
- "useDefineForClassFields": true,
- "lib": ["ES2022", "DOM", "DOM.Iterable"],
- "module": "ESNext", // Overrides @cellix/typescript-config/base.json
- "skipLibCheck": true, // Overrides @cellix/typescript-config/base.json
+ "compilerOptions": {
+ "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+ "target": "ES2022",
+ "useDefineForClassFields": true,
+ "lib": ["ES2022", "DOM", "DOM.Iterable"],
+ "module": "ESNext", // Overrides @cellix/typescript-config/base.json
+ "skipLibCheck": true, // Overrides @cellix/typescript-config/base.json
- /* Bundler mode */
- "moduleResolution": "bundler", // Overrides @cellix/typescript-config/base.json
- "allowImportingTsExtensions": true,
- "verbatimModuleSyntax": true,
- "moduleDetection": "force", // New setting
- "noEmit": true, // New setting
- "jsx": "react-jsx", // New setting
+ /* Bundler mode */
+ "moduleResolution": "bundler", // Overrides @cellix/typescript-config/base.json
+ "allowImportingTsExtensions": true,
+ "verbatimModuleSyntax": true,
+ "moduleDetection": "force", // New setting
+ "noEmit": true, // New setting
+ "jsx": "react-jsx", // New setting
- /* Linting */
- "strict": true,
- "noUnusedLocals": true,
- "noUnusedParameters": true,
- "erasableSyntaxOnly": true,
- "noFallthroughCasesInSwitch": true,
- "noUncheckedSideEffectImports": true
- },
- "include": ["src"],
- "references": [
- { "path": "../../packages/cellix/ui-core" },
- { "path": "../../packages/ocom/ui-components" }
- ]
+ /* Linting */
+ "strict": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "erasableSyntaxOnly": true,
+ "noFallthroughCasesInSwitch": true,
+ "noUncheckedSideEffectImports": true
+ },
+ "include": ["src"],
+ "references": [
+ { "path": "../../packages/cellix/ui-core" },
+ { "path": "../../packages/ocom/ui-components" }
+ ]
}
diff --git a/apps/ui-community/tsconfig.json b/apps/ui-community/tsconfig.json
index e57e63eb8..ddacde5cf 100644
--- a/apps/ui-community/tsconfig.json
+++ b/apps/ui-community/tsconfig.json
@@ -1,12 +1,12 @@
{
- "extends": "@cellix/typescript-config/base",
- "compilerOptions": {
- "outDir": "dist",
- "rootDir": "src",
- "jsx": "react-jsx",
- "lib": ["ES2023", "DOM", "DOM.Iterable"],
- "exactOptionalPropertyTypes": false,
- "skipLibCheck": true
- },
- "include": ["src"]
+ "extends": "@cellix/typescript-config/base",
+ "compilerOptions": {
+ "outDir": "dist",
+ "rootDir": "src",
+ "jsx": "react-jsx",
+ "lib": ["ES2023", "DOM", "DOM.Iterable"],
+ "exactOptionalPropertyTypes": false,
+ "skipLibCheck": true
+ },
+ "include": ["src"]
}
diff --git a/apps/ui-community/tsconfig.node.json b/apps/ui-community/tsconfig.node.json
index 8b0e6ea7f..73a4c8f73 100644
--- a/apps/ui-community/tsconfig.node.json
+++ b/apps/ui-community/tsconfig.node.json
@@ -1,25 +1,25 @@
{
- "compilerOptions": {
- "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
- "target": "ES2023",
- "lib": ["ES2023"],
- "module": "ESNext", // Overrides @cellix/typescript-config/base.json
- "skipLibCheck": true, // Overrides @cellix/typescript-config/base.json
+ "compilerOptions": {
+ "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+ "target": "ES2023",
+ "lib": ["ES2023"],
+ "module": "ESNext", // Overrides @cellix/typescript-config/base.json
+ "skipLibCheck": true, // Overrides @cellix/typescript-config/base.json
- /* Bundler mode */
- "moduleResolution": "bundler", // Overrides @cellix/typescript-config/base.json
- "allowImportingTsExtensions": true,
- "verbatimModuleSyntax": true,
- "moduleDetection": "force", // New setting
- "noEmit": true, // New setting
+ /* Bundler mode */
+ "moduleResolution": "bundler", // Overrides @cellix/typescript-config/base.json
+ "allowImportingTsExtensions": true,
+ "verbatimModuleSyntax": true,
+ "moduleDetection": "force", // New setting
+ "noEmit": true, // New setting
- /* Linting */
- "strict": true,
- "noUnusedLocals": true,
- "noUnusedParameters": true,
- "erasableSyntaxOnly": true,
- "noFallthroughCasesInSwitch": true,
- "noUncheckedSideEffectImports": true
- },
- "include": ["vite.config.ts"]
+ /* Linting */
+ "strict": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "erasableSyntaxOnly": true,
+ "noFallthroughCasesInSwitch": true,
+ "noUncheckedSideEffectImports": true
+ },
+ "include": ["vite.config.ts"]
}
diff --git a/apps/ui-community/turbo.json b/apps/ui-community/turbo.json
index 81ddd828d..42a7fb97b 100644
--- a/apps/ui-community/turbo.json
+++ b/apps/ui-community/turbo.json
@@ -1,4 +1,4 @@
{
- "extends": ["//"],
- "tags": ["frontend"]
-}
\ No newline at end of file
+ "extends": ["//"],
+ "tags": ["frontend"]
+}
diff --git a/apps/ui-community/vite.config.ts b/apps/ui-community/vite.config.ts
index aaa52c314..b695c39f2 100644
--- a/apps/ui-community/vite.config.ts
+++ b/apps/ui-community/vite.config.ts
@@ -1,64 +1,65 @@
-import react from '@vitejs/plugin-react'
-import { visualizer } from 'rollup-plugin-visualizer'
-import { defineConfig, type PluginOption } from 'vite'
+import react from '@vitejs/plugin-react';
+import { visualizer } from 'rollup-plugin-visualizer';
+import { defineConfig, type PluginOption } from 'vite';
const { NODE_ENV } = process.env;
const isDev = NODE_ENV === 'development';
// Define groups for advancedChunks
const dependencyChunkGroups = [
- {
- name: 'vendor-react',
- test: /[\\/]node_modules[\\/](react|react-dom|react-router|react-router-dom)[\\/]/
- },
- {
- name: 'vendor-antd-icons',
- test: /[\\/]node_modules[\\/]@ant-design[\\/]icons[\\/]/
- },
- {
- name: 'vendor-antd-pro',
- test: /[\\/]node_modules[\\/]@ant-design[\\/]pro-.*[\\/]/
- },
- {
- name: 'vendor-antd',
- // Matches @ant-design ONLY if it is NOT followed by /icons or /pro-
- test: /[\\/]node_modules[\\/](antd|@ant-design(?)|rc-.*)[\\/]/
- },
- {
- name: 'vendor-apollo',
- test: /[\\/]node_modules[\\/](@apollo|apollo-.*|graphql)[\\/]/
- },
- {
- name: 'vendor-cellix',
- test: /[\\/](@cellix|@ocom)[\\/]/
- },
- {
- name: 'vendor-utils',
- test: /[\\/]node_modules[\\/](lodash|dayjs|date-fns|axios)[\\/]/
- },
- {
- name: 'vendor',
- test: /[\\/]node_modules[\\/]/
- },
+ {
+ name: 'vendor-react',
+ test: /[\\/]node_modules[\\/](react|react-dom|react-router|react-router-dom)[\\/]/,
+ },
+ {
+ name: 'vendor-antd-icons',
+ test: /[\\/]node_modules[\\/]@ant-design[\\/]icons[\\/]/,
+ },
+ {
+ name: 'vendor-antd-pro',
+ test: /[\\/]node_modules[\\/]@ant-design[\\/]pro-.*[\\/]/,
+ },
+ {
+ name: 'vendor-antd',
+ // Matches @ant-design ONLY if it is NOT followed by /icons or /pro-
+ test: /[\\/]node_modules[\\/](antd|@ant-design(?)|rc-.*)[\\/]/,
+ },
+ {
+ name: 'vendor-apollo',
+ test: /[\\/]node_modules[\\/](@apollo|apollo-.*|graphql)[\\/]/,
+ },
+ {
+ name: 'vendor-cellix',
+ test: /[\\/](@cellix|@ocom)[\\/]/,
+ },
+ {
+ name: 'vendor-utils',
+ test: /[\\/]node_modules[\\/](lodash|dayjs|date-fns|axios)[\\/]/,
+ },
+ {
+ name: 'vendor',
+ test: /[\\/]node_modules[\\/]/,
+ },
];
// https://vite.dev/config/
export default defineConfig({
- plugins: [
- react() as PluginOption,
- ...(isDev ? [visualizer() as PluginOption] : []),
- ],
- server: {
- port: 3000,
- },
- build: {
- chunkSizeWarningLimit: 500,
- rolldownOptions: { // Still used for compatibility, but Rolldown interprets it
- output: {
- advancedChunks: {
- groups: dependencyChunkGroups,
- },
- },
- },
- },
-})
\ No newline at end of file
+ plugins: [
+ react() as PluginOption,
+ ...(isDev ? [visualizer() as PluginOption] : []),
+ ],
+ server: {
+ port: 3000,
+ },
+ build: {
+ chunkSizeWarningLimit: 500,
+ rolldownOptions: {
+ // Still used for compatibility, but Rolldown interprets it
+ output: {
+ advancedChunks: {
+ groups: dependencyChunkGroups,
+ },
+ },
+ },
+ },
+});
diff --git a/apps/ui-community/vitest.config.ts b/apps/ui-community/vitest.config.ts
index 78eaed369..8b18441b9 100644
--- a/apps/ui-community/vitest.config.ts
+++ b/apps/ui-community/vitest.config.ts
@@ -3,12 +3,13 @@ import { fileURLToPath } from 'node:url';
import { createStorybookVitestConfig } from '@cellix/vitest-config';
import { defineConfig } from 'vitest/config';
-const dirname = typeof __dirname !== 'undefined' ? __dirname : path.dirname(fileURLToPath(import.meta.url));
+const dirname =
+ typeof __dirname !== 'undefined'
+ ? __dirname
+ : path.dirname(fileURLToPath(import.meta.url));
export default defineConfig(
- createStorybookVitestConfig(dirname, {
- additionalCoverageExclude: [
- 'eslint.config.js',
- ],
- })
-);
\ No newline at end of file
+ createStorybookVitestConfig(dirname, {
+ additionalCoverageExclude: ['eslint.config.js'],
+ }),
+);
diff --git a/build-pipeline/scripts/merge-coverage.js b/build-pipeline/scripts/merge-coverage.js
index 566acdd29..349172dd8 100755
--- a/build-pipeline/scripts/merge-coverage.js
+++ b/build-pipeline/scripts/merge-coverage.js
@@ -19,7 +19,7 @@ function processLcovContent(content, packagePath) {
// Extract the file path after 'SF:'
const filePath = line.substring(3);
// Prefix with package path, ensuring no double slashes
- const prefixedPath = path.join(packagePath, filePath).replace(/\\/g, '/');
+ const prefixedPath = path.join(packagePath, filePath).replaceAll('\\', '/');
processedLines.push(`SF:${prefixedPath}`);
} else {
processedLines.push(line);
diff --git a/packages/cellix/event-bus-seedwork-node/src/node-event-bus.ts b/packages/cellix/event-bus-seedwork-node/src/node-event-bus.ts
index 76d2099be..b87646803 100644
--- a/packages/cellix/event-bus-seedwork-node/src/node-event-bus.ts
+++ b/packages/cellix/event-bus-seedwork-node/src/node-event-bus.ts
@@ -17,14 +17,14 @@ class BroadCaster {
this.eventEmitter = new EventEmitter();
}
- public broadcast(event: string, data: unknown): void {
+ public async broadcast(event: string, data: unknown): Promise {
// Collect all listeners for the event
const listeners = this.eventEmitter.listeners(event) as Array<
(data: unknown) => Promise | void
>;
- // Fire and forget for each listener
+ // Execute all listeners sequentially and await each one
for (const listener of listeners) {
- void listener(data);
+ await listener(data);
}
}
public on(
diff --git a/packages/cellix/mongoose-seedwork/src/mongoose-seedwork/mongo-domain-adapter.test.ts b/packages/cellix/mongoose-seedwork/src/mongoose-seedwork/mongo-domain-adapter.test.ts
index 63e494984..641683804 100644
--- a/packages/cellix/mongoose-seedwork/src/mongoose-seedwork/mongo-domain-adapter.test.ts
+++ b/packages/cellix/mongoose-seedwork/src/mongoose-seedwork/mongo-domain-adapter.test.ts
@@ -25,7 +25,7 @@ test.for(feature, ({ Scenario }) => {
Scenario('Constructing a MongooseDomainAdapter', ({ Given, When, Then }) => {
Given('a Mongoose document with id, createdAt, updatedAt, and schemaVersion', () => {
doc = vi.mocked({
- id: { toString: () => 'abc123' },
+ _id: { toString: () => 'abc123' },
createdAt: new Date('2023-01-01T00:00:00Z'),
updatedAt: new Date('2023-01-02T00:00:00Z'),
schemaVersion: 'v1',
@@ -45,7 +45,7 @@ test.for(feature, ({ Scenario }) => {
Given('a domain adapter constructed with a document with an ObjectId', () => {
toStringMock = vi.fn(() => 'objectid123');
doc = vi.mocked({
- id: { toString: toStringMock },
+ _id: { toString: toStringMock },
createdAt: new Date(),
updatedAt: new Date(),
schemaVersion: 'v2',
@@ -67,7 +67,7 @@ test.for(feature, ({ Scenario }) => {
const updated = new Date('2022-01-02T00:00:00Z');
Given('a domain adapter constructed with a document with createdAt, updatedAt, and schemaVersion', () => {
doc = vi.mocked({
- id: { toString: () => 'id' },
+ _id: { toString: () => 'id' },
createdAt: created,
updatedAt: updated,
schemaVersion: 'v3',
diff --git a/packages/cellix/mongoose-seedwork/src/mongoose-seedwork/mongo-domain-adapter.ts b/packages/cellix/mongoose-seedwork/src/mongoose-seedwork/mongo-domain-adapter.ts
index e9afb6ffb..2e58f7c21 100644
--- a/packages/cellix/mongoose-seedwork/src/mongoose-seedwork/mongo-domain-adapter.ts
+++ b/packages/cellix/mongoose-seedwork/src/mongoose-seedwork/mongo-domain-adapter.ts
@@ -14,7 +14,11 @@ export abstract class MongooseDomainAdapter
this.doc = doc;
}
get id() {
- return this.doc.id.toString();
+ const id = this.doc._id || this.doc.id;
+ if (!id) {
+ throw new Error(`${this.constructor.name} document is missing _id`);
+ }
+ return id.toString();
}
get createdAt() {
return this.doc.createdAt;
diff --git a/packages/ocom/application-services/src/contexts/community/community/index.ts b/packages/ocom/application-services/src/contexts/community/community/index.ts
index 525a35c91..42d55bbca 100644
--- a/packages/ocom/application-services/src/contexts/community/community/index.ts
+++ b/packages/ocom/application-services/src/contexts/community/community/index.ts
@@ -3,12 +3,15 @@ import type { DataSources } from '@ocom/persistence';
import { type CommunityCreateCommand, create, } from './create.ts';
import { type CommunityQueryByEndUserExternalIdCommand, queryByEndUserExternalId } from './query-by-end-user-external-id.ts';
import { type CommunityQueryByIdCommand, queryById } from './query-by-id.ts';
+import { type CommunityUpdateSettingsCommand, updateSettings } from './update-settings.ts';
+export type { CommunityUpdateSettingsCommand };
export interface CommunityApplicationService {
create: (command: CommunityCreateCommand) => Promise,
queryById: (command: CommunityQueryByIdCommand) => Promise,
queryByEndUserExternalId: (command: CommunityQueryByEndUserExternalIdCommand) => Promise,
+ updateSettings: (command: CommunityUpdateSettingsCommand) => Promise,
}
export const Community = (
@@ -18,5 +21,6 @@ export const Community = (
create: create(dataSources),
queryById: queryById(dataSources),
queryByEndUserExternalId: queryByEndUserExternalId(dataSources),
+ updateSettings: updateSettings(dataSources),
}
}
\ No newline at end of file
diff --git a/packages/ocom/application-services/src/contexts/community/community/update-settings.ts b/packages/ocom/application-services/src/contexts/community/community/update-settings.ts
new file mode 100644
index 000000000..8652f527b
--- /dev/null
+++ b/packages/ocom/application-services/src/contexts/community/community/update-settings.ts
@@ -0,0 +1,45 @@
+import type { Domain } from '@ocom/domain';
+import type { DataSources } from '@ocom/persistence';
+
+export interface CommunityUpdateSettingsCommand {
+ id: string;
+ name?: string;
+ domain?: string;
+ whiteLabelDomain?: string | null;
+ handle?: string | null;
+}
+
+export const updateSettings = (
+ dataSources: DataSources
+) => {
+ return async (
+ command: CommunityUpdateSettingsCommand,
+ ): Promise => {
+ let communityToReturn: Domain.Contexts.Community.Community.CommunityEntityReference | undefined;
+ await dataSources.domainDataSource.Community.Community.CommunityUnitOfWork.withScopedTransaction(
+ async (repo) => {
+ const community = await repo.get(command.id);
+ if (!community) {
+ throw new Error(`Community not found for id ${command.id}`);
+ }
+
+ if (command.name !== undefined) {
+ community.name = command.name;
+ }
+ if (command.domain !== undefined) {
+ community.domain = command.domain;
+ }
+ if (command.whiteLabelDomain !== undefined) {
+ community.whiteLabelDomain = command.whiteLabelDomain;
+ }
+ if (command.handle !== undefined) {
+ community.handle = command.handle;
+ }
+
+ communityToReturn = await repo.save(community);
+ },
+ );
+ if (!communityToReturn) { throw new Error('community not found'); }
+ return communityToReturn;
+ };
+};
diff --git a/packages/ocom/application-services/src/contexts/community/index.ts b/packages/ocom/application-services/src/contexts/community/index.ts
index ab12899d1..3bf944528 100644
--- a/packages/ocom/application-services/src/contexts/community/index.ts
+++ b/packages/ocom/application-services/src/contexts/community/index.ts
@@ -1,7 +1,9 @@
import type { DataSources } from '@ocom/persistence';
-import { Community as CommunityApi, type CommunityApplicationService } from './community/index.ts';
+import { Community as CommunityApi, type CommunityApplicationService, type CommunityUpdateSettingsCommand } from './community/index.ts';
import { Member as MemberApi, type MemberApplicationService } from './member/index.ts';
+export type { CommunityUpdateSettingsCommand };
+
export interface CommunityContextApplicationService {
Community: CommunityApplicationService;
Member: MemberApplicationService;
diff --git a/packages/ocom/application-services/src/index.ts b/packages/ocom/application-services/src/index.ts
index d41ef528c..d7e56c524 100644
--- a/packages/ocom/application-services/src/index.ts
+++ b/packages/ocom/application-services/src/index.ts
@@ -1,9 +1,11 @@
import type { ApiContextSpec } from '@ocom/context-spec';
import { Domain } from '@ocom/domain';
-import { Community, type CommunityContextApplicationService } from './contexts/community/index.ts';
+import { Community, type CommunityContextApplicationService, type CommunityUpdateSettingsCommand } from './contexts/community/index.ts';
import { Service, type ServiceContextApplicationService } from './contexts/service/index.ts';
import { User, type UserContextApplicationService } from './contexts/user/index.ts';
+export type { CommunityUpdateSettingsCommand };
+
export interface ApplicationServices {
Community: CommunityContextApplicationService;
Service: ServiceContextApplicationService;
@@ -54,7 +56,7 @@ export const buildApplicationServicesFactory = (infrastructureServicesRegistry:
if (openIdConfigKey === 'AccountPortal') {
const endUser = await readonlyDataSource.User.EndUser.EndUserReadRepo.getByExternalId(verifiedJwt.sub);
- const member = hints?.memberId ? await readonlyDataSource.Community.Member.MemberReadRepo.getByIdWithRole(hints?.memberId) : null;
+ const member = hints?.memberId ? await readonlyDataSource.Community.Member.MemberReadRepo.getByIdWithCommunityAndRoleAndUser(hints?.memberId) : null;
const community = hints?.communityId ? await readonlyDataSource.Community.Community.CommunityReadRepo.getById(hints?.communityId) : null;
if (endUser && member && community) {
diff --git a/packages/ocom/domain/src/domain/iam/member/contexts/member.community.visa.ts b/packages/ocom/domain/src/domain/iam/member/contexts/member.community.visa.ts
index 1b376a1d0..195a3fe0a 100644
--- a/packages/ocom/domain/src/domain/iam/member/contexts/member.community.visa.ts
+++ b/packages/ocom/domain/src/domain/iam/member/contexts/member.community.visa.ts
@@ -33,14 +33,19 @@ export class MemberCommunityVisa
// console.log("Member Visa: no community permissions");
// return false;
// }
-
- const updatedPermissions: CommunityDomainPermissions = {
- ...communityPermissions, //using spread here to ensure that we get type safety and we don't need to deep copy
- isEditingOwnMemberAccount: false,
- canCreateCommunities: true, //TODO: add a more complext rule here like can only create one community for free, otherwise need a paid plan
- canManageVendorUserRolesAndPermissions: false, // end user roles cannot manage vendor user roles
- isSystemAccount: false,
- };
+ const updatedPermissions: CommunityDomainPermissions = {
+ canManageCommunitySettings: communityPermissions.canManageCommunitySettings,
+ canManageMembers: communityPermissions.canManageMembers,
+ canEditOwnMemberProfile: communityPermissions.canEditOwnMemberProfile,
+ canEditOwnMemberAccounts: communityPermissions.canEditOwnMemberAccounts,
+ canManageEndUserRolesAndPermissions:
+ communityPermissions.canManageEndUserRolesAndPermissions,
+ canManageSiteContent: communityPermissions.canManageSiteContent,
+ isEditingOwnMemberAccount: false,
+ canCreateCommunities: true, //TODO: add a more complext rule here like can only create one community for free, otherwise need a paid plan
+ canManageVendorUserRolesAndPermissions: false, // end user roles cannot manage vendor user roles
+ isSystemAccount: false,
+ };
return func(updatedPermissions);
}
diff --git a/packages/ocom/graphql/src/schema/types/community.graphql b/packages/ocom/graphql/src/schema/types/community.graphql
index feb276521..961e82927 100644
--- a/packages/ocom/graphql/src/schema/types/community.graphql
+++ b/packages/ocom/graphql/src/schema/types/community.graphql
@@ -25,6 +25,7 @@ extend type Query {
extend type Mutation {
communityCreate(input: CommunityCreateInput!): CommunityMutationResult!
+ communityUpdateSettings(input: CommunityUpdateSettingsInput!): CommunityMutationResult!
}
type CommunityMutationResult implements MutationResult {
@@ -36,3 +37,11 @@ input CommunityCreateInput {
name: String!
}
+input CommunityUpdateSettingsInput {
+ id: ObjectID!
+ name: String
+ domain: String
+ whiteLabelDomain: String
+ handle: String
+}
+
diff --git a/packages/ocom/graphql/src/schema/types/community.resolvers.ts b/packages/ocom/graphql/src/schema/types/community.resolvers.ts
index f1b2fa7e1..ca1e62eca 100644
--- a/packages/ocom/graphql/src/schema/types/community.resolvers.ts
+++ b/packages/ocom/graphql/src/schema/types/community.resolvers.ts
@@ -1,7 +1,8 @@
import type { Domain } from "@ocom/domain";
+import type { CommunityUpdateSettingsCommand } from "@ocom/application-services";
import type { GraphQLResolveInfo } from "graphql";
import type { GraphContext } from "../context.ts";
-import type { CommunityCreateInput, Resolvers } from "../builder/generated.ts";
+import type { CommunityCreateInput, CommunityUpdateSettingsInput, Resolvers } from "../builder/generated.ts";
const CommunityMutationResolver = async (getCommunity: Promise) => {
try {
@@ -47,6 +48,27 @@ const community: Resolvers = {
endUserExternalId: context.applicationServices.verifiedUser?.verifiedJwt.sub
})
);
+ },
+ communityUpdateSettings: async (_parent, args: { input: CommunityUpdateSettingsInput }, context: GraphContext) => {
+ if (!context.applicationServices?.verifiedUser?.verifiedJwt?.sub) { throw new Error('Unauthorized'); }
+ const updateCommand: CommunityUpdateSettingsCommand = {
+ id: args.input.id,
+ };
+ if (args.input.name !== null && args.input.name !== undefined) {
+ updateCommand.name = args.input.name;
+ }
+ if (args.input.domain !== null && args.input.domain !== undefined) {
+ updateCommand.domain = args.input.domain;
+ }
+ if (args.input.whiteLabelDomain !== undefined) {
+ updateCommand.whiteLabelDomain = args.input.whiteLabelDomain;
+ }
+ if (args.input.handle !== undefined) {
+ updateCommand.handle = args.input.handle;
+ }
+ return await CommunityMutationResolver(
+ context.applicationServices.Community.Community.updateSettings(updateCommand)
+ );
}
}
};
diff --git a/packages/ocom/persistence/src/datasources/domain/community/member/features/member.domain-adapter.feature b/packages/ocom/persistence/src/datasources/domain/community/member/features/member.domain-adapter.feature
index 7632bbffc..3b7d545b5 100644
--- a/packages/ocom/persistence/src/datasources/domain/community/member/features/member.domain-adapter.feature
+++ b/packages/ocom/persistence/src/datasources/domain/community/member/features/member.domain-adapter.feature
@@ -30,7 +30,7 @@ Feature: MemberDomainAdapter
Scenario: Getting the community property when not populated
Given a MemberDomainAdapter for a document with community as an ObjectId
When I get the community property
- Then an error should be thrown indicating "community is not populated or is not of the correct type"
+ Then it should return a CommunityEntityReference stub with the correct ID
Scenario: Setting the community property with a valid Community domain object
Given a MemberDomainAdapter for the document
diff --git a/packages/ocom/persistence/src/datasources/domain/community/member/member.domain-adapter.test.ts b/packages/ocom/persistence/src/datasources/domain/community/member/member.domain-adapter.test.ts
index 777b35820..42a927f74 100644
--- a/packages/ocom/persistence/src/datasources/domain/community/member/member.domain-adapter.test.ts
+++ b/packages/ocom/persistence/src/datasources/domain/community/member/member.domain-adapter.test.ts
@@ -249,19 +249,17 @@ test.for(domainAdapterFeature, ({ Scenario, Background, BeforeEachScenario }) =>
});
Scenario('Getting the community property when not populated', ({ Given, When, Then }) => {
- let gettingCommunityWhenNotPopulated: () => void;
Given('a MemberDomainAdapter for a document with community as an ObjectId', () => {
doc = makeMemberDoc({ community: new MongooseSeedwork.ObjectId() });
adapter = new MemberDomainAdapter(doc);
});
When('I get the community property', () => {
- gettingCommunityWhenNotPopulated = () => {
- result = adapter.community;
- };
+ result = adapter.community;
});
- Then('an error should be thrown indicating "community is not populated or is not of the correct type"', () => {
- expect(gettingCommunityWhenNotPopulated).toThrow();
- expect(gettingCommunityWhenNotPopulated).throws(/community is not populated or is not of the correct type/);
+ Then('it should return a CommunityEntityReference stub with the correct ID', () => {
+ expect(result).not.toBeInstanceOf(CommunityDomainAdapter);
+ expect(result).toHaveProperty('id');
+ expect((result as { id: string }).id).toBe(doc.community?.toString());
});
});
diff --git a/packages/ocom/persistence/src/datasources/domain/community/member/member.domain-adapter.ts b/packages/ocom/persistence/src/datasources/domain/community/member/member.domain-adapter.ts
index c9e48e101..f6f9e6059 100644
--- a/packages/ocom/persistence/src/datasources/domain/community/member/member.domain-adapter.ts
+++ b/packages/ocom/persistence/src/datasources/domain/community/member/member.domain-adapter.ts
@@ -62,7 +62,7 @@ export class MemberDomainAdapter extends MongooseSeedwork.MongooseDomainAdapter<
throw new Error('community is not populated');
}
if (this.doc.community instanceof MongooseSeedwork.ObjectId) {
- throw new Error('community is not populated or is not of the correct type');
+ return { id: this.doc.community.toString() } as Domain.Contexts.Community.Community.CommunityEntityReference;
}
return new CommunityDomainAdapter(this.doc.community as Community);
}
diff --git a/packages/ocom/persistence/src/datasources/domain/community/member/member.repository.ts b/packages/ocom/persistence/src/datasources/domain/community/member/member.repository.ts
index 683107864..642187d8e 100644
--- a/packages/ocom/persistence/src/datasources/domain/community/member/member.repository.ts
+++ b/packages/ocom/persistence/src/datasources/domain/community/member/member.repository.ts
@@ -47,6 +47,10 @@ export class MemberRepository //<
community: Domain.Contexts.Community.Community.CommunityEntityReference
): Promise> {
const adapter = this.typeConverter.toAdapter(new this.model());
+ // Set the community on the adapter before creating the domain instance
+ // This ensures the community is available when the Member constructor
+ // tries to create the visa
+ adapter.community = community;
return Promise.resolve(
Domain.Contexts.Community.Member.Member.getNewInstance(
adapter,
diff --git a/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/end-user-role.domain-adapter.test.ts b/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/end-user-role.domain-adapter.test.ts
index a3bb4519e..fd801c7a0 100644
--- a/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/end-user-role.domain-adapter.test.ts
+++ b/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/end-user-role.domain-adapter.test.ts
@@ -178,19 +178,17 @@ test.for(domainAdapterFeature, ({ Scenario, Background, BeforeEachScenario }) =>
});
Scenario('Getting the community property when not populated', ({ Given, When, Then }) => {
- let gettingCommunityWhenNotPopulated: () => void;
Given('an EndUserRoleDomainAdapter for a document with community as an ObjectId', () => {
doc = makeEndUserRoleDoc({ community: new MongooseSeedwork.ObjectId() });
adapter = new EndUserRoleDomainAdapter(doc);
});
When('I get the community property', () => {
- gettingCommunityWhenNotPopulated = () => {
- result = adapter.community;
- };
+ result = adapter.community;
});
- Then('an error should be thrown indicating "community is not populated or is not of the correct type"', () => {
- expect(gettingCommunityWhenNotPopulated).toThrow();
- expect(gettingCommunityWhenNotPopulated).throws(/community is not populated/);
+ Then('it should return a CommunityEntityReference stub with the correct ID', () => {
+ expect(result).not.toBeInstanceOf(CommunityDomainAdapter);
+ expect(result).toHaveProperty('id');
+ expect((result as { id: string }).id).toBe(doc.community?.toString());
});
});
diff --git a/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/end-user-role.domain-adapter.ts b/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/end-user-role.domain-adapter.ts
index e730543ee..29bfeb8c9 100644
--- a/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/end-user-role.domain-adapter.ts
+++ b/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/end-user-role.domain-adapter.ts
@@ -36,7 +36,9 @@ export class EndUserRoleDomainAdapter
throw new Error('community is not populated');
}
if (this.doc.community instanceof MongooseSeedwork.ObjectId) {
- throw new Error('community is not populated or is not of the correct type');
+ return {
+ id: this.doc.community.toString(),
+ } as Domain.Contexts.Community.Community.CommunityEntityReference;
}
return new CommunityDomainAdapter(this.doc.community as Community);
}
diff --git a/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/features/end-user-role.domain-adapter.feature b/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/features/end-user-role.domain-adapter.feature
index 051a1362f..c21f21ee1 100644
--- a/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/features/end-user-role.domain-adapter.feature
+++ b/packages/ocom/persistence/src/datasources/domain/community/role/end-user-role/features/end-user-role.domain-adapter.feature
@@ -25,7 +25,7 @@ Feature: EndUserRoleDomainAdapter
Scenario: Getting the community property when not populated
Given an EndUserRoleDomainAdapter for a document with community as an ObjectId
When I get the community property
- Then an error should be thrown indicating "community is not populated or is not of the correct type"
+ Then it should return a CommunityEntityReference stub with the correct ID
Scenario: Setting the community property with a valid Community domain object
Given an EndUserRoleDomainAdapter for the document
diff --git a/packages/ocom/persistence/src/datasources/readonly/community/member/member.read-repository.test.ts b/packages/ocom/persistence/src/datasources/readonly/community/member/member.read-repository.test.ts
index 62838a906..e792c280b 100644
--- a/packages/ocom/persistence/src/datasources/readonly/community/member/member.read-repository.test.ts
+++ b/packages/ocom/persistence/src/datasources/readonly/community/member/member.read-repository.test.ts
@@ -183,7 +183,7 @@ test.for(feature, ({ Scenario, BeforeEachScenario }) => {
Then('I should receive the MemberEntityReference object with role populated', () => {
expect(mockDataSource.findById).toHaveBeenCalledWith('member-123', {
- populateFields: ['role']
+ populateFields: ['role', 'role.community']
});
expect(mockConverter.toDomain).toHaveBeenCalledWith(mockMemberDoc, passport);
});
@@ -243,7 +243,7 @@ test.for(feature, ({ Scenario, BeforeEachScenario }) => {
Then('I should receive a boolean indicating admin status', () => {
expect(mockDataSource.findById).toHaveBeenCalledWith('admin-member', {
- populateFields: ['role']
+ populateFields: ['role', 'role.community']
});
});
});
diff --git a/packages/ocom/persistence/src/datasources/readonly/community/member/member.read-repository.ts b/packages/ocom/persistence/src/datasources/readonly/community/member/member.read-repository.ts
index 12e66a49e..6ef45a75d 100644
--- a/packages/ocom/persistence/src/datasources/readonly/community/member/member.read-repository.ts
+++ b/packages/ocom/persistence/src/datasources/readonly/community/member/member.read-repository.ts
@@ -11,6 +11,7 @@ export interface MemberReadRepository {
getByCommunityId: (communityId: string, options?: FindOptions) => Promise;
getById: (id: string, options?: FindOneOptions) => Promise;
getByIdWithRole: (id: string, options?: FindOneOptions) => Promise;
+ getByIdWithCommunityAndRoleAndUser: (id: string, options?: FindOneOptions) => Promise;
/**
* Retrieves all Member entities for a given end-user external ID.
* Finds members whose accounts reference a user with the specified external ID.
@@ -62,15 +63,25 @@ export class MemberReadRepositoryImpl implements MemberReadRepository {
}
/**
- * Retrieves a Member entity by its ID, including the 'createdBy' field.
+ * Retrieves a Member entity by its ID, including the 'role' and 'accounts.user' field.
* @param id - The ID of the Member entity.
* @param options - Optional find options for querying.
* @returns A promise that resolves to a MemberEntityReference object or null if not found.
*/
+ async getByIdWithCommunityAndRoleAndUser(id: string, options?: FindOneOptions): Promise {
+ const finalOptions: FindOneOptions = {
+ ...options,
+ populateFields: ['community', 'role', 'role.community', 'accounts.user']
+ };
+ const result = await this.mongoDataSource.findById(id, finalOptions);
+ if (!result) { return null; }
+ return this.converter.toDomain(result, this.passport);
+ }
+
async getByIdWithRole(id: string, options?: FindOneOptions): Promise {
const finalOptions: FindOneOptions = {
...options,
- populateFields: ['role']
+ populateFields: ['role', 'role.community']
};
const result = await this.mongoDataSource.findById(id, finalOptions);
if (!result) { return null; }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b5d823a6f..9f01c5734 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -272,6 +272,9 @@ importers:
apollo-link-rest:
specifier: ^0.9.0
version: 0.9.0(@apollo/client@3.14.0(@types/react@19.2.7)(graphql-ws@6.0.6(graphql@16.12.0)(ws@8.18.3))(graphql@16.12.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(graphql@16.12.0)(qs@6.14.0)
+ dayjs:
+ specifier: ^1.11.19
+ version: 1.11.19
less:
specifier: ^4.4.0
version: 4.4.2
@@ -494,7 +497,7 @@ importers:
version: 16.6.1
express:
specifier: ^4.22.0
- version: 4.22.0
+ version: 4.22.1
jose:
specifier: ^5.9.6
version: 5.10.0
@@ -6499,8 +6502,8 @@ packages:
resolution: {integrity: sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==}
engines: {node: '>=12.0.0'}
- express@4.22.0:
- resolution: {integrity: sha512-c2iPh3xp5vvCLgaHK03+mWLFPhox7j1LwyxcZwFVApEv5i0X+IjPpbT50SJJwwLpdBVfp45AkK/v+AFgv/XlfQ==}
+ express@4.22.1:
+ resolution: {integrity: sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==}
engines: {node: '>= 0.10.0'}
extend-shallow@2.0.1:
@@ -17023,7 +17026,7 @@ snapshots:
args: 5.0.3
axios: 0.27.2
etag: 1.8.1
- express: 4.22.0
+ express: 4.22.1
fs-extra: 11.3.2
glob-to-regexp: 0.4.1
jsonwebtoken: 9.0.2
@@ -18363,7 +18366,7 @@ snapshots:
expect-type@1.2.2: {}
- express@4.22.0:
+ express@4.22.1:
dependencies:
accepts: 1.3.8
array-flatten: 1.1.1
@@ -23857,7 +23860,7 @@ snapshots:
colorette: 2.0.20
compression: 1.8.1
connect-history-api-fallback: 2.0.0
- express: 4.22.0
+ express: 4.22.1
graceful-fs: 4.2.11
http-proxy-middleware: 2.0.9(@types/express@4.17.25)
ipaddr.js: 2.3.0