Commit 332d9ee

committed

Merge branch 'feature/multi-tenant'

2 parents 59248de + eedbe9d commit 332d9eeCopy full SHA for 332d9ee

File tree

+96

-65

lines changed

+96

-65

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,14 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(`
`13`	`13`	`<>`
`14`	`14`	`<ConvoStackWrapper>`
`15`	`15`	`<ConvoStackWidget`
`16`		`- graphqlUrl="http://localhost:3000/graphql"`
`17`		`- websocketUrl="ws://localhost:3000/graphql"`
	`16`	`+ graphqlUrl="http://localhost:3033/graphql"`
	`17`	`+ websocketUrl="ws://localhost:3033/graphql"`
	`18`	`+ workspaceId="clijh54bz0009wud1v4yhrt8o"`
`18`	`19`	`userData={{`
`19`		`- email: "m@g.com",`
	`20`	`+ email: "m@sdfgfsdgg.com",`
`20`	`21`	`name: "zxx",`
`21`	`22`	`hash: "z420",`
`22`		`- userId: "m",`
	`23`	`+ userId: "mmsxsddfmm",`
`23`	`24`	`}}`
`24`	`25`	`customStyling={{`
`25`	`26`	`headerText: "My Custom Header",`

Lines changed: 1 addition & 1 deletion

Large diffs are not rendered by default.

Lines changed: 52 additions & 52 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import {`
`9`	`9`	`setStyling,`
`10`	`10`	`setUserData,`
`11`	`11`	`setWebsocketlUrl,`
	`12`	`+ setWorkspaceId,`
`12`	`13`	`} from "./redux/slice";`
`13`	`14`	`import { CustomIcons } from "./types";`
`14`	`15`	`import { ConvoStackWidgetProps } from "./ConvoStackWidget";`
`@@ -19,6 +20,7 @@ export const CustomIconsContext = createContext<CustomIcons \| undefined>(`
`19`	`20`
`20`	`21`	`const App: React.FC<Omit<ConvoStackWidgetProps, "children">> = ({`
`21`	`22`	`graphqlUrl,`
	`23`	`+ workspaceId,`
`22`	`24`	`websocketUrl,`
`23`	`25`	`userData,`
`24`	`26`	`customStyling,`
`@@ -31,12 +33,14 @@ const App: React.FC<Omit<ConvoStackWidgetProps, "children">> = ({`
`31`	`33`	`useEffect(() => {`
`32`	`34`	`dispatch(setWebsocketlUrl(websocketUrl));`
`33`	`35`	`dispatch(setGraphqlUrl(graphqlUrl));`
	`36`	`+ dispatch(setWorkspaceId(workspaceId));`
`34`	`37`	`if (defaultAgent !== undefined) dispatch(setDefaultAgent(defaultAgent));`
`35`	`38`	`if (customStyling !== undefined) dispatch(setStyling(customStyling));`
`36`	`39`	`if (userData !== undefined) dispatch(setUserData(userData));`
`37`	`40`	`}, [`
`38`	`41`	`websocketUrl,`
`39`	`42`	`graphqlUrl,`
	`43`	`+ workspaceId,`
`40`	`44`	`customStyling,`
`41`	`45`	`userData,`
`42`	`46`	`dispatch,`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import { CustomIcons, CustomStyling, UserData } from "./types";`
`7`	`7`	`export interface ConvoStackWidgetProps {`
`8`	`8`	`graphqlUrl: string;`
`9`	`9`	`websocketUrl: string;`
	`10`	`+ workspaceId?: string;`
`10`	`11`	`userData?: UserData;`
`11`	`12`	`customStyling?: CustomStyling;`
`12`	`13`	`icons?: CustomIcons;`
`@@ -18,6 +19,7 @@ export interface ConvoStackWidgetProps {`
`18`	`19`	`const ConvoStackWidget: React.FC<ConvoStackWidgetProps> = ({`
`19`	`20`	`graphqlUrl,`
`20`	`21`	`websocketUrl,`
	`22`	`+ workspaceId,`
`21`	`23`	`userData,`
`22`	`24`	`customStyling,`
`23`	`25`	`icons,`
`@@ -28,7 +30,7 @@ const ConvoStackWidget: React.FC<ConvoStackWidgetProps> = ({`
`28`	`30`	`const [isLoading, setIsLoading] = useState(true);`
`29`	`31`	`useEffect(() => {`
`30`	`32`	`const fetchData = async () => {`
`31`		`- await fetchTokens(graphqlUrl, userData);`
	`33`	`+ await fetchTokens(graphqlUrl, workspaceId,userData);`
`32`	`34`	`};`
`33`	`35`
`34`	`36`	`fetchData()`
`@@ -44,6 +46,7 @@ const ConvoStackWidget: React.FC<ConvoStackWidgetProps> = ({`
`44`	`46`	`<App`
`45`	`47`	`graphqlUrl={graphqlUrl}`
`46`	`48`	`websocketUrl={websocketUrl}`
	`49`	`+ workspaceId={workspaceId}`
`47`	`50`	`userData={userData}`
`48`	`51`	`customStyling={customStyling}`
`49`	`52`	`icons={icons}`

Comments

(0)