diff --git a/apps/web/src/components/navbar/navbar.tsx b/apps/web/src/components/navbar/navbar.tsx
index 64cb93dfab93e9ce032d4f980b29d43e5befc1ce..af45ce67c3ec86b003aeed5bbf56ec094668aded 100644
--- a/apps/web/src/components/navbar/navbar.tsx
+++ b/apps/web/src/components/navbar/navbar.tsx
@@ -33,7 +33,7 @@ export interface NavbarComponentProps {
/** NavbarComponentState is an interface containing the type of visualizations. */
export interface NavbarComponentState {
- // The anchor for rendering the user data (clientID, sessionID, add database, etc) menu
+ // The anchor for rendering the user data (userID, sessionID, add database, etc) menu
userMenuAnchor?: Element;
// The anchor for rendering the menu for selecting a database to use
selectDatabaseMenuAnchor?: Element;
diff --git a/libs/shared/lib/data-access/socket/backend-messenger/BackendMessengerMock.tsx b/libs/shared/lib/data-access/socket/backend-messenger/BackendMessengerMock.tsx
index 82c322d1c0682a567c01d249b081d46eae6eba16..227278531828b11b75c2416b2edcf7c8999d1fdf 100644
--- a/libs/shared/lib/data-access/socket/backend-messenger/BackendMessengerMock.tsx
+++ b/libs/shared/lib/data-access/socket/backend-messenger/BackendMessengerMock.tsx
@@ -48,7 +48,7 @@ export default class BackendMessengerMock implements BackendMessengerRepository
case 'user/callback':
return new Promise((resolve) => {
const result = {
- clientID: 'mock-clientID',
+ userID: 'mock-userID',
};
resolve(this.createResponse(result));
});
@@ -56,7 +56,7 @@ export default class BackendMessengerMock implements BackendMessengerRepository
case 'user/session/':
return new Promise((resolve) => {
const result = {
- clientID: 'mock-clientID',
+ userID: 'mock-userID',
sessionID: 'mock-sessionID',
};
resolve(this.createResponse(result));
diff --git a/libs/shared/lib/data-access/store/schemaSlice.ts b/libs/shared/lib/data-access/store/schemaSlice.ts
index 3de89c98976313028a7686eb88d29ba75e046df3..e3d2103c280e94c75b8c76cc5609046f05b01beb 100644
--- a/libs/shared/lib/data-access/store/schemaSlice.ts
+++ b/libs/shared/lib/data-access/store/schemaSlice.ts
@@ -103,6 +103,6 @@ export const schemaGraph = (state: RootState): SchemaGraph => {
// * @param {GraphLayout} state
// * @returns {GraphLayout} enum of type GraphLayout
// */
-export const selectSchemaLayout = (state: RootState) => state.schema.layoutName;
+export const selectSchemaLayout = (state: RootState) => state.schema.settings.layoutName;
export default schemaSlice.reducer;
diff --git a/libs/shared/lib/vis/mapvis/mapvis.stories.tsx b/libs/shared/lib/vis/mapvis/mapvis.stories.tsx
index c62af359aee78a53aa821dac72e199d26e720fe4..00d31ad5a440469596afad455dfe87f548bdcb02 100644
--- a/libs/shared/lib/vis/mapvis/mapvis.stories.tsx
+++ b/libs/shared/lib/vis/mapvis/mapvis.stories.tsx
@@ -35,11 +35,11 @@ const Template = (args: any) => <MapVis {...args} />;
export const DutchVehicleTheft: any = Template.bind({});
DutchVehicleTheft.play = async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ type: 'nodelink', payload: mockMobilityQueryResult }));
+ dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: mockMobilityQueryResult } }));
};
export const AmericanFlights: any = Template.bind({});
AmericanFlights.play = async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ type: 'nodelink', payload: bigMockQueryResults }));
+ dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: bigMockQueryResults } }));
};
diff --git a/libs/shared/lib/vis/nodelink/nodelinkvis.stories.tsx b/libs/shared/lib/vis/nodelink/nodelinkvis.stories.tsx
index 6521896c33b123f2fd66c39f93516a3fda7634a6..15f2c742039dc0aa9377ff2304e438992d6853a4 100644
--- a/libs/shared/lib/vis/nodelink/nodelinkvis.stories.tsx
+++ b/libs/shared/lib/vis/nodelink/nodelinkvis.stories.tsx
@@ -45,13 +45,16 @@ export const TestWithData = {
const dispatch = Mockstore.dispatch;
dispatch(
assignNewGraphQueryResult({
- type: 'nodelink',
- payload: {
- nodes: [
- { id: 'agent/007', attributes: { name: 'Daniel Craig' } },
- { id: 'villain', attributes: { name: 'Le Chiffre' } },
- ],
- edges: [{ id: 'escape/escape', from: 'agent/007', to: 'villain', attributes: { name: 'Escape' } }],
+ queryID: '1',
+ result: {
+ type: 'nodelink',
+ payload: {
+ nodes: [
+ { id: 'agent/007', attributes: { name: 'Daniel Craig' } },
+ { id: 'villain', attributes: { name: 'Le Chiffre' } },
+ ],
+ edges: [{ id: 'escape/escape', from: 'agent/007', to: 'villain', attributes: { name: 'Escape' } }],
+ },
},
})
);
@@ -64,10 +67,13 @@ export const TestWithNoData = {
const dispatch = Mockstore.dispatch;
dispatch(
assignNewGraphQueryResult({
- type: 'nodelink',
- payload: {
- nodes: [],
- edges: [],
+ queryID: '1',
+ result: {
+ type: 'nodelink',
+ payload: {
+ nodes: [],
+ edges: [],
+ },
},
})
);
@@ -78,7 +84,7 @@ export const TestWithBig2ndChamber = {
args: { loading: false },
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ type: 'nodelink', payload: big2ndChamberQueryResult }));
+ dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: big2ndChamberQueryResult } }));
},
};
@@ -86,7 +92,7 @@ export const TestWithSmallFlights = {
args: { loading: false },
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ type: 'nodelink', payload: smallFlightsQueryResults }));
+ dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: smallFlightsQueryResults } }));
},
};
@@ -94,7 +100,7 @@ export const TestWithLargeQueryResult = {
args: { loading: false },
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ type: 'nodelink', payload: mockLargeQueryResults }));
+ dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: mockLargeQueryResults } }));
},
};
diff --git a/libs/shared/lib/vis/paohvis/paohvis.stories.tsx b/libs/shared/lib/vis/paohvis/paohvis.stories.tsx
index f9935803d22798df4a35c09ba116d4f7bcb8acf8..1feba2010f7ef8b27fac8d67e4562ec6aa5cd299 100644
--- a/libs/shared/lib/vis/paohvis/paohvis.stories.tsx
+++ b/libs/shared/lib/vis/paohvis/paohvis.stories.tsx
@@ -66,20 +66,23 @@ export const TestWithData = {
dispatch(setSchema(schema.export()));
dispatch(
assignNewGraphQueryResult({
- type: 'nodelink',
- payload: {
- nodes: [
- { id: '1/a', label: 'a', attributes: { a: 's1' } },
- { id: '1/b1', label: 'b1', attributes: { a: 's1' } },
- { id: '1/b2', label: 'b2', attributes: { a: 's1' } },
- { id: '1/b3', label: 'b3', attributes: { a: 's1' } },
- ],
- edges: [
- { id: '1c/z1', label: 'z1', from: '1/b1', to: '1/a', attributes: { a: 's1' } },
- // { from: 'b2', to: 'a', attributes: {} },
- // { from: 'b3', to: 'a', attributes: {} },
- { id: '1c/z1', label: 'z1', from: '1/a', to: '1/b1', attributes: { a: 's1' } },
- ],
+ queryID: '1',
+ result: {
+ type: 'nodelink',
+ payload: {
+ nodes: [
+ { id: '1/a', label: 'a', attributes: { a: 's1' } },
+ { id: '1/b1', label: 'b1', attributes: { a: 's1' } },
+ { id: '1/b2', label: 'b2', attributes: { a: 's1' } },
+ { id: '1/b3', label: 'b3', attributes: { a: 's1' } },
+ ],
+ edges: [
+ { id: '1c/z1', label: 'z1', from: '1/b1', to: '1/a', attributes: { a: 's1' } },
+ // { from: 'b2', to: 'a', attributes: {} },
+ // { from: 'b3', to: 'a', attributes: {} },
+ { id: '1c/z1', label: 'z1', from: '1/a', to: '1/b1', attributes: { a: 's1' } },
+ ],
+ },
},
})
);
@@ -98,7 +101,7 @@ export const TestWithAirportSimple = {
const schema = SchemaUtils.schemaBackend2Graphology(simpleSchemaRaw);
dispatch(setSchema(schema.export()));
- dispatch(assignNewGraphQueryResult({ type: 'nodelink', payload: smallFlightsQueryResults }));
+ dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: smallFlightsQueryResults } }));
},
};
@@ -114,7 +117,7 @@ export const TestWithAirport = {
const schema = SchemaUtils.schemaBackend2Graphology(simpleSchemaAirportRaw);
dispatch(setSchema(schema.export()));
- dispatch(assignNewGraphQueryResult({ type: 'nodelink', payload: bigMockQueryResults }));
+ dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: bigMockQueryResults } }));
},
};
diff --git a/libs/shared/lib/vis/rawjsonvis/rawjsonvis.stories.tsx b/libs/shared/lib/vis/rawjsonvis/rawjsonvis.stories.tsx
index d8ffc3214acf5e05069921aafd822856f00fe61b..8bf071d2e2ee9b0268faf0c4265a17a1dff99a1b 100644
--- a/libs/shared/lib/vis/rawjsonvis/rawjsonvis.stories.tsx
+++ b/libs/shared/lib/vis/rawjsonvis/rawjsonvis.stories.tsx
@@ -31,13 +31,16 @@ export const SimpleData = {
const dispatch = Mockstore.dispatch;
dispatch(
assignNewGraphQueryResult({
- type: 'nodelink',
- payload: {
- nodes: [
- { id: 'agent/007', attributes: { name: 'Daniel Craig' } },
- { id: 'villain', attributes: { name: 'Le Chiffre' } },
- ],
- edges: [],
+ queryID: '1',
+ result: {
+ type: 'nodelink',
+ payload: {
+ nodes: [
+ { id: 'agent/007', attributes: { name: 'Daniel Craig' } },
+ { id: 'villain', attributes: { name: 'Le Chiffre' } },
+ ],
+ edges: [],
+ },
},
})
);
@@ -52,8 +55,11 @@ export const LargeData = {
const dispatch = Mockstore.dispatch;
dispatch(
assignNewGraphQueryResult({
- type: 'nodelink',
- payload: mockLargeQueryResults,
+ queryID: '1',
+ result: {
+ type: 'nodelink',
+ payload: mockLargeQueryResults,
+ },
})
);
},
diff --git a/libs/shared/lib/vis/semanticsubstrates/semanticsubstrates.stories.tsx b/libs/shared/lib/vis/semanticsubstrates/semanticsubstrates.stories.tsx
index 57c317575dbdfeb0961403711ef5fe65eb84076b..f1f3816715356a11fa9ec41b8f1393bb79304f6d 100644
--- a/libs/shared/lib/vis/semanticsubstrates/semanticsubstrates.stories.tsx
+++ b/libs/shared/lib/vis/semanticsubstrates/semanticsubstrates.stories.tsx
@@ -52,20 +52,23 @@ export const TestWithData = {
dispatch(setSchema(schema.export()));
dispatch(
assignNewGraphQueryResult({
- type: 'nodelink',
- payload: {
- nodes: [
- { id: '1/a', attributes: { a: 's1' } },
- { id: '1/b1', attributes: { a: 's1' } },
- { id: '1/b2', attributes: { a: 's1' } },
- { id: '1/b3', attributes: { a: 's1' } },
- ],
- edges: [
- { id: '12/z1', from: '1/b1', to: '1/a', attributes: { a: 's1' } },
- // { from: 'b2', to: 'a', attributes: {} },
- // { from: 'b3', to: 'a', attributes: {} },
- { id: '12/z1', from: '1/a', to: '1/b1', attributes: { a: 's1' } },
- ],
+ queryID: '1',
+ result: {
+ type: 'nodelink',
+ payload: {
+ nodes: [
+ { id: '1/a', attributes: { a: 's1' } },
+ { id: '1/b1', attributes: { a: 's1' } },
+ { id: '1/b2', attributes: { a: 's1' } },
+ { id: '1/b3', attributes: { a: 's1' } },
+ ],
+ edges: [
+ { id: '12/z1', from: '1/b1', to: '1/a', attributes: { a: 's1' } },
+ // { from: 'b2', to: 'a', attributes: {} },
+ // { from: 'b3', to: 'a', attributes: {} },
+ { id: '12/z1', from: '1/a', to: '1/b1', attributes: { a: 's1' } },
+ ],
+ },
},
})
);
@@ -84,7 +87,12 @@ export const TestWithAirport = {
const schema = SchemaUtils.schemaBackend2Graphology(simpleSchemaAirportRaw);
dispatch(setSchema(schema.export()));
- dispatch(assignNewGraphQueryResult({ type: 'nodelink', payload: bigMockQueryResults }));
+ dispatch(
+ assignNewGraphQueryResult({
+ queryID: '1',
+ result: { type: 'nodelink', payload: bigMockQueryResults },
+ })
+ );
},
};