From ece6c65f4f58e30bd65f78dfbec0564dcfd332dd Mon Sep 17 00:00:00 2001
From: Leonardo Christino <leomilho@gmail.com>
Date: Fri, 29 Mar 2024 12:43:21 +0100
Subject: [PATCH] chore: refactor assign
---
libs/shared/lib/data-access/api/eventBus.tsx | 4 ++--
.../lib/data-access/store/graphQueryResultSlice.ts | 4 ++--
libs/shared/lib/data-access/store/index.ts | 2 +-
.../lib/vis/visualizations/mapvis/mapvis.stories.tsx | 6 +++---
.../vis/visualizations/matrixvis/matrix.stories.tsx | 12 ++++++------
.../nodelinkvis/nodelinkvis.stories.tsx | 12 ++++++------
.../vis/visualizations/paohvis/paohvis.stories.tsx | 8 ++++----
.../visualizations/rawjsonvis/rawjsonvis.stories.tsx | 6 +++---
.../vis/visualizations/tablevis/tablevis.stories.tsx | 8 ++++----
turbo.json | 4 +++-
10 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/libs/shared/lib/data-access/api/eventBus.tsx b/libs/shared/lib/data-access/api/eventBus.tsx
index 4f9ea34c2..dfb139648 100644
--- a/libs/shared/lib/data-access/api/eventBus.tsx
+++ b/libs/shared/lib/data-access/api/eventBus.tsx
@@ -7,7 +7,7 @@ import {
useMLEnabledHash,
useQuerybuilderSettings,
readInSchemaFromBackend,
- assignNewGraphQueryResult,
+ setNewGraphQueryResult,
useQuerybuilder,
useVisualization,
wsSchemaRequest,
@@ -79,7 +79,7 @@ export const EventBus = (props: { onRunQuery: Function; onAuthorized: Function }
unsubs.push(
wsQuerySubscription((data) => {
- dispatch(assignNewGraphQueryResult(data));
+ dispatch(setNewGraphQueryResult(data));
dispatch(addInfo('Query Executed!'));
}),
);
diff --git a/libs/shared/lib/data-access/store/graphQueryResultSlice.ts b/libs/shared/lib/data-access/store/graphQueryResultSlice.ts
index bc748db98..5372882d4 100755
--- a/libs/shared/lib/data-access/store/graphQueryResultSlice.ts
+++ b/libs/shared/lib/data-access/store/graphQueryResultSlice.ts
@@ -67,7 +67,7 @@ export const graphQueryResultSlice = createSlice({
name: 'graphQueryResult',
initialState,
reducers: {
- assignNewGraphQueryResult: (state, action: PayloadAction<GraphQueryResultFromBackendPayload>) => {
+ setNewGraphQueryResult: (state, action: PayloadAction<GraphQueryResultFromBackendPayload>) => {
const payload = action.payload.result.payload;
// Only keep one node and one edge per id. This is also done in the backend, but we do it here as well to be sure.
@@ -145,7 +145,7 @@ export const graphQueryResultSlice = createSlice({
},
});
-export const { assignNewGraphQueryResult, resetGraphQueryResults, queryingBackend } = graphQueryResultSlice.actions;
+export const { setNewGraphQueryResult, resetGraphQueryResults, queryingBackend } = graphQueryResultSlice.actions;
// Other code such as selectors can use the imported `RootState` type
export const selectGraphQueryResult = (state: RootState) => state.graphQueryResult;
diff --git a/libs/shared/lib/data-access/store/index.ts b/libs/shared/lib/data-access/store/index.ts
index 8b0db040c..85de6de87 100644
--- a/libs/shared/lib/data-access/store/index.ts
+++ b/libs/shared/lib/data-access/store/index.ts
@@ -7,7 +7,7 @@ export {
selectGraphQueryResult,
selectGraphQueryResultLinks,
selectGraphQueryResultNodes,
- assignNewGraphQueryResult,
+ setNewGraphQueryResult,
resetGraphQueryResults,
graphQueryResultSlice,
} from './graphQueryResultSlice';
diff --git a/libs/shared/lib/vis/visualizations/mapvis/mapvis.stories.tsx b/libs/shared/lib/vis/visualizations/mapvis/mapvis.stories.tsx
index 9f9138d21..e3194bdbf 100644
--- a/libs/shared/lib/vis/visualizations/mapvis/mapvis.stories.tsx
+++ b/libs/shared/lib/vis/visualizations/mapvis/mapvis.stories.tsx
@@ -4,7 +4,7 @@ import { VisualizationPanel } from '../../visualizationPanel';
import { Provider } from 'react-redux';
import { configureStore } from '@reduxjs/toolkit';
import {
- assignNewGraphQueryResult,
+ setNewGraphQueryResult,
graphQueryResultSlice,
querybuilderSlice,
schemaSlice,
@@ -44,7 +44,7 @@ const Mockstore = configureStore({
export const DutchVehicleTheft = {
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: mockMobilityQueryResult } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: mockMobilityQueryResult } }));
dispatch(setActiveVisualization('MapVis'));
},
};
@@ -52,7 +52,7 @@ export const DutchVehicleTheft = {
export const AmericanFlights = {
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: bigMockQueryResults } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: bigMockQueryResults } }));
dispatch(setActiveVisualization('MapVis'));
},
};
diff --git a/libs/shared/lib/vis/visualizations/matrixvis/matrix.stories.tsx b/libs/shared/lib/vis/visualizations/matrixvis/matrix.stories.tsx
index 69dca0855..f6d1db554 100644
--- a/libs/shared/lib/vis/visualizations/matrixvis/matrix.stories.tsx
+++ b/libs/shared/lib/vis/visualizations/matrixvis/matrix.stories.tsx
@@ -6,7 +6,7 @@ import { big2ndChamberQueryResult, smallFlightsQueryResults, mockLargeQueryResul
import { VisualizationPanel } from '../../visualizationPanel';
import {
- assignNewGraphQueryResult,
+ setNewGraphQueryResult,
graphQueryResultSlice,
querybuilderSlice,
schemaSlice,
@@ -56,7 +56,7 @@ export const TestWithData = {
const schema = SchemaUtils.schemaBackend2Graphology(simpleSchemaAirportRaw);
dispatch(setSchema(schema.export()));
dispatch(
- assignNewGraphQueryResult({
+ setNewGraphQueryResult({
queryID: '1',
result: {
type: 'nodelink',
@@ -79,7 +79,7 @@ export const TestWithNoData = {
play: async () => {
const dispatch = Mockstore.dispatch;
dispatch(
- assignNewGraphQueryResult({
+ setNewGraphQueryResult({
queryID: '1',
result: {
type: 'nodelink',
@@ -98,7 +98,7 @@ export const TestWithBig2ndChamber = {
args: { loading: false },
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: big2ndChamberQueryResult } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: big2ndChamberQueryResult } }));
dispatch(setActiveVisualization('MatrixVis'));
},
};
@@ -107,7 +107,7 @@ export const TestWithSmallFlights = {
args: { loading: false },
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: smallFlightsQueryResults } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: smallFlightsQueryResults } }));
dispatch(setActiveVisualization('MatrixVis'));
},
};
@@ -116,7 +116,7 @@ export const TestWithLargeQueryResult = {
args: { loading: false },
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: mockLargeQueryResults } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: mockLargeQueryResults } }));
dispatch(setActiveVisualization('MatrixVis'));
},
};
diff --git a/libs/shared/lib/vis/visualizations/nodelinkvis/nodelinkvis.stories.tsx b/libs/shared/lib/vis/visualizations/nodelinkvis/nodelinkvis.stories.tsx
index 22500ead3..bcbc513fd 100644
--- a/libs/shared/lib/vis/visualizations/nodelinkvis/nodelinkvis.stories.tsx
+++ b/libs/shared/lib/vis/visualizations/nodelinkvis/nodelinkvis.stories.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Meta } from '@storybook/react';
import { VisualizationPanel } from '../../visualizationPanel';
import {
- assignNewGraphQueryResult,
+ setNewGraphQueryResult,
graphQueryResultSlice,
querybuilderSlice,
schemaSlice,
@@ -47,7 +47,7 @@ export const TestWithData = {
const dispatch = Mockstore.dispatch;
dispatch(
- assignNewGraphQueryResult({
+ setNewGraphQueryResult({
queryID: '1',
result: {
type: 'nodelink',
@@ -70,7 +70,7 @@ export const TestWithNoData = {
play: async () => {
const dispatch = Mockstore.dispatch;
dispatch(
- assignNewGraphQueryResult({
+ setNewGraphQueryResult({
queryID: '1',
result: {
type: 'nodelink',
@@ -88,7 +88,7 @@ export const TestWithNoData = {
export const TestWithBig2ndChamber = {
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: big2ndChamberQueryResult } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: big2ndChamberQueryResult } }));
dispatch(setActiveVisualization('NodeLinkVis'));
},
};
@@ -97,7 +97,7 @@ export const TestWithSmallFlights = {
args: { loading: false },
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: smallFlightsQueryResults } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: smallFlightsQueryResults } }));
dispatch(setActiveVisualization('NodeLinkVis'));
},
};
@@ -106,7 +106,7 @@ export const TestWithLargeQueryResult = {
args: { loading: false },
play: async () => {
const dispatch = Mockstore.dispatch;
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: mockLargeQueryResults } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: mockLargeQueryResults } }));
dispatch(setActiveVisualization('NodeLinkVis'));
},
};
diff --git a/libs/shared/lib/vis/visualizations/paohvis/paohvis.stories.tsx b/libs/shared/lib/vis/visualizations/paohvis/paohvis.stories.tsx
index 397058c02..bb1042048 100644
--- a/libs/shared/lib/vis/visualizations/paohvis/paohvis.stories.tsx
+++ b/libs/shared/lib/vis/visualizations/paohvis/paohvis.stories.tsx
@@ -1,5 +1,5 @@
import {
- assignNewGraphQueryResult,
+ setNewGraphQueryResult,
graphQueryResultSlice,
querybuilderSlice,
schemaSlice,
@@ -74,7 +74,7 @@ export const TestWithData = {
dispatch(setSchema(schema.export()));
dispatch(
- assignNewGraphQueryResult({
+ setNewGraphQueryResult({
queryID: '1',
result: {
type: 'nodelink',
@@ -114,7 +114,7 @@ export const TestWithBig2ndChamber = {
const dispatch = Mockstore.dispatch;
const schema = SchemaUtils.schemaBackend2Graphology(big2ndChamberSchemaRaw);
dispatch(setSchema(schema.export()));
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: big2ndChamberQueryResult } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: big2ndChamberQueryResult } }));
dispatch(setActiveVisualization('PaohVis'));
},
};
@@ -125,7 +125,7 @@ export const TestWithAirport = {
const schema = SchemaUtils.schemaBackend2Graphology(simpleSchemaAirportRaw);
dispatch(setSchema(schema.export()));
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: bigMockQueryResults } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: bigMockQueryResults } }));
dispatch(setActiveVisualization('PaohVis'));
},
};
diff --git a/libs/shared/lib/vis/visualizations/rawjsonvis/rawjsonvis.stories.tsx b/libs/shared/lib/vis/visualizations/rawjsonvis/rawjsonvis.stories.tsx
index ff4929db6..b040c99c2 100644
--- a/libs/shared/lib/vis/visualizations/rawjsonvis/rawjsonvis.stories.tsx
+++ b/libs/shared/lib/vis/visualizations/rawjsonvis/rawjsonvis.stories.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Meta } from '@storybook/react';
import { VisualizationPanel } from '../../visualizationPanel';
import {
- assignNewGraphQueryResult,
+ setNewGraphQueryResult,
graphQueryResultSlice,
querybuilderSlice,
resetGraphQueryResults,
@@ -47,7 +47,7 @@ export const SimpleData = {
play: async () => {
const dispatch = Mockstore.dispatch;
dispatch(
- assignNewGraphQueryResult({
+ setNewGraphQueryResult({
queryID: '1',
result: {
type: 'nodelink',
@@ -72,7 +72,7 @@ export const LargeData = {
play: async () => {
const dispatch = Mockstore.dispatch;
dispatch(
- assignNewGraphQueryResult({
+ setNewGraphQueryResult({
queryID: '1',
result: {
type: 'nodelink',
diff --git a/libs/shared/lib/vis/visualizations/tablevis/tablevis.stories.tsx b/libs/shared/lib/vis/visualizations/tablevis/tablevis.stories.tsx
index 95f45cec8..0b0c85d84 100644
--- a/libs/shared/lib/vis/visualizations/tablevis/tablevis.stories.tsx
+++ b/libs/shared/lib/vis/visualizations/tablevis/tablevis.stories.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Meta } from '@storybook/react';
import { VisualizationPanel } from '../../visualizationPanel';
import {
- assignNewGraphQueryResult,
+ setNewGraphQueryResult,
graphQueryResultSlice,
querybuilderSlice,
schemaSlice,
@@ -57,7 +57,7 @@ export const TestWithAirport = {
const schema = SchemaUtils.schemaBackend2Graphology(simpleSchemaAirportRaw);
dispatch(setSchema(schema.export()));
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: bigMockQueryResults } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: bigMockQueryResults } }));
dispatch(setActiveVisualization('TableVis'));
},
};
@@ -68,7 +68,7 @@ export const TestWithBig2ndChamber = {
const schema = SchemaUtils.schemaBackend2Graphology(big2ndChamberSchemaRaw);
dispatch(setSchema(schema.export()));
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: big2ndChamberQueryResult } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: big2ndChamberQueryResult } }));
dispatch(setActiveVisualization('TableVis'));
},
};
@@ -79,7 +79,7 @@ export const TestWithTypesMock = {
const schema = SchemaUtils.schemaBackend2Graphology(typesMockSchemaRaw);
dispatch(setSchema(schema.export()));
- dispatch(assignNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: typesMockQueryResults } }));
+ dispatch(setNewGraphQueryResult({ queryID: '1', result: { type: 'nodelink', payload: typesMockQueryResults } }));
dispatch(setActiveVisualization('TableVis'));
},
};
diff --git a/turbo.json b/turbo.json
index b8b6951c4..05cfc6f1e 100644
--- a/turbo.json
+++ b/turbo.json
@@ -21,7 +21,9 @@
"dependsOn": ["^build-dev"],
"outputs": ["dist/**", ".next/**"]
},
- "lint": {},
+ "lint": {
+ "cache": false
+ },
"test": {},
"dev": {
"cache": false,
--
GitLab