diff --git a/.vscode/launch.json b/.vscode/launch.json
index 520ee6d5388c206bbb81005309611174c79ca55b..f73ba1c65a316af0257f5848efd24817d1086185 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -14,22 +14,12 @@
"port": 9229
},
{
- "name": "Run Storybook server",
- "type": "node",
- "request": "launch",
- "protocol": "inspector",
- "program": "${workspaceRoot}/node_modules/.bin/start-storybook",
- "args": ["-p", "6006"],
- "stopOnEntry": false,
- "runtimeArgs": ["--nolazy"],
- "sourceMaps": false
- },
- {
+ // Requires the extension Debugger for Chrome: https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome
"type": "chrome",
"request": "launch",
- "name": "Launch Chrome for Storybook",
+ "name": "Storybook Debug",
"breakOnLoad": true,
- "url": "http://localhost:6006",
+ "url": "http://localhost:4400/?path=/story/",
"sourceMaps": true,
"webRoot": "${workspaceFolder}",
"sourceMapPathOverrides": {
@@ -39,11 +29,5 @@
"webpack:///./~/*": "${webRoot}/node_modules/*"
}
}
- ],
- "compounds": [
- {
- "name": "Launch Storybook",
- "configurations": ["Launch Chrome for Storybook", "Run Storybook server"]
- }
]
}
diff --git a/apps/web-graphpolaris/.babelrc b/apps/web-graphpolaris/.babelrc
index 09947a5fde25da5111a674b6abea7d8f1ac33861..61641ec8ac3659e204441c80bb06defe323e3110 100644
--- a/apps/web-graphpolaris/.babelrc
+++ b/apps/web-graphpolaris/.babelrc
@@ -5,7 +5,7 @@
{
"runtime": "automatic"
}
- ],
+ ]
],
- "plugins": ["@babel/plugin-syntax-flow"]
+ "plugins": []
}
diff --git a/apps/web-graphpolaris/.storybook/preview.js b/apps/web-graphpolaris/.storybook/preview.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/apps/web-graphpolaris/project.json b/apps/web-graphpolaris/project.json
index b3632e1739bf0207d33a72ecab62d724a1523c95..dc9c691acc30a77b498ee4ee9c7abf79928cff15 100644
--- a/apps/web-graphpolaris/project.json
+++ b/apps/web-graphpolaris/project.json
@@ -19,9 +19,7 @@
},
"build": {
"executor": "@nrwl/web:webpack",
- "outputs": [
- "{options.outputPath}"
- ],
+ "outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
"compiler": "babel",
@@ -35,18 +33,18 @@
"apps/web-graphpolaris/src/favicon.ico",
"apps/web-graphpolaris/src/assets"
],
- "styles": [
- "apps/web-graphpolaris/src/styles.scss"
- ],
+ "styles": ["apps/web-graphpolaris/src/styles.scss"],
"scripts": [],
"webpackConfig": "@nrwl/react/plugins/webpack"
},
"configurations": {
"production": {
- "fileReplacements": [{
- "replace": "apps/graphpolaris/src/environments/environment.ts",
- "with": "apps/graphpolaris/src/environments/environment.prod.ts"
- }],
+ "fileReplacements": [
+ {
+ "replace": "apps/graphpolaris/src/environments/environment.ts",
+ "with": "apps/graphpolaris/src/environments/environment.prod.ts"
+ }
+ ],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
@@ -71,20 +69,14 @@
},
"lint": {
"executor": "@nrwl/linter:eslint",
- "outputs": [
- "{options.outputFile}"
- ],
+ "outputs": ["{options.outputFile}"],
"options": {
- "lintFilePatterns": [
- "apps/graphpolaris/**/*.{ts,tsx,js,jsx}"
- ]
+ "lintFilePatterns": ["apps/graphpolaris/**/*.{ts,tsx,js,jsx}"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
- "outputs": [
- "coverage/apps/graphpolaris"
- ],
+ "outputs": ["coverage/apps/graphpolaris"],
"options": {
"jestConfig": "apps/web-graphpolaris/jest.config.js",
"passWithNoTests": true
@@ -113,9 +105,7 @@
},
"build-storybook": {
"executor": "@nrwl/storybook:build",
- "outputs": [
- "{options.outputPath}"
- ],
+ "outputs": ["{options.outputPath}"],
"options": {
"uiFramework": "@storybook/react",
"outputPath": "dist/storybook/graphpolaris",
@@ -131,4 +121,4 @@
}
},
"tags": []
-}
\ No newline at end of file
+}
diff --git a/apps/web-graphpolaris/src/app/app.stories.tsx b/apps/web-graphpolaris/src/app/app.stories.tsx
index ce5c645ebfa95f6368df7407baa89da871d48bd2..eda4ff21d10ba81251ff1a279231d25a29371928 100644
--- a/apps/web-graphpolaris/src/app/app.stories.tsx
+++ b/apps/web-graphpolaris/src/app/app.stories.tsx
@@ -1,30 +1,24 @@
-import { configureStore } from '@reduxjs/toolkit';
-import { Meta, Story } from '@storybook/react';
import React from 'react';
-import { Provider } from 'react-redux';
-import graphQueryResultSlice from '../../../../libs/shared/data-access/store/src/lib/graphQueryResultSlice';
+import { Meta, Story } from '@storybook/react';
import { App } from './app';
+import { Provider } from 'react-redux';
+import { store } from '@graphpolaris/shared/data-access/store';
+import { GraphPolarisThemeProvider } from '@graphpolaris/shared/data-access/theme';
export default {
component: App,
title: 'App',
decorators: [
+ // using the real store here
(story) => (
- <div style={{ padding: '3rem' }}>
- <Provider store={Mockstore}>{story()}</Provider>
- </div>
+ <Provider store={store}>
+ <GraphPolarisThemeProvider>{story()}</GraphPolarisThemeProvider>
+ </Provider>
),
],
} as Meta;
const Template: Story = (args) => <App {...args} />;
-// A super-simple mock of a redux store
-const Mockstore = configureStore({
- reducer: {
- graphQueryResult: graphQueryResultSlice,
- },
-});
-
export const Primary = Template.bind({});
Primary.args = {};
diff --git a/apps/web-graphpolaris/src/app/app.tsx b/apps/web-graphpolaris/src/app/app.tsx
index 4b52a8ebc5f6d26474f7c6be83c86b83045eff51..a9e7eb790222d8840f14d1c89271f8719bc191a4 100644
--- a/apps/web-graphpolaris/src/app/app.tsx
+++ b/apps/web-graphpolaris/src/app/app.tsx
@@ -1,23 +1,26 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { useEffect, useState } from 'react';
+import { GetUserInfo } from '@graphpolaris/shared/data-access/api';
+import { AuthorizationHandler } from '@graphpolaris/shared/data-access/authorization';
import {
assignNewGraphQueryResult,
useAppDispatch,
} from '@graphpolaris/shared/data-access/store';
-import { AuthorizationHandler } from '@graphpolaris/shared/data-access/authorization';
+import { useEffect, useState } from 'react';
import GridLayout from 'react-grid-layout';
+import LoginScreen from '../components/login/loginScreen';
import Panel from '../components/panels/panel';
import { RawJSONVis } from '../components/visualisations/rawjsonvis/rawjsonvis';
import SemanticSubstrates from '../components/visualisations/semanticsubstrates/semanticsubstrates';
-import LoginScreen from '../components/login/loginScreen';
-import { OurThemeProvider } from '@graphpolaris/shared/data-access/theme';
-import Schema from '../components/schema/schema';
function useIsAuthorized() {
const [userAuthorized, setUserAuthorized] = useState(false);
- const authCallback = () => {
+ const authCallback = async () => {
setUserAuthorized(true);
+
+ // Print the user that is currently logged in
+ const user = await GetUserInfo();
+ console.log(user);
};
AuthorizationHandler.instance().setCallback(authCallback);
@@ -40,7 +43,7 @@ export function App() {
const userIsAuthorized = useIsAuthorized();
return (
- <OurThemeProvider>
+ <>
{!userIsAuthorized && <LoginScreen />}
<GridLayout
className="layout"
@@ -52,9 +55,7 @@ export function App() {
key="schema-panel"
data-grid={{ x: 0, y: 0, w: 3, h: 30, maxW: 5, isDraggable: false }}
>
- <Panel content="Schema Panel" color="red">
- <Schema />
- </Panel>
+ <Panel content="Schema Panel" color="red"></Panel>
</div>
<div
key="query-panel"
@@ -105,7 +106,7 @@ export function App() {
<Panel content="History Channel" color="purple"></Panel>
</div>
</GridLayout>
- </OurThemeProvider>
+ </>
);
}
diff --git a/apps/web-graphpolaris/src/components/panels/panel.stories.tsx b/apps/web-graphpolaris/src/components/panels/panel.stories.tsx
index a172d8f1f4569d624ea280fbb283fbbadb5eea2e..4f570d0fdf85f20d4759e0207cb8045f67f1daa4 100644
--- a/apps/web-graphpolaris/src/components/panels/panel.stories.tsx
+++ b/apps/web-graphpolaris/src/components/panels/panel.stories.tsx
@@ -1,6 +1,10 @@
import React from 'react';
import Panel from './panel';
import { ComponentStory, ComponentMeta } from '@storybook/react';
+import { configureStore } from '@reduxjs/toolkit';
+import { colorPaletteConfigSlice } from '@graphpolaris/shared/data-access/store';
+import { Provider } from 'react-redux';
+import { GraphPolarisThemeProvider } from '@graphpolaris/shared/data-access/theme';
export default {
/* 👇 The title prop is optional.
@@ -9,9 +13,22 @@ export default {
*/
title: 'Panel',
component: Panel,
- decorators: [(story) => <div style={{ padding: '3rem' }}>{story()}</div>],
+ decorators: [
+ (story) => (
+ <Provider store={Mockstore}>
+ <GraphPolarisThemeProvider>{story()}</GraphPolarisThemeProvider>
+ </Provider>
+ ),
+ ],
} as ComponentMeta<typeof Panel>;
+// A super-simple mock of a redux store
+const Mockstore = configureStore({
+ reducer: {
+ colorPaletteConfig: colorPaletteConfigSlice.reducer,
+ },
+});
+
const Template: ComponentStory<typeof Panel> = (args) => <Panel {...args} />;
export const Primary = Template.bind({});
diff --git a/apps/web-graphpolaris/src/components/schema/initial-elements.js b/apps/web-graphpolaris/src/components/schema/initial-elements.js
deleted file mode 100644
index 09ea3488c8ae85761d255b8e49173d4d59e64130..0000000000000000000000000000000000000000
--- a/apps/web-graphpolaris/src/components/schema/initial-elements.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import React from 'react';
-
-export default [
- {
- id: '1',
- type: 'input',
- data: { label: 'Node 1' },
- position: { x: 250, y: 5 },
- },
- // you can also pass a React Node as a label
- { id: '2', data: { label: <div>Node 2</div> }, position: { x: 100, y: 100 } },
- { id: 'e1-2', source: '1', target: '2', animated: true },
-];
-
-// export default [
-// {
-// id: '1',
-// type: 'input',
-// data: {
-// label: (
-// <>
-// Welcome to <strong>React Flow!</strong>
-// </>
-// ),
-// },
-// position: { x: 250, y: 0 },
-// },
-// {
-// id: '2',
-// data: {
-// label: (
-// <>
-// This is a <strong>default node</strong>
-// </>
-// ),
-// },
-// position: { x: 100, y: 100 },
-// },
-// {
-// id: '3',
-// data: {
-// label: (
-// <>
-// This one has a <strong>custom style</strong>
-// </>
-// ),
-// },
-// position: { x: 400, y: 100 },
-// style: {
-// background: '#D6D5E6',
-// color: '#333',
-// border: '1px solid #222138',
-// width: 180,
-// },
-// },
-// {
-// id: '4',
-// position: { x: 250, y: 200 },
-// data: {
-// label: 'Another default node',
-// },
-// },
-// {
-// id: '5',
-// data: {
-// label: 'Node id: 5',
-// },
-// position: { x: 250, y: 325 },
-// },
-// {
-// id: '6',
-// type: 'output',
-// data: {
-// label: (
-// <>
-// An <strong>output node</strong>
-// </>
-// ),
-// },
-// position: { x: 100, y: 480 },
-// },
-// {
-// id: '7',
-// type: 'output',
-// data: { label: 'Another output node' },
-// position: { x: 400, y: 450 },
-// },
-// { id: 'e1-2', source: '1', target: '2', label: 'this is an edge label' },
-// { id: 'e1-3', source: '1', target: '3' },
-// {
-// id: 'e3-4',
-// source: '3',
-// target: '4',
-// animated: true,
-// label: 'animated edge',
-// },
-// {
-// id: 'e4-5',
-// source: '4',
-// target: '5',
-// // arrowHeadType: 'arrowclosed',
-// label: 'edge with arrow head',
-// },
-// {
-// id: 'e5-6',
-// source: '5',
-// target: '6',
-// type: 'smoothstep',
-// label: 'smooth step edge',
-// },
-// {
-// id: 'e5-7',
-// source: '5',
-// target: '7',
-// type: 'step',
-// style: { stroke: '#f6ab6c' },
-// label: 'a step edge',
-// animated: true,
-// labelStyle: { fill: '#f6ab6c', fontWeight: 700 },
-// },
-// ];
diff --git a/apps/web-graphpolaris/src/components/schema/schema.stories.tsx b/apps/web-graphpolaris/src/components/schema/schema.stories.tsx
index 3184fd89c35e2acef6a7ef9e12bef488f0c0bbf1..873afdf6b36983cd9d6a493235df20b3ed654452 100644
--- a/apps/web-graphpolaris/src/components/schema/schema.stories.tsx
+++ b/apps/web-graphpolaris/src/components/schema/schema.stories.tsx
@@ -1,14 +1,10 @@
-import { parseSchemaFromBackend } from '@graphpolaris/schema/schema-usecases';
+import { SchemaUtils } from '@graphpolaris/schema-utils';
import {
- SchemaFromBackend,
+ colorPaletteConfigSlice,
schemaSlice,
setSchema,
} from '@graphpolaris/shared/data-access/store';
-import {
- movieSchema,
- northWindSchema,
- twitterSchema,
-} from '@graphpolaris/shared/mock-data';
+import { GraphPolarisThemeProvider } from '@graphpolaris/shared/data-access/theme';
import { configureStore } from '@reduxjs/toolkit';
import { ComponentMeta, ComponentStory } from '@storybook/react';
import React from 'react';
@@ -24,19 +20,20 @@ export default {
component: Schema,
decorators: [
(story) => (
- <div style={{ padding: '3rem' }}>
- <Provider store={Mockstore}>{story()}</Provider>
- </div>
+ <Provider store={Mockstore}>
+ <GraphPolarisThemeProvider>{story()}</GraphPolarisThemeProvider>
+ </Provider>
),
],
} as ComponentMeta<typeof Schema>;
const Template: ComponentStory<typeof Schema> = (args) => <Schema {...args} />;
-// // A super-simple mock of a redux store
+// Mock the schema and palette store
const Mockstore = configureStore({
reducer: {
schema: schemaSlice.reducer,
+ colorPaletteConfig: colorPaletteConfigSlice.reducer,
},
});
diff --git a/apps/web-graphpolaris/src/components/schema/schema.tsx b/apps/web-graphpolaris/src/components/schema/schema.tsx
index bddb337bb38cd823d1739f6c1e560afc8f1757a7..b8b334a89680bacf9fa78f2d42a7d6abb9a8449b 100644
--- a/apps/web-graphpolaris/src/components/schema/schema.tsx
+++ b/apps/web-graphpolaris/src/components/schema/schema.tsx
@@ -7,13 +7,7 @@ import {
import { MultiGraph } from 'graphology';
// import { AllLayoutAlgorithms, LayoutFactory } from '@graphpolaris/graph-layout';
import { useEffect, useState } from 'react';
-import ReactFlow, {
- Node,
- Edge,
- Elements,
- ReactFlowProvider,
- FlowElement,
-} from 'react-flow-renderer';
+import ReactFlow, { FlowElement, ReactFlowProvider } from 'react-flow-renderer';
interface Props {
// content: string;
@@ -27,7 +21,8 @@ const Schema = (props: Props) => {
const [elements, setElements] = useState([] as FlowElement[]);
// In case the schema is updated
const dbschema = useSchema();
- const schemaLayout = useSchemaLayout();
+ // const [dbschema, setSchema] = useState(useSchema());
+ const [schemaLayout, setSchemaLayout] = useState(useSchemaLayout());
useEffect(() => {
console.log('dbSchema', dbschema, dbschema.order);
@@ -40,15 +35,15 @@ const Schema = (props: Props) => {
const layoutFactory = new LayoutFactory();
console.log('schema Layout', schemaLayout, 'order', dbschema.order);
const layout = layoutFactory.createLayout(
- // schemaLayout as AllLayoutAlgorithms
- 'Graphology_noverlap'
+ schemaLayout as AllLayoutAlgorithms
+ // schemaLayout
);
layout?.layout(dbschema);
- // dbschema.forEachNode((node, attr) => {
- // console.log('x', dbschema.getNodeAttribute(node, 'x'));
- // console.log('y', dbschema.getNodeAttribute(node, 'y'));
- // });
+ dbschema.forEachNode((node, attr) => {
+ console.log('x', dbschema.getNodeAttribute(node, 'x'));
+ console.log('y', dbschema.getNodeAttribute(node, 'y'));
+ });
const flowElements = createReactFlowElements(dbschema);
setElements(flowElements);
diff --git a/apps/web-graphpolaris/src/components/visualisations/rawjsonvis/rawjsonvis.stories.tsx b/apps/web-graphpolaris/src/components/visualisations/rawjsonvis/rawjsonvis.stories.tsx
index b384a6d3e879ec9c452194f170be0bb8877866e8..3b10ca2d12d79022af4ed24afd69c60c3235f4e0 100644
--- a/apps/web-graphpolaris/src/components/visualisations/rawjsonvis/rawjsonvis.stories.tsx
+++ b/apps/web-graphpolaris/src/components/visualisations/rawjsonvis/rawjsonvis.stories.tsx
@@ -2,14 +2,16 @@ import React from 'react';
import { ComponentStory, ComponentMeta } from '@storybook/react';
import { RawJSONVis } from './rawjsonvis';
-import { Provider } from 'react-redux';
-import { configureStore, createSlice } from '@reduxjs/toolkit';
-
import {
- graphQueryResultSlice,
assignNewGraphQueryResult,
+ colorPaletteConfigSlice,
+ graphQueryResultSlice,
resetGraphQueryResults,
+ store,
} from '@graphpolaris/shared/data-access/store';
+import { configureStore } from '@reduxjs/toolkit';
+import { Provider } from 'react-redux';
+import { GraphPolarisThemeProvider } from '@graphpolaris/shared/data-access/theme';
export default {
/* 👇 The title prop is optional.
@@ -20,30 +22,30 @@ export default {
component: RawJSONVis,
decorators: [
(story) => (
- <div style={{ padding: '3rem' }}>
- <Provider store={Mockstore}>{story()}</Provider>
- </div>
+ <Provider store={Mockstore}>
+ <GraphPolarisThemeProvider>{story()}</GraphPolarisThemeProvider>
+ </Provider>
),
],
} as ComponentMeta<typeof RawJSONVis>;
-const Template: ComponentStory<typeof RawJSONVis> = (args) => (
- <RawJSONVis {...args} />
-);
-
-// A super-simple mock of a redux store
const Mockstore = configureStore({
reducer: {
+ colorPaletteConfig: colorPaletteConfigSlice.reducer,
graphQueryResult: graphQueryResultSlice.reducer,
},
});
+const Template: ComponentStory<typeof RawJSONVis> = (args) => (
+ <RawJSONVis {...args} />
+);
+
export const TestWithData = Template.bind({});
TestWithData.args = {
loading: false,
};
TestWithData.play = async () => {
- const dispatch = Mockstore.dispatch;
+ const dispatch = store.dispatch;
dispatch(
assignNewGraphQueryResult({
nodes: [
@@ -68,6 +70,6 @@ Empty.args = {
loading: false,
};
Empty.play = async () => {
- const dispatch = Mockstore.dispatch;
+ const dispatch = store.dispatch;
dispatch(resetGraphQueryResults());
};
diff --git a/apps/web-graphpolaris/src/components/visualisations/rawjsonvis/rawjsonvis.tsx b/apps/web-graphpolaris/src/components/visualisations/rawjsonvis/rawjsonvis.tsx
index 12347185858d587d4bbdf09017286fec0bb7322a..85c5d46c0aa17b470181cee7841673204e5527ff 100644
--- a/apps/web-graphpolaris/src/components/visualisations/rawjsonvis/rawjsonvis.tsx
+++ b/apps/web-graphpolaris/src/components/visualisations/rawjsonvis/rawjsonvis.tsx
@@ -1,6 +1,12 @@
-import { useGraphQueryResult } from '@graphpolaris/shared/data-access/store';
+import {
+ changePrimary,
+ useAppDispatch,
+ useGraphQueryResult,
+} from '@graphpolaris/shared/data-access/store';
+import { useTheme } from '@mui/material';
import React, { useEffect, useState } from 'react';
import ReactJSONView from 'react-json-view';
+
import styles from './rawjsonvis.module.scss';
/* eslint-disable-next-line */
@@ -10,6 +16,8 @@ export interface RawJSONVisProps {
export const RawJSONVis = React.memo((props: RawJSONVisProps) => {
const graphQueryResult = useGraphQueryResult();
+ const dispatch = useAppDispatch();
+ const theme = useTheme();
console.log('update rawjson');
useEffect(() => {
@@ -26,6 +34,14 @@ export const RawJSONVis = React.memo((props: RawJSONVisProps) => {
return (
<>
+ <input
+ onChange={(v) =>
+ dispatch(changePrimary({ main: v.currentTarget.value }))
+ }
+ type="color"
+ name="head"
+ value={theme.palette.primary.main}
+ />
{loading && (
<div
style={{
diff --git a/apps/web-graphpolaris/src/components/visualisations/semanticsubstrates/semanticsubstrates.stories.tsx b/apps/web-graphpolaris/src/components/visualisations/semanticsubstrates/semanticsubstrates.stories.tsx
index 9746eb45ade6e414fb16beb0aed0d9fa02d05391..944011b532a61cef8159459e8922b79f496dbb5c 100644
--- a/apps/web-graphpolaris/src/components/visualisations/semanticsubstrates/semanticsubstrates.stories.tsx
+++ b/apps/web-graphpolaris/src/components/visualisations/semanticsubstrates/semanticsubstrates.stories.tsx
@@ -1,8 +1,12 @@
-import { createTheme, ThemeProvider } from '@mui/material/styles';
+import {
+ colorPaletteConfigSlice,
+ graphQueryResultSlice,
+} from '@graphpolaris/shared/data-access/store';
+import { GraphPolarisThemeProvider } from '@graphpolaris/shared/data-access/theme';
import { configureStore } from '@reduxjs/toolkit';
import { ComponentMeta, ComponentStory } from '@storybook/react';
-import colorPaletteConfigSlice from 'libs/shared/data-access/store/src/lib/colorPaletteConfigSlice';
import { Provider } from 'react-redux';
+
import SemanticSubstrates from './semanticsubstrates';
export default {
@@ -13,46 +17,20 @@ export default {
title: 'SemanticSubstrates',
component: SemanticSubstrates,
decorators: [
- (story) => <div style={{ padding: '3rem' }}>{story()}</div>,
(story) => (
- <div style={{ padding: '3rem' }}>
- <Provider store={Mockstore}>{story()}</Provider>
- </div>
+ <Provider store={Mockstore}>
+ <GraphPolarisThemeProvider>{story()}</GraphPolarisThemeProvider>
+ </Provider>
),
- (story) => <ThemeProvider theme={mockTheme}>{story()}</ThemeProvider>,
],
} as ComponentMeta<typeof SemanticSubstrates>;
-// declare module '@mui/material/styles' {
-// interface Theme {
-// palette: {
-// primary: string;
-// dataPointColors: string[];
-// };
-// }
-// // allow configuration using `createTheme`
-// interface ThemeOptions {
-// palette: {
-// danger: string;
-// dataPointColors: string[];
-// };
-// }
-// }
-
-const mockTheme = createTheme({
- palette: {
- // danger: 'orange',
- dataPointColors: ['blue', 'green'],
- },
-});
-
-// A super-simple mock of a redux store
const Mockstore = configureStore({
reducer: {
- colorPaletteConfig: colorPaletteConfigSlice,
+ colorPaletteConfig: colorPaletteConfigSlice.reducer,
+ graphQueryResult: graphQueryResultSlice.reducer,
},
});
-
const Template: ComponentStory<typeof SemanticSubstrates> = (args) => (
<SemanticSubstrates />
);
diff --git a/apps/web-graphpolaris/src/components/visualisations/semanticsubstrates/semanticsubstrates.tsx b/apps/web-graphpolaris/src/components/visualisations/semanticsubstrates/semanticsubstrates.tsx
index c35a1934e0f761fadb220a6a185823cd5216d7a2..cb6c9e564d6d571df6698b755a7ab2f3f182a390 100644
--- a/apps/web-graphpolaris/src/components/visualisations/semanticsubstrates/semanticsubstrates.tsx
+++ b/apps/web-graphpolaris/src/components/visualisations/semanticsubstrates/semanticsubstrates.tsx
@@ -1,9 +1,10 @@
import { Theme, useTheme } from '@mui/material/styles';
import Box from '@mui/system/Box';
-import { useDispatch } from 'react-redux';
import {
changeDataPointColors,
changePrimary,
+ toggleDarkMode,
+ useAppDispatch,
} from '@graphpolaris/shared/data-access/store';
import styled from 'styled-components';
import { Button } from '@mui/material';
@@ -11,33 +12,38 @@ import { Button } from '@mui/material';
const Div = styled.div`
// add :{ theme: Theme } if you want to have typing (autocomplete)
background-color: ${({ theme }: { theme: Theme }) =>
- theme.palette.dataPointColors[0]};
+ theme.palette.primary.main};
`;
const SemanticSubstrates = () => {
- const dispatch = useDispatch();
+ const dispatch = useAppDispatch();
const theme = useTheme();
return (
<>
<Div>
- <h1>semantic substrates div</h1>
+ <h1>semantic substrates, primary.main</h1>
</Div>
<div
style={{
- backgroundColor: theme.palette.primary.main,
+ backgroundColor: theme.palette.primary.dark,
}}
>
- <h1>semantic substrates h1</h1>
+ <h1>semantic substrates, primary.dark</h1>
</div>
<input
onChange={(v) =>
- dispatch(changePrimary({ main: v.currentTarget.value }))
+ dispatch(
+ changePrimary({
+ main: v.currentTarget.value,
+ darkMode: theme.palette.mode,
+ })
+ )
}
type="color"
name="head"
value={theme.palette.primary.main}
- />{' '}
+ />
<p>Change Primary Color</p>
<input
onChange={(v) =>
@@ -70,7 +76,9 @@ const SemanticSubstrates = () => {
value={theme.palette.dataPointColors[1]}
/>
<p>Change dataPointColor 1</p>
- <Button variant="contained">hoi</Button>
+ <Button variant="contained" onClick={() => dispatch(toggleDarkMode())}>
+ toggle dark mode
+ </Button>
</>
);
};
diff --git a/apps/web-graphpolaris/src/main.tsx b/apps/web-graphpolaris/src/main.tsx
index cd0a1c80a895818d45e24e56cc4722ac0e55ece6..5c5a5a841f508e8f59e86911e2b27521dd42bbca 100644
--- a/apps/web-graphpolaris/src/main.tsx
+++ b/apps/web-graphpolaris/src/main.tsx
@@ -1,22 +1,27 @@
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
-import { store } from '@graphpolaris/shared/data-access/store';
import { StrictMode } from 'react';
import * as ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
+import { store } from '@graphpolaris/shared/data-access/store';
+import { GraphPolarisThemeProvider } from '@graphpolaris/shared/data-access/theme';
import App from './app/app';
import LoginPopupComponent from './components/login/popup';
+import { CssBaseline } from '@mui/material';
ReactDOM.render(
<Provider store={store}>
- <Router>
- <Routes>
- {/* Route to auth component in popup */}
- <Route path="/auth" element={<LoginPopupComponent />}></Route>
- {/* App */}
- <Route path="/" element={<App />}></Route>
- </Routes>
- </Router>
+ <GraphPolarisThemeProvider>
+ <CssBaseline />
+ <Router>
+ <Routes>
+ {/* Route to auth component in popup */}
+ <Route path="/auth" element={<LoginPopupComponent />}></Route>
+ {/* App */}
+ <Route path="/" element={<App />}></Route>
+ </Routes>
+ </Router>
+ </GraphPolarisThemeProvider>
</Provider>,
document.getElementById('root')
);
diff --git a/libs/schema/schema-usecases/src/index.ts b/libs/schema/schema-usecases/src/index.ts
deleted file mode 100644
index 098e236f2c4c443007039e25c7509588a3fce07b..0000000000000000000000000000000000000000
--- a/libs/schema/schema-usecases/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './lib/schema-usecases';
\ No newline at end of file
diff --git a/libs/schema/schema-usecases/src/lib/schema-usecases.spec.ts b/libs/schema/schema-usecases/src/lib/schema-usecases.spec.ts
deleted file mode 100644
index 87156cb18e008ac440728750c5a49c86260d32dc..0000000000000000000000000000000000000000
--- a/libs/schema/schema-usecases/src/lib/schema-usecases.spec.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import {
- SchemaFromBackend,
- setSchema,
-} from '@graphpolaris/shared/data-access/store';
-import { MultiGraph } from 'graphology';
-import { Attributes } from 'graphology-types';
-import {
- movieSchema,
- northWindSchema,
- simpleSchema,
- twitterSchema,
-} from '@graphpolaris/shared/mock-data';
-import { parseSchemaFromBackend } from '..';
-
-import { store } from '@graphpolaris/shared/data-access/store';
-import { LayoutFactory } from '@graphpolaris/shared/graph-layout';
-
-describe('SchemaUsecases', () => {
- test.each([
- { data: simpleSchema },
- { data: movieSchema },
- { data: northWindSchema },
- { data: twitterSchema },
- ])('parseSchemaFromBackend parsing should work', ({ data }) => {
- // console.log('testinput', input);
-
- const parsed = parseSchemaFromBackend(data as SchemaFromBackend);
- expect(parsed).toBeDefined();
-
- let parsedNodeAttributes: Attributes[] = [];
- parsed.forEachNode((node, attr) => {
- // console.log('Node', node, attr);
- parsedNodeAttributes.push(attr.attributes);
- });
-
- let parsedEdgeAttributes: Attributes = [];
- parsed.forEachEdge((edge, attr, source, target, sa, ta, undirected) => {
- // console.log('Edge', edge, attr, source, target, sa, ta, undirected);
- parsedEdgeAttributes.push(attr.attribute);
- });
-
- expect(data.nodes.length).toEqual(parsed.order);
- expect(data.edges.length).toEqual(parsed.size);
-
- let inputNodeAttributes: Attributes = [];
- data.nodes.forEach((node) => {
- inputNodeAttributes.push(node.attributes as Attributes);
- });
-
- let inputEdgeAttributes: Attributes = [];
- data.edges.forEach((edge) => {
- inputEdgeAttributes.push(edge.attributes as Attributes);
- });
-
- expect(inputNodeAttributes).toEqual(parsedNodeAttributes);
- expect(inputEdgeAttributes).toEqual(parsedEdgeAttributes);
- });
-
- it('should export and reimport', () => {
- const parsed = parseSchemaFromBackend(simpleSchema as SchemaFromBackend);
- const reload = MultiGraph.from(parsed.export());
-
- expect(parsed).toStrictEqual(reload);
- });
-
- test.each([
- { data: simpleSchema },
- { data: movieSchema },
- { data: northWindSchema },
- { data: twitterSchema },
- ])('should load my test json $data', ({ data }) => {
- expect(data).toBeDefined();
- expect(data.nodes).toBeDefined();
- });
-
- test.each([
- { data: simpleSchema },
- { data: movieSchema },
- { data: northWindSchema },
- { data: twitterSchema },
- ])('should load my test json $data', ({ data }) => {
- const dispatch = store.dispatch;
-
- const parsed = parseSchemaFromBackend(data as SchemaFromBackend);
- dispatch(setSchema(parsed.export()));
-
- const state = store.getState();
- const schema = state.schema.graphologySerialized;
- expect(schema);
- const graphReloaded = MultiGraph.from(schema);
-
- expect(graphReloaded).toStrictEqual(parsed);
- });
-
- test.each([
- { data: simpleSchema },
- { data: movieSchema },
- { data: northWindSchema },
- { data: twitterSchema },
- ])('should layout schema', ({ data }) => {
- const parsed = parseSchemaFromBackend(data as SchemaFromBackend);
- expect(parsed).toBeDefined();
-
- const layout = store.getState().schema.schemaLayout;
- expect(layout);
-
- // const carFactory = new CarFactory();
- const layouter = new LayoutFactory();
-
- const layoutAlgorithm = layouter.createLayout('Graphology_noverlap');
- layoutAlgorithm?.layout(parsed);
-
- // const carFactory = new CarFactory();
-
- // const carModels: AllCarModels[] = ['BMW_coupe', 'Audi_q4', 'Audi_etron', 'BMW_i4'];
-
- // const cars = carModels.map(model => carFactory.createCar(model)?.drive());
-
- // const audi = carFactory.createCar('Audi_etron');
- // const bmw = carFactory.createCar('BMW_coupe');
-
- // audi?.specialAudiFunction();
- });
-});
diff --git a/libs/schema/schema-usecases/.babelrc b/libs/schema/usecases/.babelrc
similarity index 100%
rename from libs/schema/schema-usecases/.babelrc
rename to libs/schema/usecases/.babelrc
diff --git a/libs/schema/schema-usecases/.eslintrc.json b/libs/schema/usecases/.eslintrc.json
similarity index 100%
rename from libs/schema/schema-usecases/.eslintrc.json
rename to libs/schema/usecases/.eslintrc.json
diff --git a/libs/schema/usecases/README.md b/libs/schema/usecases/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..9df85b49c2d08927c6f1af920c477bdda6b4136c
--- /dev/null
+++ b/libs/schema/usecases/README.md
@@ -0,0 +1,7 @@
+# schema-usecases
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test schema-usecases` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/schema/schema-usecases/jest.config.js b/libs/schema/usecases/jest.config.js
similarity index 69%
rename from libs/schema/schema-usecases/jest.config.js
rename to libs/schema/usecases/jest.config.js
index 3ce30ca8d9b273a15c9fa74b349d6dd9df8be839..62be23864e3ee4b19d3f04173f72f4c4caafe1cf 100644
--- a/libs/schema/schema-usecases/jest.config.js
+++ b/libs/schema/usecases/jest.config.js
@@ -1,5 +1,5 @@
module.exports = {
- displayName: 'schema-schema-usecases',
+ displayName: 'schema-usecases',
preset: '../../../jest.preset.js',
globals: {
'ts-jest': {
@@ -10,5 +10,5 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
- coverageDirectory: '../../../coverage/libs/schema/schema-usecases',
+ coverageDirectory: '../../../coverage/libs/schema/usecases',
};
diff --git a/libs/schema/usecases/project.json b/libs/schema/usecases/project.json
new file mode 100644
index 0000000000000000000000000000000000000000..1231999dd8bad8d5c0e54de1bfba44c7ef586d29
--- /dev/null
+++ b/libs/schema/usecases/project.json
@@ -0,0 +1,23 @@
+{
+ "root": "libs/schema/usecases",
+ "sourceRoot": "libs/schema/usecases/src",
+ "projectType": "library",
+ "targets": {
+ "lint": {
+ "executor": "@nrwl/linter:eslint",
+ "outputs": ["{options.outputFile}"],
+ "options": {
+ "lintFilePatterns": ["libs/schema/usecases/**/*.ts"]
+ }
+ },
+ "test": {
+ "executor": "@nrwl/jest:jest",
+ "outputs": ["coverage/libs/schema/usecases"],
+ "options": {
+ "jestConfig": "libs/schema/usecases/jest.config.js",
+ "passWithNoTests": true
+ }
+ }
+ },
+ "tags": []
+}
diff --git a/libs/schema/usecases/src/index.ts b/libs/schema/usecases/src/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..1aa5377958fa9eb0665084bc6ed92f3b62d4d5e9
--- /dev/null
+++ b/libs/schema/usecases/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/schema-usecases';
diff --git a/libs/schema/usecases/src/lib/schema-usecases.spec.ts b/libs/schema/usecases/src/lib/schema-usecases.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..99ec73f4c8b2b1bd660b11f7f73a965f83a34f79
--- /dev/null
+++ b/libs/schema/usecases/src/lib/schema-usecases.spec.ts
@@ -0,0 +1,73 @@
+import { SchemaFromBackend } from '@graphpolaris/models';
+import { SchemaUtils } from '@graphpolaris/schema-utils';
+import { MultiGraph } from 'graphology';
+import { Attributes } from 'graphology-types';
+import {
+ movieSchemaRaw,
+ northwindSchemaRaw,
+ simpleSchemaRaw,
+ twitterSchemaRaw,
+} from 'libs/shared/mock-data/src';
+
+describe('SchemaUsecases', () => {
+ test.each([
+ { data: simpleSchemaRaw },
+ { data: movieSchemaRaw },
+ { data: northwindSchemaRaw },
+ { data: twitterSchemaRaw },
+ ])('parseSchemaFromBackend parsing should work', ({ data }) => {
+ // console.log('testinput', input);
+
+ const parsed = SchemaUtils.ParseSchemaFromBackend(
+ data as SchemaFromBackend
+ );
+ expect(parsed).toBeDefined();
+
+ const parsedNodeAttributes: Attributes[] = [];
+ parsed.forEachNode((node, attr) => {
+ // console.log('Node', node, attr);
+ parsedNodeAttributes.push(attr.attributes);
+ });
+
+ const parsedEdgeAttributes: Attributes = [];
+ parsed.forEachEdge((edge, attr, source, target, sa, ta, undirected) => {
+ // console.log('Edge', edge, attr, source, target, sa, ta, undirected);
+ parsedEdgeAttributes.push(attr.attribute);
+ });
+
+ expect(data.nodes.length).toEqual(parsed.order);
+ expect(data.edges.length).toEqual(parsed.size);
+
+ const inputNodeAttributes: Attributes = [];
+ data.nodes.forEach((node) => {
+ inputNodeAttributes.push(node.attributes as Attributes);
+ });
+
+ const inputEdgeAttributes: Attributes = [];
+ data.edges.forEach((edge) => {
+ inputEdgeAttributes.push(edge.attributes as Attributes);
+ });
+
+ expect(inputNodeAttributes).toEqual(parsedNodeAttributes);
+ expect(inputEdgeAttributes).toEqual(parsedEdgeAttributes);
+ });
+
+ it('should export and reimport', () => {
+ const parsed = SchemaUtils.ParseSchemaFromBackend(
+ simpleSchemaRaw as SchemaFromBackend
+ );
+ const reload = MultiGraph.from(parsed.export());
+
+ expect(parsed).toStrictEqual(reload);
+ });
+
+ test.each([
+ { data: simpleSchemaRaw },
+ { data: movieSchemaRaw },
+ { data: northwindSchemaRaw },
+ { data: twitterSchemaRaw },
+ ])('should load my test json $data', ({ data }) => {
+ expect(data).toBeDefined();
+ expect(data.nodes).toBeDefined();
+ });
+});
diff --git a/libs/schema/schema-usecases/src/lib/schema-usecases.ts b/libs/schema/usecases/src/lib/schema-usecases.ts
similarity index 69%
rename from libs/schema/schema-usecases/src/lib/schema-usecases.ts
rename to libs/schema/usecases/src/lib/schema-usecases.ts
index 04dcbd855a1ddbd2ad3a80f53e71a049923f8a48..5efe7de805e90dcc79a9d4e468c75026b5d18899 100644
--- a/libs/schema/schema-usecases/src/lib/schema-usecases.ts
+++ b/libs/schema/usecases/src/lib/schema-usecases.ts
@@ -1,25 +1,19 @@
-import Graph, { MultiGraph } from 'graphology';
-// import cytoscape from 'cytoscape'; // eslint-disable-line
-import {
- setSchema,
- store,
- SchemaFromBackend,
-} from '@graphpolaris/shared/data-access/store';
-import { Elements, Node, Edge } from 'react-flow-renderer';
+import Graph from 'graphology';
import { Attributes } from 'graphology-types';
-
-type CytoNode = {
- data: {
- id: string;
- type: string;
- source?: string;
- target?: string;
- position?: {
- x: number;
- y: number;
- };
- };
-};
+import { Edge, Elements, Node } from 'react-flow-renderer';
+
+// type CytoNode = {
+// data: {
+// id: string;
+// type: string;
+// source?: string;
+// target?: string;
+// position?: {
+// x: number;
+// y: number;
+// };
+// };
+// };
// // Layouts a given schema
// export function handleSchemaLayout(graph: Graph): void {
@@ -138,25 +132,6 @@ type CytoNode = {
// return layout.pon('layoutstop');
// }
-// Takes the schema as input and creates a list of nodes and edges in a format that the layouting algorithm can use.
-function trimSchema(graph: Graph): CytoNode[] {
- const cytonodes: CytoNode[] = [];
-
- graph.forEachNode((node) => {
- cytonodes.push({
- data: { id: node, type: 'node' },
- });
- });
-
- graph.forEachEdge((edge, _attributes, source, target) => {
- cytonodes.push({
- data: { id: edge, type: 'edge', source: source, target: target },
- });
- });
-
- return cytonodes;
-}
-
// Takes the schema as an imput and creates basic react flow elements for them.
export function createReactFlowElements(graph: Graph): Elements<Node | Edge> {
const initialElements: Elements<Node | Edge> = [];
@@ -184,32 +159,32 @@ export function createReactFlowElements(graph: Graph): Elements<Node | Edge> {
return initialElements;
}
-export function parseSchemaFromBackend(
- schemaFromBackend: SchemaFromBackend
-): Graph {
- const { nodes, edges } = schemaFromBackend;
- // Instantiate a directed graph that allows self loops and parallel edges
- const schemaGraph = new MultiGraph({ allowSelfLoops: true });
- // console.log('parsing schema');
- // The graph schema needs a node for each node AND edge. These need then be connected
-
- nodes.forEach((node) => {
- schemaGraph.addNode(node.name, {
- name: node.name,
- attributes: node.attributes,
- x: 0,
- y: 0,
- });
- });
+// export function parseSchemaFromBackend(
+// schemaFromBackend: SchemaFromBackend
+// ): Graph {
+// const { nodes, edges } = schemaFromBackend;
+// // Instantiate a directed graph that allows self loops and parallel edges
+// const schemaGraph = new MultiGraph({ allowSelfLoops: true });
+// // console.log('parsing schema');
+// // The graph schema needs a node for each node AND edge. These need then be connected
+
+// nodes.forEach((node) => {
+// schemaGraph.addNode(node.name, {
+// name: node.name,
+// attributes: node.attributes,
+// x: 0,
+// y: 0,
+// });
+// });
- // The name of the edge will be name + from + to, since edge names are not unique
- edges.forEach((edge) => {
- const edgeID = [edge.name, '_', edge.from, edge.to].join(''); //ensure that all interpreted as string
+// // The name of the edge will be name + from + to, since edge names are not unique
+// edges.forEach((edge) => {
+// const edgeID = [edge.name, '_', edge.from, edge.to].join(''); //ensure that all interpreted as string
- // This node is the actual edge
- schemaGraph.addDirectedEdgeWithKey(edgeID, edge.from, edge.to, {
- attribute: edge.attributes,
- });
- });
- return schemaGraph;
-}
+// // This node is the actual edge
+// schemaGraph.addDirectedEdgeWithKey(edgeID, edge.from, edge.to, {
+// attribute: edge.attributes,
+// });
+// });
+// return schemaGraph;
+// }
diff --git a/libs/schema/schema-usecases/tsconfig.json b/libs/schema/usecases/tsconfig.json
similarity index 100%
rename from libs/schema/schema-usecases/tsconfig.json
rename to libs/schema/usecases/tsconfig.json
diff --git a/libs/schema/schema-usecases/tsconfig.lib.json b/libs/schema/usecases/tsconfig.lib.json
similarity index 100%
rename from libs/schema/schema-usecases/tsconfig.lib.json
rename to libs/schema/usecases/tsconfig.lib.json
diff --git a/libs/schema/schema-usecases/tsconfig.spec.json b/libs/schema/usecases/tsconfig.spec.json
similarity index 100%
rename from libs/schema/schema-usecases/tsconfig.spec.json
rename to libs/schema/usecases/tsconfig.spec.json
diff --git a/libs/shared/data-access/api/.babelrc b/libs/shared/data-access/api/.babelrc
new file mode 100644
index 0000000000000000000000000000000000000000..cf7ddd99c615a064ac18eb3109eee4f394ab1faf
--- /dev/null
+++ b/libs/shared/data-access/api/.babelrc
@@ -0,0 +1,3 @@
+{
+ "presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
+}
diff --git a/libs/shared/data-access/api/.eslintrc.json b/libs/shared/data-access/api/.eslintrc.json
new file mode 100644
index 0000000000000000000000000000000000000000..632e9b0e22253922989d1153e06f7ba996c72d38
--- /dev/null
+++ b/libs/shared/data-access/api/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+ "extends": ["../../../../.eslintrc.json"],
+ "ignorePatterns": ["!**/*"],
+ "overrides": [
+ {
+ "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.ts", "*.tsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.js", "*.jsx"],
+ "rules": {}
+ }
+ ]
+}
diff --git a/libs/schema/schema-usecases/README.md b/libs/shared/data-access/api/README.md
similarity index 55%
rename from libs/schema/schema-usecases/README.md
rename to libs/shared/data-access/api/README.md
index 52ab1f83a954f953decb97a40f2afd07239d9a12..3156f01c6b6befd68fe400d0c03a01d52ac3b5e7 100644
--- a/libs/schema/schema-usecases/README.md
+++ b/libs/shared/data-access/api/README.md
@@ -1,7 +1,7 @@
-# schema-schema-usecases
+# shared-data-access-api
This library was generated with [Nx](https://nx.dev).
## Running unit tests
-Run `nx test schema-schema-usecases` to execute the unit tests via [Jest](https://jestjs.io).
+Run `nx test shared-data-access-api` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/shared/data-access/api/jest.config.js b/libs/shared/data-access/api/jest.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..d6f5553b2f38e80cf671a056bd731ff218828fc7
--- /dev/null
+++ b/libs/shared/data-access/api/jest.config.js
@@ -0,0 +1,14 @@
+module.exports = {
+ displayName: 'shared-data-access-api',
+ preset: '../../../../jest.preset.js',
+ globals: {
+ 'ts-jest': {
+ tsconfig: '<rootDir>/tsconfig.spec.json',
+ },
+ },
+ transform: {
+ '^.+\\.[tj]sx?$': 'ts-jest',
+ },
+ moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+ coverageDirectory: '../../../../coverage/libs/shared/data-access/api',
+};
diff --git a/libs/schema/schema-usecases/project.json b/libs/shared/data-access/api/project.json
similarity index 53%
rename from libs/schema/schema-usecases/project.json
rename to libs/shared/data-access/api/project.json
index 39846a002e9e098d8027a092f82630812391f264..362413c86100b967aa87d647e7a416bfd1b1d8c6 100644
--- a/libs/schema/schema-usecases/project.json
+++ b/libs/shared/data-access/api/project.json
@@ -1,20 +1,20 @@
{
- "root": "libs/schema/schema-usecases",
- "sourceRoot": "libs/schema/schema-usecases/src",
+ "root": "libs/shared/data-access/api",
+ "sourceRoot": "libs/shared/data-access/api/src",
"projectType": "library",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
- "lintFilePatterns": ["libs/schema/schema-usecases/**/*.ts"]
+ "lintFilePatterns": ["libs/shared/data-access/api/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
- "outputs": ["coverage/libs/schema/schema-usecases"],
+ "outputs": ["coverage/libs/shared/data-access/api"],
"options": {
- "jestConfig": "libs/schema/schema-usecases/jest.config.js",
+ "jestConfig": "libs/shared/data-access/api/jest.config.js",
"passWithNoTests": true
}
}
diff --git a/libs/shared/data-access/api/src/index.ts b/libs/shared/data-access/api/src/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..136d9ebb4b0d0d0dc89d1ac6330a62d19d681908
--- /dev/null
+++ b/libs/shared/data-access/api/src/index.ts
@@ -0,0 +1 @@
+export { User, GetUserInfo } from './lib/user';
diff --git a/libs/shared/data-access/api/src/lib/database.ts b/libs/shared/data-access/api/src/lib/database.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8d6700de6f55dde670227d1cedf1080c44637e28
--- /dev/null
+++ b/libs/shared/data-access/api/src/lib/database.ts
@@ -0,0 +1,75 @@
+// All database related API calls
+
+import { AuthorizationHandler } from '@graphpolaris/shared/data-access/authorization';
+
+export type AddDatabaseRequest = {
+ name: string;
+ internal_database_name: string;
+ url: string;
+ port: number;
+ username: string;
+ password: string;
+ type: number; // Database type. 0 = ArangoDB, 1 = Neo4j
+};
+
+export function AddDatabase(request: AddDatabaseRequest): Promise<void> {
+ return new Promise((resolve, reject) => {
+ fetch('https://datastrophe.science.uu.nl/user/database', {
+ method: 'POST',
+ credentials: 'same-origin',
+ headers: new Headers({
+ Authorization:
+ 'Bearer ' + AuthorizationHandler.instance().AccessToken(),
+ }),
+ body: JSON.stringify(request),
+ }).then((response: Response) => {
+ if (!response.ok) {
+ reject(response.statusText);
+ }
+
+ resolve();
+ });
+ });
+}
+
+export function GetAllDatabases(): Promise<Array<string>> {
+ return new Promise<Array<string>>((resolve, reject) => {
+ fetch('https://datastrophe.science.uu.nl/user/database', {
+ method: 'GET',
+ credentials: 'same-origin',
+ headers: new Headers({
+ Authorization:
+ 'Bearer ' + AuthorizationHandler.instance().AccessToken(),
+ }),
+ })
+ .then((response: Response) => {
+ if (!response.ok) {
+ reject(response.statusText);
+ }
+
+ return response.json();
+ })
+ .then((json: any) => {
+ resolve(json.databases);
+ });
+ });
+}
+
+export function DeleteDatabase(name: string): Promise<void> {
+ return new Promise((resolve, reject) => {
+ fetch('https://datastrophe.science.uu.nl/user/database/' + name, {
+ method: 'DELETE',
+ credentials: 'same-origin',
+ headers: new Headers({
+ Authorization:
+ 'Bearer ' + AuthorizationHandler.instance().AccessToken(),
+ }),
+ }).then((response: Response) => {
+ if (!response.ok) {
+ reject(response.statusText);
+ }
+
+ resolve();
+ });
+ });
+}
diff --git a/libs/shared/data-access/api/src/lib/user.ts b/libs/shared/data-access/api/src/lib/user.ts
new file mode 100644
index 0000000000000000000000000000000000000000..457ce20f6af6c8be31727f2b9757134827b4fc70
--- /dev/null
+++ b/libs/shared/data-access/api/src/lib/user.ts
@@ -0,0 +1,36 @@
+// All user related API calls
+
+import { AuthorizationHandler } from '@graphpolaris/shared/data-access/authorization';
+
+export type User = {
+ Name: string;
+ Email: string;
+ SignInProvider: number;
+};
+
+export function GetUserInfo(): Promise<User> {
+ return new Promise<User>((resolve, reject) => {
+ fetch('https://datastrophe.science.uu.nl/user/', {
+ method: 'GET',
+ credentials: 'same-origin',
+ headers: new Headers({
+ Authorization:
+ 'Bearer ' + AuthorizationHandler.instance().AccessToken(),
+ }),
+ })
+ .then((response: Response) => {
+ if (!response.ok) {
+ reject(response.statusText);
+ }
+
+ return response.json();
+ })
+ .then((json: any) => {
+ resolve({
+ Name: json.name,
+ Email: json.email,
+ SignInProvider: json.sign_in_provider,
+ });
+ });
+ });
+}
diff --git a/libs/shared/data-access/api/tsconfig.json b/libs/shared/data-access/api/tsconfig.json
new file mode 100644
index 0000000000000000000000000000000000000000..d0953a0f8b8084fd7ca99de4a00f82435f8679cd
--- /dev/null
+++ b/libs/shared/data-access/api/tsconfig.json
@@ -0,0 +1,19 @@
+{
+ "extends": "../../../../tsconfig.base.json",
+ "files": [],
+ "include": [],
+ "references": [
+ {
+ "path": "./tsconfig.lib.json"
+ },
+ {
+ "path": "./tsconfig.spec.json"
+ }
+ ],
+ "compilerOptions": {
+ "forceConsistentCasingInFileNames": true,
+ "strict": true,
+ "noImplicitReturns": true,
+ "noFallthroughCasesInSwitch": true
+ }
+}
diff --git a/libs/shared/data-access/api/tsconfig.lib.json b/libs/shared/data-access/api/tsconfig.lib.json
new file mode 100644
index 0000000000000000000000000000000000000000..2ef844c42b4d526dd97ef3b18591cc5c652781e5
--- /dev/null
+++ b/libs/shared/data-access/api/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../../../dist/out-tsc",
+ "declaration": true,
+ "types": []
+ },
+ "include": ["**/*.ts"],
+ "exclude": ["**/*.spec.ts"]
+}
diff --git a/libs/shared/data-access/api/tsconfig.spec.json b/libs/shared/data-access/api/tsconfig.spec.json
new file mode 100644
index 0000000000000000000000000000000000000000..315a5b0bbebaca96617a8dd5353901287ebd8e68
--- /dev/null
+++ b/libs/shared/data-access/api/tsconfig.spec.json
@@ -0,0 +1,19 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../../../dist/out-tsc",
+ "module": "commonjs",
+ "types": ["jest", "node"]
+ },
+ "include": [
+ "**/*.test.ts",
+ "**/*.spec.ts",
+ "**/*.test.tsx",
+ "**/*.spec.tsx",
+ "**/*.test.js",
+ "**/*.spec.js",
+ "**/*.test.jsx",
+ "**/*.spec.jsx",
+ "**/*.d.ts"
+ ]
+}
diff --git a/libs/shared/data-access/authorization/src/lib/authorizationHandler.ts b/libs/shared/data-access/authorization/src/lib/authorizationHandler.ts
index f3e4319a9525521d43ceee6b92e7d18b52defea5..fc92922419ad609e85767e55dd35b06b2a581012 100644
--- a/libs/shared/data-access/authorization/src/lib/authorizationHandler.ts
+++ b/libs/shared/data-access/authorization/src/lib/authorizationHandler.ts
@@ -157,7 +157,7 @@ export class AuthorizationHandler {
* SetAccessToken sets the current access token (should only be called by the sign-in component)
* @param accessToken
*/
- SetAccessToken(accessToken: string) {
+ async SetAccessToken(accessToken: string) {
this.accessToken = accessToken;
console.log(this.accessToken);
@@ -170,7 +170,6 @@ export class AuthorizationHandler {
this.refreshTokens();
}, 10 * 60 * 1000);
- // TODO: Change auth state
if (this.callback) {
this.callback();
}
diff --git a/libs/shared/data-access/store/src/index.ts b/libs/shared/data-access/store/src/index.ts
index 125019fc2b523e117ccb6d365f1382b58fe68eac..c855ded7f0ce61ed13dc286d637aff7a2c3446ef 100644
--- a/libs/shared/data-access/store/src/index.ts
+++ b/libs/shared/data-access/store/src/index.ts
@@ -5,6 +5,7 @@ export {
setSchema,
readInSchemaFromBackend,
schemaSlice,
+ selectSchemaLayout
} from './lib/schemaSlice';
export {
selectGraphQueryResult,
@@ -17,7 +18,9 @@ export {
export {
changePrimary,
changeDataPointColors,
+ toggleDarkMode,
selectColorPaletteConfig,
+ colorPaletteConfigSlice,
} from './lib/colorPaletteConfigSlice';
// Exported types
@@ -26,4 +29,3 @@ export type {
ColorPaletteConfig,
ExtraColorsForMui5,
} from './lib/colorPaletteConfigSlice';
-export type { SchemaFromBackend } from './lib/schemaSlice';
diff --git a/libs/shared/data-access/store/src/lib/colorPaletteConfigSlice.ts b/libs/shared/data-access/store/src/lib/colorPaletteConfigSlice.ts
index 4b7475f9978fbc6ad42cf93b965d235c7d78e707..bb41dc4a815f5dccb73c3ac51de8ed57728483e0 100644
--- a/libs/shared/data-access/store/src/lib/colorPaletteConfigSlice.ts
+++ b/libs/shared/data-access/store/src/lib/colorPaletteConfigSlice.ts
@@ -1,32 +1,74 @@
+import { palette } from '@mui/system';
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
import type { RootState } from './store';
-/** Extra properties that are not present in the default PaletteOptions of mui. */
+/** Extra properties that are not present in the default PaletteOptions of mui. For autocompletion */
export interface ExtraColorsForMui5 {
/** Colors that can be used for data visualisation, e.g. nodes, edges */
dataPointColors: string[];
}
-/** Our custom color palette config. */
-export interface ColorPaletteConfig extends ExtraColorsForMui5 {
- primary: {
- main: string;
+/** Our custom color palette config. With the palette options from MUI that we are going to use. */
+export interface ColorPaletteConfig {
+ lightPalette: {
+ // Custom colors
+ custom: ExtraColorsForMui5;
+ // MUI colors
+ primary: {
+ light?: string;
+ main: string;
+ dark?: string;
+ };
+ secondary: {
+ light?: string;
+ main: string;
+ dark?: string;
+ };
};
- secondary: {
- main: string;
+ darkPalette: {
+ custom: ExtraColorsForMui5;
+ primary: {
+ light?: string;
+ main: string;
+ dark?: string;
+ };
+ secondary: {
+ light?: string;
+ main: string;
+ dark?: string;
+ };
};
+ darkMode: boolean;
}
// This looks very much like the mui Palette interface,
// But we don't reference that type directly here to stay decoupled
export const initialState: ColorPaletteConfig = {
- dataPointColors: ['#ff0000', '#00ff00', '#0000ff'],
- primary: {
- main: '#9999ff',
+ lightPalette: {
+ custom: { dataPointColors: ['#ff0000', '#00ff00', '#0000ff'] },
+ // If light and dark are not set, these will be calculated using main.
+ // light/dark have nothing with darkmode, these are just a light and dark variation
+ primary: {
+ // light: '#42a5f5',
+ main: '#1976d2',
+ // dark: '#1565c0',
+ },
+ secondary: {
+ // light: '#ba68c8',
+ main: '#9c27b0',
+ // dark: '#7b1fa2',
+ },
},
- secondary: {
- main: '#ff0000',
+ darkPalette: {
+ custom: { dataPointColors: ['#ff0000', '#00ff00', '#0000ff'] },
+ primary: {
+ main: '#e3f3fd',
+ },
+ secondary: {
+ main: '#f3e5f5',
+ },
},
+ darkMode: false,
};
export const colorPaletteConfigSlice = createSlice({
@@ -34,16 +76,33 @@ export const colorPaletteConfigSlice = createSlice({
// `createSlice` will infer the state type from the `initialState` argument
initialState,
reducers: {
- changePrimary: (state, action: PayloadAction<{ main: string }>) => {
- state.primary = action.payload;
+ changePrimary: (
+ state,
+ action: PayloadAction<{
+ main?: string;
+ light?: string;
+ dark?: string;
+ darkMode?: 'light' | 'dark';
+ }>
+ ) => {
+ const { main, light, dark, darkMode } = action.payload;
+ let palette = state.lightPalette;
+ if (darkMode == 'dark') palette = state.darkPalette;
+
+ if (main) palette.primary.main = main;
+ if (light) palette.primary.light = light;
+ if (dark) palette.primary.dark = dark;
},
changeDataPointColors: (state, action: PayloadAction<string[]>) => {
- state.dataPointColors = action.payload;
+ state.lightPalette.custom.dataPointColors = action.payload;
+ },
+ toggleDarkMode: (state) => {
+ state.darkMode = !state.darkMode;
},
},
});
-export const { changePrimary, changeDataPointColors } =
+export const { changePrimary, changeDataPointColors, toggleDarkMode } =
colorPaletteConfigSlice.actions;
// Select the schema and convert it to a graphology object
diff --git a/libs/shared/data-access/store/src/lib/hooks.ts b/libs/shared/data-access/store/src/lib/hooks.ts
index 0d426593156f8956d726735b3aa12d3b837249e6..801f34a8077abdcdd9efdf2bfaa4161f00c10e26 100644
--- a/libs/shared/data-access/store/src/lib/hooks.ts
+++ b/libs/shared/data-access/store/src/lib/hooks.ts
@@ -10,13 +10,9 @@ export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
// Gives the graphQueryResult from the store
export const useGraphQueryResult = () => useAppSelector(selectGraphQueryResult);
-/**
- *
- Gives the schema form the store (as a graphology object)
- * */
+// Gives the schema form the store (as a graphology object)
export const useSchema = () => useAppSelector(selectSchema);
-/**
- * Gives the schema form the store (as a enumeration of existing layout algorithms)
- * */
-export const useSchemaLayout = () => useAppSelector(selectSchemaLayout);
+
+// Gives the schema form the store (as a graphology object)
+export const useSchemaLayout = () => useAppSelector(selectSchemaLayout);
\ No newline at end of file
diff --git a/libs/shared/data-access/store/src/lib/schemaSlice.spec.ts b/libs/shared/data-access/store/src/lib/schemaSlice.spec.ts
index b0da5d51f06fd1434ab6f40edb3261d34784d703..3a6b17a5275478904fd98b29d47ab2a6708062eb 100644
--- a/libs/shared/data-access/store/src/lib/schemaSlice.spec.ts
+++ b/libs/shared/data-access/store/src/lib/schemaSlice.spec.ts
@@ -5,13 +5,6 @@ import reducer, { selectSchema, setSchema, initialState } from './schemaSlice';
// import { deleteBook, updateBook, addNewBook } from '../redux/bookSlice';
import { store } from './store';
-import {
- movieSchema,
- northWindSchema,
- simpleSchema,
- twitterSchema,
-} from '@graphpolaris/shared/mock-data';
-
describe('SchemaSlice Tests', () => {
it('should make a graphology graph', () => {
const graph = new MultiGraph({ allowSelfLoops: true });
@@ -38,7 +31,7 @@ describe('SchemaSlice Tests', () => {
expect(initialState);
});
- it('state should return the initial state', () => {
+ it('should return the initial state', () => {
let state = store.getState();
const schema = state.schema;
@@ -50,19 +43,52 @@ describe('SchemaSlice Tests', () => {
// console.log(initialState);
expect(graph);
});
-});
-test.each([
- { data: simpleSchema },
- { data: movieSchema },
- { data: northWindSchema },
- { data: twitterSchema },
-])('store and retrieve', ({ data }) => {
+ // it('should handle a todo being added to an empty list', () => {
+ // let state = store.getState().schema;
+ // let schema = useSchema();
- let state = store.getState();
+ // // const unchangedBook = state.bookList.find((book) => book.id === '1');
+ // // expect(unchangedBook?.title).toBe('1984');
+ // // expect(unchangedBook?.author).toBe('George Orwell');
- const schema = state.schema;
- expect(schema);
+ // // store.dispatch(updateBook({ id: '1', title: '1985', author: 'George Bush' }));
+ // // state = store.getState().book;
+ // // let changeBook = state.bookList.find((book) => book.id === '1');
+ // // expect(changeBook?.title).toBe('1985');
+ // // expect(changeBook?.author).toBe('George Bush');
- expect(data).toBeDefined();
+ // // store.dispatch(
+ // // updateBook({ id: '1', title: '1984', author: 'George Orwell' })
+ // // );
+ // // state = store.getState().book;
+ // // const backToUnchangedBook = state.bookList.find((book) => book.id === '1');
+
+ // // expect(backToUnchangedBook).toEqual(unchangedBook);
+ // // ]);
+ // });
});
+
+// test('Deletes a book from list with id', () => {
+// let state = store.getState().book;
+// const initialBookCount = state.bookList.length;
+
+// store.dispatch(deleteBook({ id: '1' }));
+// state = store.getState().book;
+
+// expect(state.bookList.length).toBeLessThan(initialBookCount); // Checking if new length smaller than inital length, which is 3
+// });
+
+// test('Adds a new book', () => {
+// let state = store.getState().book;
+// const initialBookCount = state.bookList.length;
+
+// store.dispatch(
+// addNewBook({ id: '4', author: 'Tester', title: 'Testers manual' })
+// );
+// state = store.getState().book;
+// const newlyAddedBook = state.bookList.find((book) => book.id === '4');
+// expect(newlyAddedBook?.author).toBe('Tester');
+// expect(newlyAddedBook?.title).toBe('Testers manual');
+// expect(state.bookList.length).toBeGreaterThan(initialBookCount);
+// });
diff --git a/libs/shared/data-access/store/src/lib/schemaSlice.ts b/libs/shared/data-access/store/src/lib/schemaSlice.ts
index 686cec2eea938888bfb4015f0dbb3e232bbf77fe..1769c7b905cf672edcf93cf327e8061e316dc84f 100644
--- a/libs/shared/data-access/store/src/lib/schemaSlice.ts
+++ b/libs/shared/data-access/store/src/lib/schemaSlice.ts
@@ -1,44 +1,15 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import type { RootState } from './store';
-import { MultiGraph } from 'graphology';
+import Graph, { MultiGraph } from 'graphology';
import { SerializedGraph } from 'graphology-types';
-import { AllLayoutAlgorithms } from '@graphpolaris/shared/graph-layout';
-import { Graphology } from 'libs/shared/graph-layout/src/factory/graphology-layouts';
-
-/*************** schema format from the backend *************** */
-// TODO: should probably not live here
-/** Schema type, consist of nodes and edges */
-export type SchemaFromBackend = {
- edges: Edge[];
- nodes: Node[];
-};
-
-/** Attribute type, consist of a name */
-export type Attribute = {
- name: string;
- type: 'string' | 'int' | 'bool' | 'float';
-};
-
-/** Node type, consist of a name and a list of attributes */
-export type Node = {
- name: string;
- attributes: Attribute[];
-};
+import { SchemaFromBackend } from 'libs/shared/models/src';
+import type { RootState } from './store';
-/** Edge type, consist of a name, start point, end point and a list of attributes */
-export type Edge = {
- name: string;
- to: string;
- from: string;
- collection: string;
- attributes: Attribute[];
-};
/**************************************************************** */
// Define the initial state using that type
export const initialState = {
graphologySerialized: new MultiGraph().export(),
- schemaLayout: 'Graphology_noverlap',
+ layoutName: 'Cytoscape_klay',
};
export const schemaSlice = createSlice({
@@ -47,9 +18,16 @@ export const schemaSlice = createSlice({
initialState,
reducers: {
setSchema: (state, action: PayloadAction<SerializedGraph>) => {
- // console.log('setSchema in schemaslice', action);
+ console.log('setSchema', action);
state.graphologySerialized = action.payload;
},
+
+ setSchemaLayout: (state, action: PayloadAction<string>) => {
+ console.log('setSchemaLayout', action);
+
+ state.layoutName = action.payload;
+ },
+
readInSchemaFromBackend: (
state,
action: PayloadAction<SchemaFromBackend>
@@ -91,9 +69,6 @@ export const schemaSlice = createSlice({
state.graphologySerialized = schema.export();
},
- setGraphLayout: (state, action: PayloadAction<AllLayoutAlgorithms>) => {
- state.schemaLayout = action.payload;
- },
},
});
@@ -102,15 +77,16 @@ export const { readInSchemaFromBackend, setSchema } = schemaSlice.actions;
/**
* Select the schema and convert it to a graphology object
* */
-export const selectSchema = (state: RootState) =>
- MultiGraph.from(state.schema.graphologySerialized).copy();
+export const selectSchema = (state: RootState) => {
+ // console.log(state);
+ return MultiGraph.from(state.schema.graphologySerialized);
+};
-/**
- * selects the SchemaLayout enum
- * @param {GraphLayout} state
- * @returns {GraphLayout} enum of type GraphLayout
- */
-export const selectSchemaLayout = (state: RootState) =>
- state.schema.schemaLayout;
+// /**
+// * selects the SchemaLayout enum
+// * @param {GraphLayout} state
+// * @returns {GraphLayout} enum of type GraphLayout
+// */
+export const selectSchemaLayout = (state: RootState) => state.schema.layoutName;
export default schemaSlice.reducer;
diff --git a/libs/shared/data-access/store/tsconfig.lib.json b/libs/shared/data-access/store/tsconfig.lib.json
index 2ef844c42b4d526dd97ef3b18591cc5c652781e5..94c28cbd1b3e19a79ac8bca76709896f18c34531 100644
--- a/libs/shared/data-access/store/tsconfig.lib.json
+++ b/libs/shared/data-access/store/tsconfig.lib.json
@@ -5,6 +5,6 @@
"declaration": true,
"types": []
},
- "include": ["**/*.ts"],
+ "include": ["**/*.ts", "../theme/src/lib/colorPaletteConfigSlice.ts"],
"exclude": ["**/*.spec.ts"]
}
diff --git a/libs/shared/data-access/theme/src/index.ts b/libs/shared/data-access/theme/src/index.ts
index fae1f6948cf3d9f4fd40ea0c309bf39ea9f07f89..009824eca141e2b77653f611d6e8a03899061be2 100644
--- a/libs/shared/data-access/theme/src/index.ts
+++ b/libs/shared/data-access/theme/src/index.ts
@@ -1 +1 @@
-export * from './lib/ourThemeProvider';
+export * from './lib/graphPolarisThemeProvider';
diff --git a/libs/shared/data-access/theme/src/lib/ourThemeProvider.tsx b/libs/shared/data-access/theme/src/lib/graphPolarisThemeProvider.tsx
similarity index 89%
rename from libs/shared/data-access/theme/src/lib/ourThemeProvider.tsx
rename to libs/shared/data-access/theme/src/lib/graphPolarisThemeProvider.tsx
index 04f36156807eafc3dcf4d4f569da172f00792d38..3a1512f8c63af1aba262414799df202e365292b9 100644
--- a/libs/shared/data-access/theme/src/lib/ourThemeProvider.tsx
+++ b/libs/shared/data-access/theme/src/lib/graphPolarisThemeProvider.tsx
@@ -19,7 +19,11 @@ declare module '@mui/material/styles' {
}
}
-export function OurThemeProvider({ children }: { children: ReactNode }) {
+export function GraphPolarisThemeProvider({
+ children,
+}: {
+ children: ReactNode;
+}) {
const colorPaletteConfig = useAppSelector(selectColorPaletteConfig);
// Create a new theme when our custom color palette in redux changed
@@ -32,4 +36,4 @@ export function OurThemeProvider({ children }: { children: ReactNode }) {
return <ThemeProvider theme={theme}>{children}</ThemeProvider>;
}
-export default OurThemeProvider;
+export default GraphPolarisThemeProvider;
diff --git a/libs/shared/data-access/theme/src/lib/mapColorsConfigToMuiTheme.ts b/libs/shared/data-access/theme/src/lib/mapColorsConfigToMuiTheme.ts
index 53711e8d03ef2715de701272ea343575f8adbcfe..43235684422e51bacf514cf32e21f1bf69c7305b 100644
--- a/libs/shared/data-access/theme/src/lib/mapColorsConfigToMuiTheme.ts
+++ b/libs/shared/data-access/theme/src/lib/mapColorsConfigToMuiTheme.ts
@@ -7,9 +7,19 @@ export default function MapColorsConfigToMuiTheme(
): ThemeOptions {
return {
palette: {
- primary: { main: colorsConfig.primary.main },
- secondary: { main: colorsConfig.secondary.main },
- dataPointColors: colorsConfig.dataPointColors,
+ mode: colorsConfig.darkMode ? 'dark' : 'light',
+
+ ...(colorsConfig.darkMode
+ ? {
+ primary: colorsConfig.darkPalette.primary,
+ secondary: colorsConfig.darkPalette.secondary,
+ dataPointColors: colorsConfig.darkPalette.custom.dataPointColors,
+ }
+ : {
+ primary: colorsConfig.lightPalette.primary,
+ secondary: colorsConfig.lightPalette.secondary,
+ dataPointColors: colorsConfig.lightPalette.custom.dataPointColors,
+ }),
},
};
}
diff --git a/libs/shared/data-access/theme/tsconfig.lib.json b/libs/shared/data-access/theme/tsconfig.lib.json
index 1ab8e06a7111b168e84debca80bb4ac82f72f2aa..5286d47e4655c882bd8544a2e154bb8cf419a203 100644
--- a/libs/shared/data-access/theme/tsconfig.lib.json
+++ b/libs/shared/data-access/theme/tsconfig.lib.json
@@ -18,5 +18,11 @@
"**/*.spec.jsx",
"**/*.test.jsx"
],
- "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+ "include": [
+ "**/*.js",
+ "**/*.jsx",
+ "**/*.ts",
+ "**/*.tsx",
+ "../store/src/lib/colorPaletteConfigSlice.ts"
+ ]
}
diff --git a/libs/shared/graph-layout/.babelrc b/libs/shared/graph-layout/.babelrc
index 0cae4a9a81270d6cf3315436f594bf2fbd4fb3e2..ccae900be42788285eb6e1b3a2af4b81f56f14fe 100644
--- a/libs/shared/graph-layout/.babelrc
+++ b/libs/shared/graph-layout/.babelrc
@@ -1,3 +1,12 @@
{
- "presets": ["@nrwl/web/babel"]
+ "presets": [
+ [
+ "@nrwl/react/babel",
+ {
+ "runtime": "automatic",
+ "useBuiltIns": "usage"
+ }
+ ]
+ ],
+ "plugins": []
}
diff --git a/libs/shared/graph-layout/.eslintrc.json b/libs/shared/graph-layout/.eslintrc.json
index 3456be9b9036a42c593c82b050281230e4ca0ae4..50e59482cfd41dfef0c19bd2027efcfb182f6bc2 100644
--- a/libs/shared/graph-layout/.eslintrc.json
+++ b/libs/shared/graph-layout/.eslintrc.json
@@ -1,5 +1,5 @@
{
- "extends": ["../../../.eslintrc.json"],
+ "extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
diff --git a/libs/shared/graph-layout/.gitignore b/libs/shared/graph-layout/.gitignore
index 85b2506b2eb50c9b2742ef26105aed57138baa70..6dd3a48abe9fd65f8a96bc29dc00b1cedab442f8 100644
--- a/libs/shared/graph-layout/.gitignore
+++ b/libs/shared/graph-layout/.gitignore
@@ -1,6 +1,11 @@
+<<<<<<< HEAD
+# Created by https://www.toptal.com/developers/gitignore/api/node
+# Edit at https://www.toptal.com/developers/gitignore?templates=node
+=======
# Created by https://www.toptal.com/developers/gitignore/api/node,visualstudiocode
# Edit at https://www.toptal.com/developers/gitignore?templates=node,visualstudiocode
+>>>>>>> feat/refactor-schema-panel
### Node ###
# Logs
@@ -163,4 +168,4 @@ dist
# Support for Project snippet scope
-# End of https://www.toptal.com/developers/gitignore/api/node,visualstudiocode
\ No newline at end of file
+# End of https://www.toptal.com/developers/gitignore/api/node,visualstudiocode
diff --git a/libs/shared/graph-layout/README.md b/libs/shared/graph-layout/README.md
index b7f37ef4a50a71b71dec5e995c3a5a7e2f5bca34..9925976b0df4b219612f8e6c9c29f0517911ed7c 100644
--- a/libs/shared/graph-layout/README.md
+++ b/libs/shared/graph-layout/README.md
@@ -1,4 +1,4 @@
-# shared-graph-layout
+# shared-graph-layout
This library was generated with [Nx](https://nx.dev).
diff --git a/libs/shared/graph-layout/jest.config.js b/libs/shared/graph-layout/jest.config.js
index 489b3c0e096fc3b31dd28afb183808cd78bc00c8..ae3d05af50147b0e99ce13f1af409e0ca0752c64 100644
--- a/libs/shared/graph-layout/jest.config.js
+++ b/libs/shared/graph-layout/jest.config.js
@@ -1,15 +1,9 @@
module.exports = {
displayName: 'shared-graph-layout',
preset: '../../../jest.preset.js',
- globals: {
- 'ts-jest': {
- tsconfig: '<rootDir>/tsconfig.spec.json',
- },
- },
transform: {
- '^.+\\.[tj]s$': 'ts-jest',
+ '^.+\\.[tj]sx?$': 'babel-jest',
},
- moduleFileExtensions: ['ts', 'js', 'html'],
+ moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../../coverage/libs/shared/graph-layout',
- testEnvironment: 'jsdom',
};
diff --git a/libs/shared/graph-layout/package.json b/libs/shared/graph-layout/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..52928d5e97f1f340d2b653e45eedea657b842575
--- /dev/null
+++ b/libs/shared/graph-layout/package.json
@@ -0,0 +1,22 @@
+{
+ "name": "@graphpolaris/graph-layout",
+ "version": "0.0.1",
+ "license": "MIT",
+ "dependencies": {
+ "cytoscape": "^3.21.0",
+ "cytoscape-cise": "^1.0.0",
+ "cytoscape-cose-bilkent": "^4.1.0",
+ "cytoscape-dagre": "^2.4.0",
+ "cytoscape-elk": "^2.0.2",
+ "cytoscape-fcose": "^2.1.0",
+ "cytoscape-klay": "^3.1.4",
+ "graphology": "^0.24.1",
+ "graphology-layout": "^0.5.0",
+ "graphology-layout-forceatlas2": "^0.8.2",
+ "graphology-layout-noverlap": "^0.4.2",
+ "web-worker": "^1.2.0"
+ },
+ "devDependencies": {
+ "graphology-generators": "^0.11.2"
+ }
+}
diff --git a/libs/shared/graph-layout/project.json b/libs/shared/graph-layout/project.json
index b9148c4942c29963829b2d48cb53310e93260060..2dff301f3f3d902bcd8817ad261a8213e573c2ba 100644
--- a/libs/shared/graph-layout/project.json
+++ b/libs/shared/graph-layout/project.json
@@ -2,12 +2,33 @@
"root": "libs/shared/graph-layout",
"sourceRoot": "libs/shared/graph-layout/src",
"projectType": "library",
+ "tags": [],
"targets": {
+ "build": {
+ "executor": "@nrwl/web:rollup",
+ "outputs": ["{options.outputPath}"],
+ "options": {
+ "outputPath": "dist/libs/shared/graph-layout",
+ "tsConfig": "libs/shared/graph-layout/tsconfig.lib.json",
+ "project": "libs/shared/graph-layout/package.json",
+ "entryFile": "libs/shared/graph-layout/src/index.ts",
+ "external": ["react/jsx-runtime"],
+ "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
+ "compiler": "babel",
+ "assets": [
+ {
+ "glob": "libs/shared/graph-layout/README.md",
+ "input": ".",
+ "output": "."
+ }
+ ]
+ }
+ },
"lint": {
"executor": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
- "lintFilePatterns": ["libs/shared/graph-layout/**/*.ts"]
+ "lintFilePatterns": ["libs/shared/graph-layout/**/*.{ts,tsx,js,jsx}"]
}
},
"test": {
@@ -17,13 +38,6 @@
"jestConfig": "libs/shared/graph-layout/jest.config.js",
"passWithNoTests": true
}
- },
- "version": {
- "executor": "@jscutlery/semver:version",
- "options": {
- "commitMessageFormat": "chore(${projectName}): release version ${version}"
- }
}
- },
- "tags": []
+ }
}
diff --git a/libs/shared/graph-layout/src/factory/cytoscape-layouts.ts b/libs/shared/graph-layout/src/factory/cytoscape-layouts.ts
deleted file mode 100644
index ce7800a501bef380a1ef6e5755e4e286c79ebc8c..0000000000000000000000000000000000000000
--- a/libs/shared/graph-layout/src/factory/cytoscape-layouts.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Layout } from './Layout';
-import { ILayoutFactory, LayoutAlgorithm } from './layout-creator-usecase';
-
-export type CytoscapeProvider = 'Cytoscape';
-
-export type CytoscapeLayoutAlgorithms =
- | `${CytoscapeProvider}_coupe`
- | `${CytoscapeProvider}_i4`;
-
-/**
- * This is a ConcreteCreator
- */
-export class CytoscapeFactory
- implements ILayoutFactory<CytoscapeLayoutAlgorithms>
-{
- createLayout(LayoutAlgorithm: CytoscapeLayoutAlgorithms): Cytoscape | null {
- switch (LayoutAlgorithm) {
- case 'Cytoscape_coupe':
- return new CytoscapeCoupe();
- case 'Cytoscape_i4':
- return new CytoscapeI4();
- default:
- return null;
- }
- }
-}
-
-export abstract class Cytoscape extends Layout<CytoscapeProvider> {
- constructor(public override algorithm: LayoutAlgorithm<CytoscapeProvider>) {
- super('Cytoscape', algorithm);
- }
-
- public specialCytoscapeFunction() {
- console.log('Only Cytoscape Layouts can do this.');
- }
-}
-
-/**
- * This is a ConcreteProduct
- */
-class CytoscapeI4 extends Cytoscape {
- constructor() {
- super('Cytoscape_i4');
- }
-}
-
-/**
- * This is a ConcreteProduct
- */
-class CytoscapeCoupe extends Cytoscape {
- constructor() {
- super('Cytoscape_coupe');
- }
-}
diff --git a/libs/shared/graph-layout/src/factory/layout-creator-usecase.spec.ts b/libs/shared/graph-layout/src/factory/layout-creator-usecase.spec.ts
deleted file mode 100644
index e9a0771d5886cbd995ab0b3852f1e12a7f888916..0000000000000000000000000000000000000000
--- a/libs/shared/graph-layout/src/factory/layout-creator-usecase.spec.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import {
- AllLayoutAlgorithms,
- LayoutFactory,
-} from '@graphpolaris/shared/graph-layout';
-
-import {
- movieSchema,
- northWindSchema,
- simpleSchema,
- twitterSchema,
-} from '@graphpolaris/shared/mock-data';
-import Graph, { MultiGraph } from 'graphology';
-
-import ladder from 'graphology-generators/classic/ladder';
-
-/**
- * @jest-environment jsdom
- */
-describe('LayoutFactory', () => {
- /**
- * @jest-environment jsdom
- */
- it('should work with noverlap from graphology ', () => {
- const graph = new MultiGraph();
-
- // Adding some nodes
- graph.addNode('John', { x: 0, y: 0 });
- graph.addNode('Martha', { x: 0, y: 0 });
-
- // Adding an edge
- graph.addEdge('John', 'Martha');
-
- const layoutFactory = new LayoutFactory();
-
- const layout = layoutFactory.createLayout('Graphology_noverlap');
-
- layout?.layout(graph);
-
- graph.forEachNode((node, attr) => {
- console.log(node, attr);
- });
- });
-
- test('should work with noverlap from graphology on generated graph', () => {
- // Creating a ladder graph
- const graph = ladder(Graph, 10);
-
- graph.forEachNode((node, attr) => {
- graph.setNodeAttribute(node, 'x', 0);
- graph.setNodeAttribute(node, 'y', 0);
- });
-
- const layoutFactory = new LayoutFactory();
-
- const layout = layoutFactory.createLayout('Graphology_noverlap');
- layout?.layout(graph);
-
- graph.forEachNode((node, attr) => {
- console.log(node, attr);
- });
- });
-
- test('should work with random from graphology on generated graph', () => {
- // Creating a ladder graph
- const graph = ladder(Graph, 10);
-
- graph.forEachNode((node, attr) => {
- graph.setNodeAttribute(node, 'x', 0);
- graph.setNodeAttribute(node, 'y', 0);
- });
-
- const layoutFactory = new LayoutFactory();
-
- const layout = layoutFactory.createLayout('Graphology_random');
- layout?.setDimensions(100, 100);
- layout?.layout(graph);
-
- graph.forEachNode((node, attr) => {
- console.log(node, attr);
- });
- });
-
- test('should work with circular from graphology on generated graph', () => {
- // Creating a ladder graph
- const graph = ladder(Graph, 100);
-
- graph.forEachNode((node, attr) => {
- graph.setNodeAttribute(node, 'x', 0);
- graph.setNodeAttribute(node, 'y', 0);
- });
-
- const layoutFactory = new LayoutFactory();
-
- const layout = layoutFactory.createLayout('Graphology_circular');
- layout?.setDimensions(100, 100);
- layout?.layout(graph);
-
- graph.forEachNode((node, attr) => {
- console.log(node, attr);
- });
- });
-
- test('should work with circular from graphology on generated graph', () => {
- // Creating a ladder graph
- const graph = ladder(Graph, 100);
-
- graph.forEachNode((node, attr) => {
- graph.setNodeAttribute(node, 'x', 0);
- graph.setNodeAttribute(node, 'y', 0);
- });
-
- const layoutFactory = new LayoutFactory();
- const layout = layoutFactory.createLayout('Graphology_forceAtlas2');
- layout?.setDimensions(100, 100);
- layout?.layout(graph);
-
- graph.forEachNode((node, attr) => {
- console.log(node, attr);
- });
- });
-
- test('should add x,y for graphology layouts if not existing', () => {
- // console.log(Object.keys(AllLayoutAlgorithms))
-
- const graph = ladder(Graph, 100);
-
- graph.forEachNode((node, attr) => {
- expect(graph.getNodeAttribute(node, 'x')).toBeUndefined();
- expect(graph.getNodeAttribute(node, 'y')).toBeUndefined();
- });
-
- const layoutFactory = new LayoutFactory();
- const layout = layoutFactory.createLayout('Graphology_forceAtlas2');
- layout?.setDimensions(100, 100);
- layout?.layout(graph);
-
- graph.forEachNode((node, attr) => {
- expect(graph.getNodeAttribute(node, 'x')).toBeDefined();
- expect(graph.getNodeAttribute(node, 'y')).toBeDefined();
- });
- });
-});
diff --git a/libs/shared/graph-layout/src/factory/test.ts b/libs/shared/graph-layout/src/factory/test.ts
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/libs/shared/graph-layout/src/index.ts b/libs/shared/graph-layout/src/index.ts
index 7bdb94a4e0523f46d74eca579111785cd92d7a41..dda465c87a51929594b4caa5f6a8a721757742a0 100644
--- a/libs/shared/graph-layout/src/index.ts
+++ b/libs/shared/graph-layout/src/index.ts
@@ -1,6 +1,4 @@
-// export * from './factory/layout-creator-usecase';
-
-export {
- AllLayoutAlgorithms,
- LayoutFactory,
-} from './factory/layout-creator-usecase';
+export * from './lib/layout';
+export * from './lib/graphology-layouts';
+export * from './lib/cytoscape-layouts';
+export * from './lib/layout-creator-usecase';
diff --git a/libs/shared/graph-layout/src/lib/cytoscape-layouts.ts b/libs/shared/graph-layout/src/lib/cytoscape-layouts.ts
new file mode 100644
index 0000000000000000000000000000000000000000..9dcb62fdcb6945748189aa05cd47dddbbbe69581
--- /dev/null
+++ b/libs/shared/graph-layout/src/lib/cytoscape-layouts.ts
@@ -0,0 +1,574 @@
+import cytoscape from 'cytoscape';
+// @ts-ignore
+import cise from 'cytoscape-cise';
+// @ts-ignore
+import coseBilkent from 'cytoscape-cose-bilkent';
+// @ts-ignore
+import dagre from 'cytoscape-dagre';
+// @ts-ignore
+import elk from 'cytoscape-elk';
+// @ts-ignore
+import fcose from 'cytoscape-fcose';
+// @ts-ignore
+import klay from 'cytoscape-klay';
+cytoscape.use(elk);
+
+import Graph from 'graphology';
+import { Attributes } from 'graphology-types';
+import { Layout } from './layout';
+import { ILayoutFactory, LayoutAlgorithm } from './layout-creator-usecase';
+
+cytoscape.use(klay);
+
+export type CytoscapeProvider = 'Cytoscape';
+
+export type CytoscapeLayoutAlgorithms =
+ | `${CytoscapeProvider}_klay`
+ | `${CytoscapeProvider}_dagre`
+ | `${CytoscapeProvider}_elk`
+ | `${CytoscapeProvider}_fcose`
+ | `${CytoscapeProvider}_cose-bilkent`
+ | `${CytoscapeProvider}_cise`;
+
+type CytoNode = {
+ data: {
+ id: string;
+ type: string;
+ source?: string;
+ target?: string;
+ position?: {
+ x: number;
+ y: number;
+ };
+ };
+};
+/**
+ * This is the Cytoscape Factory
+ */
+export class CytoscapeFactory
+ implements ILayoutFactory<CytoscapeLayoutAlgorithms>
+{
+ createLayout(LayoutAlgorithm: CytoscapeLayoutAlgorithms): Cytoscape | null {
+ switch (LayoutAlgorithm) {
+ case 'Cytoscape_klay':
+ //https://github.com/cytoscape/cytoscape.js-klay
+ return new CytoscapeKlay();
+ case 'Cytoscape_dagre':
+ //https://github.com/cytoscape/cytoscape.js-dagre
+ return new CytoscapeDagre();
+ case 'Cytoscape_elk':
+ //https://github.com/cytoscape/cytoscape.js-elk
+ return new CytoscapeElk();
+
+ case 'Cytoscape_fcose':
+ //https://github.com/iVis-at-Bilkent/cytoscape.js-fcose
+ return new CytoscapeFCose();
+
+ case 'Cytoscape_cose-bilkent':
+ //https://github.com/cytoscape/cytoscape.js-cose-bilkent
+ return new CytoscapeCoseBilkent();
+
+ case 'Cytoscape_cise':
+ //https://github.com/iVis-at-Bilkent/cytoscape.js-cise
+ return new CytoscapeCise();
+ default:
+ return null;
+ }
+ }
+}
+
+export abstract class Cytoscape extends Layout<CytoscapeProvider> {
+ constructor(public override algorithm: LayoutAlgorithm<CytoscapeProvider>) {
+ super('Cytoscape', algorithm);
+ }
+
+ // public specialCytoscapeFunction() {
+ // console.log('Only Cytoscape Layouts can do this.');
+ // }
+
+ // Takes the schema as input and creates a list of nodes and edges in a format that the layouting algorithm can use.
+ public convertToCytoscapeModel(graph: Graph): CytoNode[] {
+ const cytonodes: CytoNode[] = [];
+
+ graph.forEachNode((node) => {
+ cytonodes.push({
+ data: { id: node, type: 'node' },
+ });
+ });
+
+ graph.forEachEdge((edge, _attributes, source, target) => {
+ cytonodes.push({
+ data: { id: edge, type: 'edge', source: source, target: target },
+ });
+ });
+
+ return cytonodes;
+ }
+}
+
+/**
+ * This is a ConcreteProduct
+ */
+class CytoscapeKlay extends Cytoscape {
+ constructor() {
+ super('Cytoscape_klay');
+ }
+
+ public override layout(
+ graph: Graph<Attributes, Attributes, Attributes>,
+ verbose?: boolean
+ ): void {
+ const cytonodes: CytoNode[] = this.convertToCytoscapeModel(graph);
+
+ cytoscape.use(klay);
+
+ const cy = cytoscape({
+ elements: cytonodes,
+ // style: [
+ // {
+ // selector: 'node',
+ // style: {
+ // 'shape': 'round-rectangle',
+ // 'background-color': '#fff',
+ // 'label': 'data(id)',
+ // 'text-valign': 'center',
+ // 'color': '#333333',
+ // 'border-width': 1,
+ // 'border-color': '#2E1A61',
+ // 'width': (node: any) => {
+ // const ctx = document.createElement('canvas').getContext('2d');
+ // const fStyle = node.pstyle('font-style').strValue;
+ // const size = node.pstyle('font-size').pfValue + 'px';
+ // const family = node.pstyle('font-family').strValue;
+ // const weight = node.pstyle('font-weight').strValue;
+
+ // ctx!.font = fStyle + ' ' + weight + ' ' + size + ' ' + family;
+ // return ctx!.measureText(node.data('name'));
+ // },
+ // 'font-size': '10px',
+ // 'padding-left': '5px',
+ // 'padding-right': '5px',
+ // 'padding-top': '5px',
+ // 'padding-bottom': '5px',
+
+ // }
+ // }
+ // ]
+ });
+
+ const layout = cy.layout({
+ name: 'klay',
+
+ // Constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h }
+ // boundingBox: undefined,
+
+ ready: function () {
+ console.log('Layout.ready');
+ }, // on layoutready
+ stop: function () {
+ console.log('Layout.stop');
+ }, // on layoutstop
+ });
+ layout.run();
+
+ const nodes = cy.nodes();
+ nodes.forEach((node) => {
+ if (verbose) {
+ console.log(node.id(), node.position());
+ }
+ // console.log(
+ // node.id(),
+ // node.position(),
+ // node.boundingBox({
+ // includeLabels: true,
+ // }),
+ // node.renderedBoundingbox({
+ // includeLabels: true,
+ // })
+ // );
+
+ graph.setNodeAttribute(node.id(), 'x', node.position().x);
+ graph.setNodeAttribute(node.id(), 'y', node.position().y);
+ });
+
+ // console.log(nodes);
+
+ // var options = {
+ // nodeDimensionsIncludeLabels: false, // Boolean which changes whether label dimensions are included when calculating node dimensions
+ // fit: true, // Whether to fit
+ // padding: 20, // Padding on fit
+ // animate: false, // Whether to transition the node positions
+ // animateFilter: function( node, i ){ return true; }, // Whether to animate specific nodes when animation is on; non-animated nodes immediately go to their final positions
+ // animationDuration: 500, // Duration of animation in ms if enabled
+ // animationEasing: undefined, // Easing of animation if enabled
+ // transform: function( node, pos ){ return pos; }, // A function that applies a transform to the final node position
+ // ready: undefined, // Callback on layoutready
+ // stop: undefined, // Callback on layoutstop
+ // klay: {
+ // // Following descriptions taken from http://layout.rtsys.informatik.uni-kiel.de:9444/Providedlayout.html?algorithm=de.cau.cs.kieler.klay.layered
+ // addUnnecessaryBendpoints: false, // Adds bend points even if an edge does not change direction.
+ // aspectRatio: 1.6, // The aimed aspect ratio of the drawing, that is the quotient of width by height
+ // borderSpacing: 20, // Minimal amount of space to be left to the border
+ // compactComponents: false, // Tries to further compact components (disconnected sub-graphs).
+ // crossingMinimization: 'LAYER_SWEEP', // Strategy for crossing minimization.
+ // /* LAYER_SWEEP The layer sweep algorithm iterates multiple times over the layers, trying to find node orderings that minimize the number of crossings. The algorithm uses randomization to increase the odds of finding a good result. To improve its results, consider increasing the Thoroughness option, which influences the number of iterations done. The Randomization seed also influences results.
+ // INTERACTIVE Orders the nodes of each layer by comparing their positions before the layout algorithm was started. The idea is that the relative order of nodes as it was before layout was applied is not changed. This of course requires valid positions for all nodes to have been set on the input graph before calling the layout algorithm. The interactive layer sweep algorithm uses the Interactive Reference Point option to determine which reference point of nodes are used to compare positions. */
+ // cycleBreaking: 'GREEDY', // Strategy for cycle breaking. Cycle breaking looks for cycles in the graph and determines which edges to reverse to break the cycles. Reversed edges will end up pointing to the opposite direction of regular edges (that is, reversed edges will point left if edges usually point right).
+ // /* GREEDY This algorithm reverses edges greedily. The algorithm tries to avoid edges that have the Priority property set.
+ // INTERACTIVE The interactive algorithm tries to reverse edges that already pointed leftwards in the input graph. This requires node and port coordinates to have been set to sensible values.*/
+ // direction: 'UNDEFINED', // Overall direction of edges: horizontal (right / left) or vertical (down / up)
+ // /* UNDEFINED, RIGHT, LEFT, DOWN, UP */
+ // edgeRouting: 'ORTHOGONAL', // Defines how edges are routed (POLYLINE, ORTHOGONAL, SPLINES)
+ // edgeSpacingFactor: 0.5, // Factor by which the object spacing is multiplied to arrive at the minimal spacing between edges.
+ // feedbackEdges: false, // Whether feedback edges should be highlighted by routing around the nodes.
+ // fixedAlignment: 'NONE', // Tells the BK node placer to use a certain alignment instead of taking the optimal result. This option should usually be left alone.
+ // /* NONE Chooses the smallest layout from the four possible candidates.
+ // LEFTUP Chooses the left-up candidate from the four possible candidates.
+ // RIGHTUP Chooses the right-up candidate from the four possible candidates.
+ // LEFTDOWN Chooses the left-down candidate from the four possible candidates.
+ // RIGHTDOWN Chooses the right-down candidate from the four possible candidates.
+ // BALANCED Creates a balanced layout from the four possible candidates. */
+ // inLayerSpacingFactor: 1.0, // Factor by which the usual spacing is multiplied to determine the in-layer spacing between objects.
+ // layoutHierarchy: false, // Whether the selected layouter should consider the full hierarchy
+ // linearSegmentsDeflectionDampening: 0.3, // Dampens the movement of nodes to keep the diagram from getting too large.
+ // mergeEdges: false, // Edges that have no ports are merged so they touch the connected nodes at the same points.
+ // mergeHierarchyCrossingEdges: true, // If hierarchical layout is active, hierarchy-crossing edges use as few hierarchical ports as possible.
+ // nodeLayering:'NETWORK_SIMPLEX', // Strategy for node layering.
+ // /* NETWORK_SIMPLEX This algorithm tries to minimize the length of edges. This is the most computationally intensive algorithm. The number of iterations after which it aborts if it hasn't found a result yet can be set with the Maximal Iterations option.
+ // LONGEST_PATH A very simple algorithm that distributes nodes along their longest path to a sink node.
+ // INTERACTIVE Distributes the nodes into layers by comparing their positions before the layout algorithm was started. The idea is that the relative horizontal order of nodes as it was before layout was applied is not changed. This of course requires valid positions for all nodes to have been set on the input graph before calling the layout algorithm. The interactive node layering algorithm uses the Interactive Reference Point option to determine which reference point of nodes are used to compare positions. */
+ // nodePlacement:'BRANDES_KOEPF', // Strategy for Node Placement
+ // /* BRANDES_KOEPF Minimizes the number of edge bends at the expense of diagram size: diagrams drawn with this algorithm are usually higher than diagrams drawn with other algorithms.
+ // LINEAR_SEGMENTS Computes a balanced placement.
+ // INTERACTIVE Tries to keep the preset y coordinates of nodes from the original layout. For dummy nodes, a guess is made to infer their coordinates. Requires the other interactive phase implementations to have run as well.
+ // SIMPLE Minimizes the area at the expense of... well, pretty much everything else. */
+ // randomizationSeed: 1, // Seed used for pseudo-random number generators to control the layout algorithm; 0 means a new seed is generated
+ // routeSelfLoopInside: false, // Whether a self-loop is routed around or inside its node.
+ // separateConnectedComponents: true, // Whether each connected component should be processed separately
+ // spacing: 20, // Overall setting for the minimal amount of space to be left between objects
+ // thoroughness: 7 // How much effort should be spent to produce a nice layout..
+ // },
+ // priority: function( edge ){ return null; }, // Edges with a non-nil value are skipped when greedy edge cycle breaking is enabled
+ // };
+ // cy.layout( options ).run();
+ }
+}
+
+function getWidth(node: any) {
+ /**
+ Calculate the width of a node given its text label `node.data('lbl')`
+ */
+
+ // Create element with attributes needed to calculate text size
+ const ctx = document.createElement('canvas').getContext('2d');
+ const fStyle = node.pstyle('font-style').strValue;
+ const size = node.pstyle('font-size').pfValue + 'px';
+ const family = node.pstyle('font-family').strValue;
+ const weight = node.pstyle('font-weight').strValue;
+ ctx!.font = fStyle + ' ' + weight + ' ' + size + ' ' + family;
+
+ // For multiple lines, evaluate the width of the largest line
+ const lines = node.data('lbl').split('\n');
+ const lengths = lines.map((a: any) => a.length);
+ const max_line = lengths.indexOf(Math.max(...lengths));
+
+ // User-defined padding
+ const padding = 30;
+
+ return ctx!.measureText(lines[max_line]).width + padding;
+}
+
+/**
+ * This is a ConcreteProduct
+ */
+class CytoscapeElk extends Cytoscape {
+ constructor() {
+ super('Cytoscape_elk');
+ }
+
+ public override layout(
+ graph: Graph<Attributes, Attributes, Attributes>,
+ verbose?: boolean
+ ): void {
+ const cytonodes: CytoNode[] = this.convertToCytoscapeModel(graph);
+
+ const cy = cytoscape({
+ elements: cytonodes,
+ });
+
+ // const options = {
+ // name: 'elk',
+ // nodeDimensionsIncludeLabels: false, // Boolean which changes whether label dimensions are included when calculating node dimensions
+ // fit: true, // Whether to fit
+ // padding: 20, // Padding on fit
+ // animate: false, // Whether to transition the node positions
+ // animateFilter: function (node: any, i: number) {
+ // return true;
+ // }, // Whether to animate specific nodes when animation is on; non-animated nodes immediately go to their final positions
+ // animationDuration: 500, // Duration of animation in ms if enabled
+ // animationEasing: undefined, // Easing of animation if enabled
+ // transform: function (node: any, pos: Position) {
+ // return pos;
+ // }, // A function that applies a transform to the final node position
+ // ready: undefined, // Callback on layoutready
+ // stop: undefined, // Callback on layoutstop
+ // klay: {
+ // // Following descriptions taken from http://layout.rtsys.informatik.uni-kiel.de:9444/Providedlayout.html?algorithm=de.cau.cs.kieler.klay.layered
+ // addUnnecessaryBendpoints: false, // Adds bend points even if an edge does not change direction.
+ // aspectRatio: 1.6, // The aimed aspect ratio of the drawing, that is the quotient of width by height
+ // borderSpacing: 20, // Minimal amount of space to be left to the border
+ // compactComponents: false, // Tries to further compact components (disconnected sub-graphs).
+ // crossingMinimization: 'LAYER_SWEEP', // Strategy for crossing minimization.
+ // /* LAYER_SWEEP The layer sweep algorithm iterates multiple times over the layers, trying to find node orderings that minimize the number of crossings. The algorithm uses randomization to increase the odds of finding a good result. To improve its results, consider increasing the Thoroughness option, which influences the number of iterations done. The Randomization seed also influences results.
+ // INTERACTIVE Orders the nodes of each layer by comparing their positions before the layout algorithm was started. The idea is that the relative order of nodes as it was before layout was applied is not changed. This of course requires valid positions for all nodes to have been set on the input graph before calling the layout algorithm. The interactive layer sweep algorithm uses the Interactive Reference Point option to determine which reference point of nodes are used to compare positions. */
+ // cycleBreaking: 'GREEDY', // Strategy for cycle breaking. Cycle breaking looks for cycles in the graph and determines which edges to reverse to break the cycles. Reversed edges will end up pointing to the opposite direction of regular edges (that is, reversed edges will point left if edges usually point right).
+ // /* GREEDY This algorithm reverses edges greedily. The algorithm tries to avoid edges that have the Priority property set.
+ // INTERACTIVE The interactive algorithm tries to reverse edges that already pointed leftwards in the input graph. This requires node and port coordinates to have been set to sensible values.*/
+ // direction: 'UNDEFINED', // Overall direction of edges: horizontal (right / left) or vertical (down / up)
+ // /* UNDEFINED, RIGHT, LEFT, DOWN, UP */
+ // edgeRouting: 'ORTHOGONAL', // Defines how edges are routed (POLYLINE, ORTHOGONAL, SPLINES)
+ // edgeSpacingFactor: 0.5, // Factor by which the object spacing is multiplied to arrive at the minimal spacing between edges.
+ // feedbackEdges: false, // Whether feedback edges should be highlighted by routing around the nodes.
+ // fixedAlignment: 'NONE', // Tells the BK node placer to use a certain alignment instead of taking the optimal result. This option should usually be left alone.
+ // /* NONE Chooses the smallest layout from the four possible candidates.
+ // LEFTUP Chooses the left-up candidate from the four possible candidates.
+ // RIGHTUP Chooses the right-up candidate from the four possible candidates.
+ // LEFTDOWN Chooses the left-down candidate from the four possible candidates.
+ // RIGHTDOWN Chooses the right-down candidate from the four possible candidates.
+ // BALANCED Creates a balanced layout from the four possible candidates. */
+ // inLayerSpacingFactor: 1.0, // Factor by which the usual spacing is multiplied to determine the in-layer spacing between objects.
+ // layoutHierarchy: false, // Whether the selected layouter should consider the full hierarchy
+ // linearSegmentsDeflectionDampening: 0.3, // Dampens the movement of nodes to keep the diagram from getting too large.
+ // mergeEdges: false, // Edges that have no ports are merged so they touch the connected nodes at the same points.
+ // mergeHierarchyCrossingEdges: true, // If hierarchical layout is active, hierarchy-crossing edges use as few hierarchical ports as possible.
+ // nodeLayering: 'NETWORK_SIMPLEX', // Strategy for node layering.
+ // /* NETWORK_SIMPLEX This algorithm tries to minimize the length of edges. This is the most computationally intensive algorithm. The number of iterations after which it aborts if it hasn't found a result yet can be set with the Maximal Iterations option.
+ // LONGEST_PATH A very simple algorithm that distributes nodes along their longest path to a sink node.
+ // INTERACTIVE Distributes the nodes into layers by comparing their positions before the layout algorithm was started. The idea is that the relative horizontal order of nodes as it was before layout was applied is not changed. This of course requires valid positions for all nodes to have been set on the input graph before calling the layout algorithm. The interactive node layering algorithm uses the Interactive Reference Point option to determine which reference point of nodes are used to compare positions. */
+ // nodePlacement: 'BRANDES_KOEPF', // Strategy for Node Placement
+ // /* BRANDES_KOEPF Minimizes the number of edge bends at the expense of diagram size: diagrams drawn with this algorithm are usually higher than diagrams drawn with other algorithms.
+ // LINEAR_SEGMENTS Computes a balanced placement.
+ // INTERACTIVE Tries to keep the preset y coordinates of nodes from the original layout. For dummy nodes, a guess is made to infer their coordinates. Requires the other interactive phase implementations to have run as well.
+ // SIMPLE Minimizes the area at the expense of... well, pretty much everything else. */
+ // randomizationSeed: 1, // Seed used for pseudo-random number generators to control the layout algorithm; 0 means a new seed is generated
+ // routeSelfLoopInside: false, // Whether a self-loop is routed around or inside its node.
+ // separateConnectedComponents: true, // Whether each connected component should be processed separately
+ // spacing: 20, // Overall setting for the minimal amount of space to be left between objects
+ // thoroughness: 7, // How much effort should be spent to produce a nice layout..
+ // },
+ // priority: function (edge: any) {
+ // return null;
+ // }, // Edges with a non-nil value are skipped when greedy edge cycle breaking is enabled
+ // };
+
+ const layout = cy.layout({
+ name: 'elk',
+ fit: true,
+ ranker: 'longest-path',
+ animate: true,
+ animationDuration: 300,
+ animationEasing: 'ease-in-out-cubic',
+ elk: {
+ zoomToFit: true,
+ algorithm: 'mrtree',
+ separateConnectedComponents: false,
+ },
+ ready: function () {
+ console.log('Layout.ready');
+ }, // on layoutready
+ stop: function () {
+ console.log('Layout.stop');
+ }, // on layoutstop
+ } as any);
+ layout.run();
+
+ const nodes = cy.nodes();
+ nodes.forEach((node) => {
+ if (verbose) {
+ console.log(node.id(), node.position());
+ }
+ // console.log(
+ // node.id(),
+ // node.position()
+ // // node.boundingBox({
+ // // includeLabels: true,
+ // // }),
+ // // node.renderedBoundingbox({
+ // // includeLabels: true,
+ // // })
+ // );
+
+ graph.setNodeAttribute(node.id(), 'x', node.position().x);
+ graph.setNodeAttribute(node.id(), 'y', node.position().y);
+ });
+ }
+}
+
+/**
+ * This is a ConcreteProduct
+ */
+class CytoscapeDagre extends Cytoscape {
+ constructor() {
+ super('Cytoscape_dagre');
+ cytoscape.use(dagre);
+ }
+
+ public override layout(
+ graph: Graph<Attributes, Attributes, Attributes>,
+ verbose?: boolean
+ ): void {
+ const cytonodes: CytoNode[] = this.convertToCytoscapeModel(graph);
+
+ const cy = cytoscape({
+ elements: cytonodes,
+ });
+
+ const layout = cy.layout({
+ name: 'dagre',
+ ready: function () {
+ console.log('Layout.ready');
+ }, // on layoutready
+ stop: function () {
+ console.log('Layout.stop');
+ }, // on layoutstop
+ } as any);
+ layout.run();
+
+ const nodes = cy.nodes();
+ nodes.forEach((node) => {
+ if (verbose) {
+ console.log(node.id(), node.position());
+ }
+ graph.setNodeAttribute(node.id(), 'x', node.position().x);
+ graph.setNodeAttribute(node.id(), 'y', node.position().y);
+ });
+ }
+}
+
+/**
+ * This is a ConcreteProduct
+ */
+class CytoscapeFCose extends Cytoscape {
+ constructor() {
+ super('Cytoscape_fcose');
+ cytoscape.use(fcose);
+ }
+
+ public override layout(
+ graph: Graph<Attributes, Attributes, Attributes>,
+ verbose?: boolean
+ ): void {
+ const cytonodes: CytoNode[] = this.convertToCytoscapeModel(graph);
+
+ const cy = cytoscape({
+ elements: cytonodes,
+ });
+
+ const layout = cy.layout({
+ name: 'fcose',
+ animate: false,
+ ready: function () {
+ console.log('Layout.ready');
+ }, // on layoutready
+ stop: function () {
+ console.log('Layout.stop');
+ }, // on layoutstop
+ } as any);
+ layout.run();
+
+ const nodes = cy.nodes();
+ nodes.forEach((node) => {
+ if (verbose) {
+ console.log(node.id(), node.position());
+ }
+
+ graph.setNodeAttribute(node.id(), 'x', node.position().x);
+ graph.setNodeAttribute(node.id(), 'y', node.position().y);
+ });
+ }
+}
+
+/**
+ * This is a ConcreteProduct
+ */
+class CytoscapeCoseBilkent extends Cytoscape {
+ constructor() {
+ super('Cytoscape_cose-bilkent');
+ cytoscape.use(coseBilkent);
+ }
+
+ public override layout(
+ graph: Graph<Attributes, Attributes, Attributes>,
+ verbose?: boolean
+ ): void {
+ const cytonodes: CytoNode[] = this.convertToCytoscapeModel(graph);
+
+ const cy = cytoscape({
+ elements: cytonodes,
+ });
+
+ const layout = cy.layout({
+ name: 'cose-bilkent',
+ animate: false,
+ ready: function () {
+ console.log('Layout.ready');
+ }, // on layoutready
+ stop: function () {
+ console.log('Layout.stop');
+ }, // on layoutstop
+ } as any);
+ layout.run();
+
+ const nodes = cy.nodes();
+ nodes.forEach((node) => {
+ if (verbose) {
+ console.log(node.id(), node.position());
+ }
+
+ graph.setNodeAttribute(node.id(), 'x', node.position().x);
+ graph.setNodeAttribute(node.id(), 'y', node.position().y);
+ });
+ }
+}
+
+/**
+ * This is a ConcreteProduct
+ */
+class CytoscapeCise extends Cytoscape {
+ constructor() {
+ super('Cytoscape_cise');
+ cytoscape.use(cise);
+ }
+
+ public override layout(
+ graph: Graph<Attributes, Attributes, Attributes>,
+ verbose?: boolean
+ ): void {
+ const cytonodes: CytoNode[] = this.convertToCytoscapeModel(graph);
+
+ const cy = cytoscape({
+ elements: cytonodes,
+ });
+
+ const layout = cy.layout({
+ name: 'cise',
+ ready: function () {
+ console.log('Layout.ready');
+ }, // on layoutready
+ stop: function () {
+ console.log('Layout.stop');
+ }, // on layoutstop
+ } as any);
+ layout.run();
+
+ const nodes = cy.nodes();
+ nodes.forEach((node) => {
+ if (verbose) {
+ console.log(node.id(), node.position());
+ }
+
+ graph.setNodeAttribute(node.id(), 'x', node.position().x);
+ graph.setNodeAttribute(node.id(), 'y', node.position().y);
+ });
+ }
+}
diff --git a/libs/shared/graph-layout/src/factory/graphology-layouts.ts b/libs/shared/graph-layout/src/lib/graphology-layouts.ts
similarity index 92%
rename from libs/shared/graph-layout/src/factory/graphology-layouts.ts
rename to libs/shared/graph-layout/src/lib/graphology-layouts.ts
index ce9976091afa4b1fff3db1901bce71655e8c7fd4..74585977cfb0878c290b300f407d3598c5a2f840 100644
--- a/libs/shared/graph-layout/src/factory/graphology-layouts.ts
+++ b/libs/shared/graph-layout/src/lib/graphology-layouts.ts
@@ -5,9 +5,8 @@ import forceAtlas2, {
} from 'graphology-layout-forceatlas2';
import noverlap from 'graphology-layout-noverlap';
import { RandomLayoutOptions } from 'graphology-layout/random';
-import { NoverlapSettings } from 'graphology-library/layout-noverlap';
import { Attributes } from 'graphology-types';
-import { Layout } from './Layout';
+import { Layout } from './layout';
import { ILayoutFactory, LayoutAlgorithm } from './layout-creator-usecase';
export type GraphologyProvider = 'Graphology';
@@ -19,7 +18,8 @@ export type GraphologyLayoutAlgorithms =
| `${GraphologyProvider}_forceAtlas2`;
/**
- * This is a ConcreteCreator
+ * This is the Graphology Constructor for the main layouts available at
+ * https://graphology.github.io/
*/
export class GraphologyFactory
implements ILayoutFactory<GraphologyLayoutAlgorithms>
@@ -41,8 +41,8 @@ export class GraphologyFactory
}
export abstract class Graphology extends Layout<GraphologyProvider> {
- height: number = 100;
- width: number = 100;
+ height = 100;
+ width = 100;
constructor(public override algorithm: LayoutAlgorithm<GraphologyProvider>) {
super('Graphology', algorithm);
this.setDimensions(100, 200);
@@ -100,7 +100,7 @@ export class GraphologyRandom extends Graphology {
}
}
-const DEFAULT_NOVERLAP_SETTINGS: NoverlapSettings = {
+const DEFAULT_NOVERLAP_SETTINGS = {
margin: 40,
ratio: 40,
// gridSize: 50,
@@ -123,18 +123,19 @@ export class GraphologyNoverlap extends Graphology {
public override layout(
graph: Graph<Attributes, Attributes, Attributes>
): void {
- // // // To directly assign the positions to the nodes:
+ // To directly assign the positions to the nodes:
noverlap.assign(graph, {
- maxIterations: 5000,
+ maxIterations: 10000,
settings: DEFAULT_NOVERLAP_SETTINGS,
});
}
}
const DEFAULT_FORCEATLAS2_SETTINGS: ForceAtlas2Settings = {
- gravity: 10,
+ gravity: 1,
adjustSizes: true,
linLogMode: true,
+ strongGravityMode: true,
// adjustSizes ?boolean false: should the node’s sizes be taken into account?
// barnesHutOptimize ?boolean false: whether to use the Barnes-Hut approximation to compute repulsion in O(n*log(n)) rather than default O(n^2), n being the number of nodes.
@@ -159,10 +160,8 @@ export class GraphologyForceAtlas2 extends Graphology {
public override layout(
graph: Graph<Attributes, Attributes, Attributes>
): void {
- // To directly assign the positions to the nodes:
-
forceAtlas2.assign(graph, {
- iterations: 500000,
+ iterations: 500,
settings: DEFAULT_FORCEATLAS2_SETTINGS,
});
}
diff --git a/libs/shared/graph-layout/src/lib/graphology.spec.ts b/libs/shared/graph-layout/src/lib/graphology.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..1b790b6fb3cd8f27ac13c2377b5644106b71c397
--- /dev/null
+++ b/libs/shared/graph-layout/src/lib/graphology.spec.ts
@@ -0,0 +1,22 @@
+import Graph, { UndirectedGraph } from 'graphology';
+import { MultiGraph } from 'graphology';
+import connectedCaveman from 'graphology-generators/community/connected-caveman';
+import ladder from 'graphology-generators/classic/ladder';
+
+describe('graphology connection', () => {
+ it('should create a graphology caveman', () => {
+ // Creating a connected caveman graph
+ const graph = connectedCaveman(Graph, 6, 8);
+ });
+
+
+ it('should create a graphology ladder', () => {
+ // Creating a connected caveman graph
+ const graph = ladder(Graph, 6, 8);
+ });
+
+ it('should create a graphology graph', () => {
+ const graph = new MultiGraph();
+ expect(graph);
+ });
+});
diff --git a/libs/shared/graph-layout/src/lib/layout-creator-usecase.spec.ts b/libs/shared/graph-layout/src/lib/layout-creator-usecase.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..2e86bb3556715997545768ad8d2822a5a0f9e45d
--- /dev/null
+++ b/libs/shared/graph-layout/src/lib/layout-creator-usecase.spec.ts
@@ -0,0 +1,387 @@
+// import {
+// movieSchemaRaw,
+// northwindSchemaRaw,
+// simpleSchemaRaw,
+// twitterSchemaRaw,
+// } from '@graphpolaris/shared/mock-data';
+import Graph, { MultiGraph } from 'graphology';
+
+import connectedCaveman from 'graphology-generators/community/connected-caveman';
+import ladder from 'graphology-generators/classic/ladder';
+import { LayoutFactory } from './layout-creator-usecase';
+
+const TIMEOUT = 10;
+
+/**
+ * @jest-environment jsdom
+ */
+describe('LayoutFactory Graphology Libries', () => {
+ /**
+ * @jest-environment jsdom
+ */
+ it(
+ 'should work with noverlap from graphology ',
+ () => {
+ const graph = new MultiGraph();
+
+ // Adding some nodes
+ // graph.addNode('John', { x: 0, y: 0, width: 200, height: 200 });
+ // graph.addNode('Martha', { x: 0, y: 0 });
+ graph.addNode('John');
+ graph.addNode('Martha');
+
+ // Adding an edge
+ graph.addEdge('John', 'Martha');
+
+ const layoutFactory = new LayoutFactory();
+ const layoutAlgorithm = layoutFactory.createLayout('Graphology_noverlap');
+ layoutAlgorithm?.layout(graph);
+
+ // const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ expect(graph.getNodeAttribute(node, 'x')).toBeDefined();
+ expect(graph.getNodeAttribute(node, 'y')).toBeDefined();
+
+ // const pos = '' + attr['x'] + '' + attr['y'];
+ // expect(positionMap.has(pos)).toBeFalsy();
+ // positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+
+ test(
+ 'should work with noverlap from graphology on generated graph',
+ () => {
+ // Creating a ladder graph
+ const graph = ladder(Graph, 10);
+
+ graph.forEachNode((node, attr) => {
+ graph.setNodeAttribute(node, 'x', 0);
+ graph.setNodeAttribute(node, 'y', 0);
+ });
+
+ const layoutFactory = new LayoutFactory();
+
+ const layout = layoutFactory.createLayout('Graphology_noverlap');
+ layout?.layout(graph);
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ const pos = '' + attr['x'] + '' + attr['y'];
+
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+
+ test(
+ 'should work with random from graphology on generated graph',
+ () => {
+ // Creating a ladder graph
+ const graph = ladder(Graph, 10);
+
+ graph.forEachNode((node, attr) => {
+ graph.setNodeAttribute(node, 'x', 0);
+ graph.setNodeAttribute(node, 'y', 0);
+ });
+
+ const layoutFactory = new LayoutFactory();
+
+ const layout = layoutFactory.createLayout('Graphology_random');
+ layout?.setDimensions(100, 100);
+ layout?.layout(graph);
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ const pos = '' + attr['x'] + '' + attr['y'];
+
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+
+ test(
+ 'should work with circular from graphology on generated graph',
+ () => {
+ // Creating a ladder graph
+ const graph = ladder(Graph, 100);
+
+ graph.forEachNode((node) => {
+ graph.setNodeAttribute(node, 'x', 0);
+ graph.setNodeAttribute(node, 'y', 0);
+ });
+
+ const layoutFactory = new LayoutFactory();
+
+ const layout = layoutFactory.createLayout('Graphology_circular');
+ layout?.setDimensions(100, 100);
+ layout?.layout(graph);
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ const pos = '' + attr['x'] + '' + attr['y'];
+
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+
+ test(
+ 'should work with Graphology_forceAtlas2 from graphology on generated graph',
+ () => {
+ // console.log(Object.keys(AllLayoutAlgorithms))
+
+ const graph = connectedCaveman(Graph, 6, 8);
+
+ graph.forEachNode((node, attr) => {
+ expect(graph.getNodeAttribute(node, 'x')).toBeUndefined();
+ expect(graph.getNodeAttribute(node, 'y')).toBeUndefined();
+ });
+
+ // console.log('before');
+ const layoutFactory = new LayoutFactory();
+ const layout = layoutFactory.createLayout('Graphology_forceAtlas2');
+ layout?.setDimensions(100, 100);
+ layout?.layout(graph);
+
+ // console.log('after');
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ expect(graph.getNodeAttribute(node, 'x')).toBeDefined();
+ expect(graph.getNodeAttribute(node, 'y')).toBeDefined();
+
+ const pos = '' + attr['x'] + '' + attr['y'];
+ console.log(pos);
+
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+
+ expect(isNaN(graph.getNodeAttribute(node, 'x'))).toBeFalsy();
+ expect(isNaN(graph.getNodeAttribute(node, 'y'))).toBeFalsy();
+ });
+ },
+ TIMEOUT
+ );
+});
+
+describe('LayoutFactory Cytoscape Libraries', () => {
+ it('should convert between models Graphology <-> Cytoscape ', () => {
+ const graph = connectedCaveman(Graph, 10, 10);
+
+ const layoutFactory = new LayoutFactory();
+ const layoutAlgorithm = layoutFactory.createLayout('Cytoscape_klay');
+
+ const cytonodes = layoutAlgorithm?.convertToCytoscapeModel(graph);
+
+ let nodes = 0;
+ let edges = 0;
+ cytonodes?.forEach((element) => {
+ if (element.data.type == 'node') {
+ nodes++;
+ } else if (element.data.type == 'edge') {
+ edges++;
+ }
+ });
+
+ // console.log('Number of nodes', graph.order);
+ // console.log('Number of edges', graph.size);
+ expect(nodes).toBe(graph.order);
+ expect(edges).toBe(graph.size);
+ });
+
+ it(
+ 'should execute Cytoscape_klay from Cytoscape ',
+ () => {
+ /**
+ * l number: number of components in the graph.
+ * k number: number of nodes of the components.
+ */
+ const graph = connectedCaveman(Graph, 5, 5);
+ graph.addNode('Martha', { occurrences: 1 });
+
+ // graph.forEachNode(node => {
+ // console.log(node);
+ // });
+
+ const layoutFactory = new LayoutFactory();
+ const layoutAlgorithm = layoutFactory.createLayout('Cytoscape_klay');
+ layoutAlgorithm?.layout(graph);
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ expect(graph.getNodeAttribute(node, 'x')).toBeDefined();
+ expect(graph.getNodeAttribute(node, 'y')).toBeDefined();
+
+ const pos = '' + attr['x'] + '' + attr['y'];
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+
+ it(
+ 'should execute Cytoscape_elk from Cytoscape ',
+ () => {
+ /**
+ * l number: number of components in the graph.
+ * k number: number of nodes of the components.
+ */
+ const graph = connectedCaveman(Graph, 5, 5);
+ graph.addNode('Martha', { occurrences: 1 });
+
+ // graph.forEachNode(node => {
+ // console.log(node);
+ // });
+
+ const layoutFactory = new LayoutFactory();
+ const layoutAlgorithm = layoutFactory.createLayout('Cytoscape_elk');
+ layoutAlgorithm?.layout(graph, false);
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ expect(graph.getNodeAttribute(node, 'x')).toBeDefined();
+ expect(graph.getNodeAttribute(node, 'y')).toBeDefined();
+
+ const pos = '' + attr['x'] + '' + attr['y'];
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+
+ it(
+ 'should execute Cytoscape_dagre from Cytoscape ',
+ () => {
+ /**
+ * l number: number of components in the graph.
+ * k number: number of nodes of the components.
+ */
+ const graph = connectedCaveman(Graph, 5, 5);
+ graph.addNode('Martha', { occurrences: 1 });
+
+ // graph.forEachNode(node => {
+ // console.log(node);
+ // });
+
+ const layoutFactory = new LayoutFactory();
+ const layoutAlgorithm = layoutFactory.createLayout('Cytoscape_dagre');
+ layoutAlgorithm?.layout(graph);
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ expect(graph.getNodeAttribute(node, 'x')).toBeDefined();
+ expect(graph.getNodeAttribute(node, 'y')).toBeDefined();
+
+ const pos = '' + attr['x'] + '' + attr['y'];
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+
+ it(
+ 'should execute Cytoscape_fcose from Cytoscape ',
+ () => {
+ /**
+ * l number: number of components in the graph.
+ * k number: number of nodes of the components.
+ */
+ const graph = connectedCaveman(Graph, 5, 5);
+ graph.addNode('Martha', { occurrences: 1 });
+
+ // graph.forEachNode(node => {
+ // console.log(node);
+ // });
+
+ const layoutFactory = new LayoutFactory();
+ const layoutAlgorithm = layoutFactory.createLayout('Cytoscape_fcose');
+ layoutAlgorithm?.layout(graph, false);
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ expect(graph.getNodeAttribute(node, 'x')).toBeDefined();
+ expect(graph.getNodeAttribute(node, 'y')).toBeDefined();
+
+ const pos = '' + attr['x'] + '' + attr['y'];
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+
+ it(
+ 'should execute Cytoscape_cose-bilkent from Cytoscape ',
+ () => {
+ /**
+ * l number: number of components in the graph.
+ * k number: number of nodes of the components.
+ */
+ const graph = connectedCaveman(Graph, 5, 5);
+ graph.addNode('Martha', { occurrences: 1 });
+
+ // graph.forEachNode(node => {
+ // console.log(node);
+ // });
+
+ const layoutFactory = new LayoutFactory();
+ const layoutAlgorithm = layoutFactory.createLayout(
+ 'Cytoscape_cose-bilkent'
+ );
+ layoutAlgorithm?.layout(graph);
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ expect(graph.getNodeAttribute(node, 'x')).toBeDefined();
+ expect(graph.getNodeAttribute(node, 'y')).toBeDefined();
+
+ const pos = '' + attr['x'] + '' + attr['y'];
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+
+ it(
+ 'should execute Cytoscape_cise from Cytoscape ',
+ () => {
+ /**
+ * l number: number of components in the graph.
+ * k number: number of nodes of the components.
+ */
+ const graph = connectedCaveman(Graph, 5, 5);
+ graph.addNode('Martha', { occurrences: 1 });
+
+ // graph.forEachNode(node => {
+ // console.log(node);
+ // });
+
+ const layoutFactory = new LayoutFactory();
+ const layoutAlgorithm = layoutFactory.createLayout('Cytoscape_cise');
+ layoutAlgorithm?.layout(graph);
+
+ const positionMap = new Set<string>();
+ graph.forEachNode((node, attr) => {
+ expect(graph.getNodeAttribute(node, 'x')).toBeDefined();
+ expect(graph.getNodeAttribute(node, 'y')).toBeDefined();
+
+ const pos = '' + attr['x'] + '' + attr['y'];
+ expect(positionMap.has(pos)).toBeFalsy();
+ positionMap.add(pos);
+ });
+ },
+ TIMEOUT
+ );
+});
diff --git a/libs/shared/graph-layout/src/factory/layout-creator-usecase.ts b/libs/shared/graph-layout/src/lib/layout-creator-usecase.ts
similarity index 98%
rename from libs/shared/graph-layout/src/factory/layout-creator-usecase.ts
rename to libs/shared/graph-layout/src/lib/layout-creator-usecase.ts
index 53a6411db5b4526c99ad21f8fef9b10b458ce703..930200eea101f2b6c6c977a3705f5986ef2d864d 100644
--- a/libs/shared/graph-layout/src/factory/layout-creator-usecase.ts
+++ b/libs/shared/graph-layout/src/lib/layout-creator-usecase.ts
@@ -10,7 +10,7 @@ import {
GraphologyLayoutAlgorithms,
GraphologyProvider,
} from './graphology-layouts';
-import { Layout } from './Layout';
+import { Layout } from './layout';
export type Providers = GraphologyProvider | CytoscapeProvider;
export type LayoutAlgorithm<Provider extends Providers> =
diff --git a/libs/shared/graph-layout/src/factory/Layout.ts b/libs/shared/graph-layout/src/lib/layout.ts
similarity index 57%
rename from libs/shared/graph-layout/src/factory/Layout.ts
rename to libs/shared/graph-layout/src/lib/layout.ts
index 06f4da35e0cc20e2a4190fe6335029e5eede0aba..caa834f545a7e013965f979ce71839498f4c6b4a 100644
--- a/libs/shared/graph-layout/src/factory/Layout.ts
+++ b/libs/shared/graph-layout/src/lib/layout.ts
@@ -15,7 +15,17 @@ export abstract class Layout<provider extends Providers> {
);
}
- public layout(graph: Graph) {
+ public layout(graph: Graph, verbose?: boolean) {
console.log(`${this.provider} [${this.algorithm}] layouting now`);
+
+ graph.forEachNode((node) => {
+ const attr = graph.getNodeAttributes(node);
+ if (!attr.hasOwnProperty('x')) {
+ graph.setNodeAttribute(node, 'x', Math.random());
+ }
+ if (!attr.hasOwnProperty('y')) {
+ graph.setNodeAttribute(node, 'y', Math.random());
+ }
+ });
}
}
diff --git a/libs/shared/graph-layout/tsconfig.json b/libs/shared/graph-layout/tsconfig.json
index 648c1247acd28e436cf1f65beda5453fb00f0af4..b3eaee077ca790ec299fe3ac9dd427bc04d21613 100644
--- a/libs/shared/graph-layout/tsconfig.json
+++ b/libs/shared/graph-layout/tsconfig.json
@@ -1,5 +1,17 @@
{
"extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "jsx": "react-jsx",
+ "allowJs": true,
+ "esModuleInterop": true,
+ "allowSyntheticDefaultImports": true,
+ "forceConsistentCasingInFileNames": true,
+ "strict": true,
+ "noImplicitOverride": true,
+ "noPropertyAccessFromIndexSignature": true,
+ "noImplicitReturns": true,
+ "noFallthroughCasesInSwitch": true
+ },
"files": [],
"include": [],
"references": [
@@ -10,13 +22,4 @@
"path": "./tsconfig.spec.json"
}
],
- "compilerOptions": {
- "forceConsistentCasingInFileNames": true,
- "strict": true,
- "noImplicitReturns": true,
- "noFallthroughCasesInSwitch": true,
- "lib": ["webworker", "scripthost"],
- "esModuleInterop": true,
- "composite": true
- }
}
diff --git a/libs/shared/graph-layout/tsconfig.lib.json b/libs/shared/graph-layout/tsconfig.lib.json
index 6eb3eb9eabd5e4bb38ac7c366304f7ba7a6a491c..0a86e9a4481e7c1f10b111060bf05bcd90a5329e 100644
--- a/libs/shared/graph-layout/tsconfig.lib.json
+++ b/libs/shared/graph-layout/tsconfig.lib.json
@@ -2,10 +2,22 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../../dist/out-tsc",
- "declaration": true,
- "types": [],
+ "types": ["node"],
"composite": true
},
- "include": ["**/*.ts"],
- "exclude": ["**/*.spec.ts"]
+ "files": [
+ "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+ "../../../node_modules/@nrwl/react/typings/image.d.ts"
+ ],
+ "exclude": [
+ "**/*.spec.ts",
+ "**/*.test.ts",
+ "**/*.spec.tsx",
+ "**/*.test.tsx",
+ "**/*.spec.js",
+ "**/*.test.js",
+ "**/*.spec.jsx",
+ "**/*.test.jsx"
+ ],
+ "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
diff --git a/libs/shared/graph-layout/tsconfig.spec.json b/libs/shared/graph-layout/tsconfig.spec.json
index d8716fecfa3b7929f162b71e7a966c579a63c071..4afc999ad429eea63e777308527c4e8f629e4198 100644
--- a/libs/shared/graph-layout/tsconfig.spec.json
+++ b/libs/shared/graph-layout/tsconfig.spec.json
@@ -3,7 +3,8 @@
"compilerOptions": {
"outDir": "../../../dist/out-tsc",
"module": "commonjs",
- "types": ["jest", "node"]
+ "types": ["jest", "node"],
+ "composite": true
},
"include": [
"**/*.test.ts",
diff --git a/libs/shared/graph-layout/yarn.lock b/libs/shared/graph-layout/yarn.lock
new file mode 100644
index 0000000000000000000000000000000000000000..a648f2038763e7f89799b53b4144232254ac577a
--- /dev/null
+++ b/libs/shared/graph-layout/yarn.lock
@@ -0,0 +1,245 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@yomguithereal/helpers@^1.1.1":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@yomguithereal/helpers/-/helpers-1.1.1.tgz#185dfb0f88ca2beec53d0adf6eed15c33b1c549d"
+ integrity sha512-UYvAq/XCA7xoh1juWDYsq3W0WywOB+pz8cgVnE1b45ZfdMhBvHDrgmSFG3jXeZSr2tMTYLGHFHON+ekG05Jebg==
+
+avsdf-base@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/avsdf-base/-/avsdf-base-1.0.0.tgz#80c437d7d15d2bd201d9c31804e7b7a15a84781a"
+ integrity sha512-APhZNUFJwIwrLsSfE95QjobEntdUhFQgfNtC/BrYmjUpwHh5Y2fbRv8lxAlMr1hdf/CuQYsqJxK3dRzcCL77qw==
+ dependencies:
+ layout-base "^1.0.0"
+
+cose-base@^1.0.0:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/cose-base/-/cose-base-1.0.3.tgz#650334b41b869578a543358b80cda7e0abe0a60a"
+ integrity sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==
+ dependencies:
+ layout-base "^1.0.0"
+
+cose-base@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/cose-base/-/cose-base-2.1.0.tgz#89b2d4a59d7bd0cde3138a4689825f3e8a5abd6a"
+ integrity sha512-HTMm07dhxq1dIPGWwpiVrIk9n+DH7KYmqWA786mLe8jDS+1ZjGtJGIIsJVKoseZXS6/FxiUWCJ2B7XzqUCuhPw==
+ dependencies:
+ layout-base "^2.0.0"
+
+cytoscape-cise@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/cytoscape-cise/-/cytoscape-cise-1.0.0.tgz#29ac061c74e036441c0b5687e7ebc25e919d507c"
+ integrity sha512-Y1NPaUo4fN992XJTEIDd4oPVkv8BsDSrFBHSB38caDu8PcmHUyl8/Q8K5wvqdTeti1mLR9IX4/o2RyuObh+P7Q==
+ dependencies:
+ avsdf-base "^1.0.0"
+ cose-base "^1.0.0"
+
+cytoscape-cose-bilkent@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz#762fa121df9930ffeb51a495d87917c570ac209b"
+ integrity sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==
+ dependencies:
+ cose-base "^1.0.0"
+
+cytoscape-dagre@^2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/cytoscape-dagre/-/cytoscape-dagre-2.4.0.tgz#abf145b1c675afe3b7d531166e6727dc39dc350d"
+ integrity sha512-jfOtKzKduCnruBs3YMHS9kqWjZKqvp6loSJwlotPO5pcU4wLUhkx7ZBIyW3VWZXa8wfkGxv/zhWoBxWtYrUxKQ==
+ dependencies:
+ dagre "^0.8.5"
+
+cytoscape-elk@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/cytoscape-elk/-/cytoscape-elk-2.0.2.tgz#dc8cf9b3ac3c9dfb16a67273f2ef6fd62d676cfc"
+ integrity sha512-P47PY63YECC42JVJm/PozKDZMLmx/BPGEhmfAEQzMRAz03DC09CsGrMC4TM4ggErnI8uPMzmI42F1oP6Zu4iUw==
+ dependencies:
+ elkjs "^0.7.0"
+
+cytoscape-fcose@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/cytoscape-fcose/-/cytoscape-fcose-2.1.0.tgz#04c3093776ea6b71787009de641607db7d4edf55"
+ integrity sha512-Q3apPl66jf8/2sMsrCjNP247nbDkyIPjA9g5iPMMWNLZgP3/mn9aryF7EFY/oRPEpv7bKJ4jYmCoU5r5/qAc1Q==
+ dependencies:
+ cose-base "^2.0.0"
+
+cytoscape-klay@^3.1.4:
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/cytoscape-klay/-/cytoscape-klay-3.1.4.tgz#0e5bbb5c482b384b2ff2485150173aaecebc324b"
+ integrity sha512-VwPj0VR25GPfy6qXVQRi/MYlZM/zkdvRhHlgqbM//lSvstgM6fhp3ik/uM8Wr8nlhskfqz/M1fIDmR6UckbS2A==
+ dependencies:
+ klayjs "^0.4.1"
+
+cytoscape@^3.21.0:
+ version "3.21.0"
+ resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.21.0.tgz#8a73f6f0f3a44f948e266ac7df9b2eff65e8bd3c"
+ integrity sha512-xPINMzQNGN4WIog93gYRScT4y/CyZMmqunnhU59/8LynhWwzepJtUydMfvIPuz5TmJ9rSCMdw6rmxhfbb1eofw==
+ dependencies:
+ heap "^0.2.6"
+ lodash.debounce "^4.0.8"
+ lodash.get "^4.4.2"
+ lodash.set "^4.3.2"
+ lodash.topath "^4.5.2"
+
+dagre@^0.8.5:
+ version "0.8.5"
+ resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee"
+ integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==
+ dependencies:
+ graphlib "^2.1.8"
+ lodash "^4.17.15"
+
+elkjs@^0.7.0:
+ version "0.7.1"
+ resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.7.1.tgz#4751c5e918a4988139baf7f214e010aea22de969"
+ integrity sha512-lD86RWdh480/UuRoHhRcnv2IMkIcK6yMDEuT8TPBIbO3db4HfnVF+1lgYdQi99Ck0yb+lg5Eb46JCHI5uOsmAw==
+
+events@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+ integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
+graphlib@^2.1.8:
+ version "2.1.8"
+ resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da"
+ integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==
+ dependencies:
+ lodash "^4.17.15"
+
+graphology-generators@^0.11.2:
+ version "0.11.2"
+ resolved "https://registry.yarnpkg.com/graphology-generators/-/graphology-generators-0.11.2.tgz#eff2c97e4f5bf401e86ab045470dded95f2ebe24"
+ integrity sha512-hx+F0OZRkVdoQ0B1tWrpxoakmHZNex0c6RAoR0PrqJ+6fz/gz6CQ88Qlw78C6yD9nlZVRgepIoDYhRTFV+bEHg==
+ dependencies:
+ graphology-metrics "^2.0.0"
+ graphology-utils "^2.3.0"
+
+graphology-indices@^0.16.3:
+ version "0.16.6"
+ resolved "https://registry.yarnpkg.com/graphology-indices/-/graphology-indices-0.16.6.tgz#0de112ef0367e44041490933e34ad2075cb24e80"
+ integrity sha512-tozTirLb7pd37wULJ5qeIZfZqKuVln/V+bWmUWJ7MmoTU8YkW5dehOkRz2by/O+5MdJ52imqL8LH4+GCd0yEVw==
+ dependencies:
+ graphology-utils "^2.4.2"
+ mnemonist "^0.39.0"
+
+graphology-layout-forceatlas2@^0.8.2:
+ version "0.8.2"
+ resolved "https://registry.yarnpkg.com/graphology-layout-forceatlas2/-/graphology-layout-forceatlas2-0.8.2.tgz#7cb5b2fa00fd5445cb2b73c333e36ef22c8a82a8"
+ integrity sha512-OsmOuQP0xiav5Iau9W9G4eb4cGx5tDcdzx9NudG6fhi6japqD+Z45zUBcwnp/12BPBXp/PKc5pvUe3Va6AsOUA==
+ dependencies:
+ graphology-utils "^2.1.0"
+
+graphology-layout-noverlap@^0.4.2:
+ version "0.4.2"
+ resolved "https://registry.yarnpkg.com/graphology-layout-noverlap/-/graphology-layout-noverlap-0.4.2.tgz#2ffa054ceeebaa31fcffe695d271fc55707cd29c"
+ integrity sha512-13WwZSx96zim6l1dfZONcqLh3oqyRcjIBsqz2c2iJ3ohgs3605IDWjldH41Gnhh462xGB1j6VGmuGhZ2FKISXA==
+ dependencies:
+ graphology-utils "^2.3.0"
+
+graphology-layout@^0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/graphology-layout/-/graphology-layout-0.5.0.tgz#a0a54861cebae5f486c778dbdafc6294859f23b5"
+ integrity sha512-aIeXYPLeGMLvXIkO41TlhBv0ROFWUx1bqR2VQoJ7Mp2IW+TF+rxqMeRUrmyLHoe3HtKo8jhloB2KHp7g6fcDSg==
+ dependencies:
+ graphology-utils "^2.3.0"
+ pandemonium "^1.5.0"
+
+graphology-metrics@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/graphology-metrics/-/graphology-metrics-2.1.0.tgz#7d00bae92d8970583afd020e6d40d8a16c378002"
+ integrity sha512-E+y4kgVGxhYl/+bPHEftJeWLS8LgVno4/Wvg+C7IoDIjY6OlIZghgMKDR8LKsxU6GC43mlx08FTZs229cvEkwQ==
+ dependencies:
+ graphology-shortest-path "^2.0.0"
+ graphology-utils "^2.4.4"
+ mnemonist "^0.39.0"
+
+graphology-shortest-path@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/graphology-shortest-path/-/graphology-shortest-path-2.0.0.tgz#27a01b3a9980872bd44a197fc77114623dd2b302"
+ integrity sha512-6dJWgbr7w4YQKb7Y0w7vhZn2qAkqP+J0IhE9F3vz/HZcx7VSOqnNfTGtYr44BQ5ohdXj0l9iKjlWCb+3vqEINQ==
+ dependencies:
+ "@yomguithereal/helpers" "^1.1.1"
+ graphology-indices "^0.16.3"
+ graphology-utils "^2.4.3"
+ mnemonist "^0.39.0"
+
+graphology-utils@^2.1.0, graphology-utils@^2.3.0, graphology-utils@^2.4.2, graphology-utils@^2.4.3, graphology-utils@^2.4.4:
+ version "2.5.1"
+ resolved "https://registry.yarnpkg.com/graphology-utils/-/graphology-utils-2.5.1.tgz#93916ead84ec7896959b4033b94cd6994ae9952c"
+ integrity sha512-N6zjqvBHgJvulYnwdDgdJoeuhKXZBNm1zedC2asdN+rexfbJylhey/PVT8Bwr8B1aVxKuK+zQqMbQ50kKikjew==
+
+graphology@^0.24.1:
+ version "0.24.1"
+ resolved "https://registry.yarnpkg.com/graphology/-/graphology-0.24.1.tgz#035e452e294b01168cf5c85d5dd0a4b7e4837d87"
+ integrity sha512-6lNz1PNTAe9Q6ioHKrXu0Lp047sgvOoHa4qmP/8mnJWCGv2iIZPQkuHPUb2/OWDWCqHpw2hKgJLJ55X/66xmHg==
+ dependencies:
+ events "^3.3.0"
+ obliterator "^2.0.2"
+
+heap@^0.2.6:
+ version "0.2.7"
+ resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.7.tgz#1e6adf711d3f27ce35a81fe3b7bd576c2260a8fc"
+ integrity sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==
+
+klayjs@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/klayjs/-/klayjs-0.4.1.tgz#5bf9fadc7a3e44b94082bba501e7d803076dcfc2"
+ integrity sha1-W/n63Ho+RLlAgrulAefYAwdtz8I=
+
+layout-base@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-1.0.2.tgz#1291e296883c322a9dd4c5dd82063721b53e26e2"
+ integrity sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==
+
+layout-base@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-2.0.1.tgz#d0337913586c90f9c2c075292069f5c2da5dd285"
+ integrity sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==
+
+lodash.debounce@^4.0.8:
+ version "4.0.8"
+ resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+ integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
+lodash.get@^4.4.2:
+ version "4.4.2"
+ resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+ integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+
+lodash.set@^4.3.2:
+ version "4.3.2"
+ resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
+ integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
+
+lodash.topath@^4.5.2:
+ version "4.5.2"
+ resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009"
+ integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=
+
+lodash@^4.17.15:
+ version "4.17.21"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+ integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+mnemonist@^0.39.0:
+ version "0.39.0"
+ resolved "https://registry.yarnpkg.com/mnemonist/-/mnemonist-0.39.0.tgz#4c83dd22e8d9d05dfb721ff66a905fec4c460041"
+ integrity sha512-7v08Ldk1lnlywnIShqfKYN7EW4WKLUnkoWApdmR47N1xA2xmEtWERfEvyRCepbuFCETG5OnfaGQpp/p4Bus6ZQ==
+ dependencies:
+ obliterator "^2.0.1"
+
+obliterator@^2.0.1, obliterator@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/obliterator/-/obliterator-2.0.2.tgz#25f50dc92e1181371b9d8209d11890f1a3c2fc21"
+ integrity sha512-g0TrA7SbUggROhDPK8cEu/qpItwH2LSKcNl4tlfBNT54XY+nOsqrs0Q68h1V9b3HOSpIWv15jb1lax2hAggdIg==
+
+pandemonium@^1.5.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/pandemonium/-/pandemonium-1.5.0.tgz#93f35af555de1420022b341e730215c51c725be3"
+ integrity sha512-9PU9fy93rJhZHLMjX+4M1RwZPEYl6g7DdWKGmGNhkgBZR5+tOBVExNZc00kzdEGMxbaAvWdQy9MqGAScGwYlcA==
+
+web-worker@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.2.0.tgz#5d85a04a7fbc1e7db58f66595d7a3ac7c9c180da"
+ integrity sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA==
diff --git a/libs/shared/mock-data/.gitignore b/libs/shared/mock-data/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4eb78c54b0e23b5fdb84ed6c7bc5534217836b58
--- /dev/null
+++ b/libs/shared/mock-data/.gitignore
@@ -0,0 +1,145 @@
+
+# Created by https://www.toptal.com/developers/gitignore/api/node
+# Edit at https://www.toptal.com/developers/gitignore?templates=node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+### Node Patch ###
+# Serverless Webpack directories
+.webpack/
+
+# Optional stylelint cache
+
+# SvelteKit build / generate output
+.svelte-kit
+
+# End of https://www.toptal.com/developers/gitignore/api/node
\ No newline at end of file
diff --git a/libs/shared/mock-data/src/index.ts b/libs/shared/mock-data/src/index.ts
index 56efd8b1107de967cc6a20114df6dcea57ac2e93..ab66e18ef08fcda54d1db1bfb65b8119697452dc 100644
--- a/libs/shared/mock-data/src/index.ts
+++ b/libs/shared/mock-data/src/index.ts
@@ -1,4 +1,4 @@
-export * from './schema/simple';
-export * from './schema/moviesSchema';
-export * from './schema/northwindSchema';
-export * from './schema/twitterSchema';
+export * from './schema/simpleRaw';
+export * from './schema/moviesSchemaRaw';
+export * from './schema/northwindSchemaRaw';
+export * from './schema/twitterSchemaRaw';
diff --git a/libs/shared/mock-data/src/schema/mock-data.spec.ts b/libs/shared/mock-data/src/schema/mock-data.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f86e6d316a9867914bc99061442e2b3f8f56e854
--- /dev/null
+++ b/libs/shared/mock-data/src/schema/mock-data.spec.ts
@@ -0,0 +1,55 @@
+import Graph from 'graphology';
+import { movieSchemaRaw, movieSchema } from './moviesSchemaRaw';
+import { northWindSchema, northwindSchemaRaw } from './northwindSchemaRaw';
+import { simpleSchema, simpleSchemaRaw } from './simpleRaw';
+import { twitterSchema, twitterSchemaRaw } from './twitterSchemaRaw';
+
+describe('MockData Tests', () => {
+ it('should have raw data available movie', () => {
+ const graph = movieSchemaRaw;
+ expect(graph);
+ });
+
+ it('should have raw data available northwind', () => {
+ const graph = northwindSchemaRaw;
+ expect(graph);
+ });
+
+ it('should have raw data available simpleSchemaRaw', () => {
+ const graph = simpleSchemaRaw;
+ expect(graph);
+ });
+
+ it('should have raw data available twitterSchemaRaw', () => {
+ const graph = twitterSchemaRaw;
+ expect(graph);
+ });
+
+ it('should have data available as graphology model movie', () => {
+ const graph = movieSchema;
+ expect(graph);
+
+ expect(graph.constructor.name.toLowerCase().indexOf('graph') != -1).toBeTruthy();
+ });
+
+ it('should have data available as graphology model northwind', () => {
+ const graph = northWindSchema;
+ expect(graph);
+
+ expect(graph.constructor.name.toLowerCase().indexOf('graph') != -1).toBeTruthy();
+ });
+
+ it('should have data available as graphology model simpleSchemaRaw', () => {
+ const graph = simpleSchema;
+ expect(graph);
+
+ expect(graph.constructor.name.toLowerCase().indexOf('graph') != -1).toBeTruthy();
+ });
+
+ it('should have data available as graphology model twitterSchemaRaw', () => {
+ const graph = twitterSchema;
+ expect(graph);
+
+ expect(graph.constructor.name.toLowerCase().indexOf('graph') != -1).toBeTruthy();
+ });
+});
diff --git a/libs/shared/mock-data/src/schema/moviesSchema.ts b/libs/shared/mock-data/src/schema/moviesSchema.ts
deleted file mode 100644
index 67bdc012962a1c69de55d8b3bd90b8866e5de90d..0000000000000000000000000000000000000000
--- a/libs/shared/mock-data/src/schema/moviesSchema.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-export const movieSchema = {
- "nodes": [
- {
- "name": "Movie",
- "attributes": [
- {
- "name": "tagline",
- "type": "string"
- },
- {
- "name": "title",
- "type": "string"
- },
- {
- "name": "released",
- "type": "int"
- },
- {
- "name": "votes",
- "type": "int"
- }
- ]
- },
- {
- "name": "Person",
- "attributes": [
- {
- "name": "born",
- "type": "int"
- },
- {
- "name": "name",
- "type": "string"
- }
- ]
- }
- ],
- "edges": [
- {
- "name": "ACTED_IN",
- "collection": "ACTED_IN",
- "from": "Person",
- "to": "Movie",
- "attributes": [
- {
- "name": "roles",
- "type": "string"
- }
- ]
- },
- {
- "name": "REVIEWED",
- "collection": "REVIEWED",
- "from": "Person",
- "to": "Movie",
- "attributes": [
- {
- "name": "summary",
- "type": "string"
- },
- {
- "name": "rating",
- "type": "int"
- }
- ]
- },
- {
- "name": "PRODUCED",
- "collection": "PRODUCED",
- "from": "Person",
- "to": "Movie",
- "attributes": []
- },
- {
- "name": "WROTE",
- "collection": "WROTE",
- "from": "Person",
- "to": "Movie",
- "attributes": []
- },
- {
- "name": "FOLLOWS",
- "collection": "FOLLOWS",
- "from": "Person",
- "to": "Person",
- "attributes": []
- },
- {
- "name": "DIRECTED",
- "collection": "DIRECTED",
- "from": "Person",
- "to": "Movie",
- "attributes": []
- }
- ]
-}
\ No newline at end of file
diff --git a/libs/shared/mock-data/src/schema/moviesSchemaRaw.ts b/libs/shared/mock-data/src/schema/moviesSchemaRaw.ts
new file mode 100644
index 0000000000000000000000000000000000000000..762bce33c65af64ba2bdac7928697224afd5d651
--- /dev/null
+++ b/libs/shared/mock-data/src/schema/moviesSchemaRaw.ts
@@ -0,0 +1,103 @@
+import { SchemaUtils } from '@graphpolaris/schema-utils';
+import { SchemaFromBackend } from 'libs/shared/models/src';
+
+export const movieSchemaRaw = {
+ nodes: [
+ {
+ name: 'Movie',
+ attributes: [
+ {
+ name: 'tagline',
+ type: 'string',
+ },
+ {
+ name: 'title',
+ type: 'string',
+ },
+ {
+ name: 'released',
+ type: 'int',
+ },
+ {
+ name: 'votes',
+ type: 'int',
+ },
+ ],
+ },
+ {
+ name: 'Person',
+ attributes: [
+ {
+ name: 'born',
+ type: 'int',
+ },
+ {
+ name: 'name',
+ type: 'string',
+ },
+ ],
+ },
+ ],
+ edges: [
+ {
+ name: 'ACTED_IN',
+ collection: 'ACTED_IN',
+ from: 'Person',
+ to: 'Movie',
+ attributes: [
+ {
+ name: 'roles',
+ type: 'string',
+ },
+ ],
+ },
+ {
+ name: 'REVIEWED',
+ collection: 'REVIEWED',
+ from: 'Person',
+ to: 'Movie',
+ attributes: [
+ {
+ name: 'summary',
+ type: 'string',
+ },
+ {
+ name: 'rating',
+ type: 'int',
+ },
+ ],
+ },
+ {
+ name: 'PRODUCED',
+ collection: 'PRODUCED',
+ from: 'Person',
+ to: 'Movie',
+ attributes: [],
+ },
+ {
+ name: 'WROTE',
+ collection: 'WROTE',
+ from: 'Person',
+ to: 'Movie',
+ attributes: [],
+ },
+ {
+ name: 'FOLLOWS',
+ collection: 'FOLLOWS',
+ from: 'Person',
+ to: 'Person',
+ attributes: [],
+ },
+ {
+ name: 'DIRECTED',
+ collection: 'DIRECTED',
+ from: 'Person',
+ to: 'Movie',
+ attributes: [],
+ },
+ ],
+};
+
+export const movieSchema = SchemaUtils.ParseSchemaFromBackend(
+ movieSchemaRaw as SchemaFromBackend
+);
diff --git a/libs/shared/mock-data/src/schema/northwindSchema.ts b/libs/shared/mock-data/src/schema/northwindSchema.ts
deleted file mode 100644
index 8cf2e965595dcfdc1374b3e573c124812468a31c..0000000000000000000000000000000000000000
--- a/libs/shared/mock-data/src/schema/northwindSchema.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-export const northWindSchema = {
- "nodes": [
- {
- "name": "Order",
- "attributes": [
- {
- "name": "customerID",
- "type": "string"
- },
- {
- "name": "shipCity",
- "type": "string"
- },
- {
- "name": "orderID",
- "type": "string"
- },
- {
- "name": "freight",
- "type": "string"
- },
- {
- "name": "requiredDate",
- "type": "string"
- },
- {
- "name": "employeeID",
- "type": "string"
- },
- {
- "name": "shipName",
- "type": "string"
- },
- {
- "name": "shipPostalCode",
- "type": "string"
- },
- {
- "name": "orderDate",
- "type": "string"
- },
- {
- "name": "shipRegion",
- "type": "string"
- },
- {
- "name": "shipCountry",
- "type": "string"
- },
- {
- "name": "shippedDate",
- "type": "string"
- },
- {
- "name": "shipVia",
- "type": "string"
- },
- {
- "name": "shipAddress",
- "type": "string"
- }
- ]
- },
- {
- "name": "Category",
- "attributes": [
- {
- "name": "categoryID",
- "type": "string"
- },
- {
- "name": "description",
- "type": "string"
- },
- {
- "name": "categoryName",
- "type": "string"
- },
- {
- "name": "picture",
- "type": "string"
- }
- ]
- },
- {
- "name": "Customer",
- "attributes": [
- {
- "name": "country",
- "type": "string"
- },
- {
- "name": "address",
- "type": "string"
- },
- {
- "name": "contactTitle",
- "type": "string"
- },
- {
- "name": "city",
- "type": "string"
- },
- {
- "name": "phone",
- "type": "string"
- },
- {
- "name": "contactName",
- "type": "string"
- },
- {
- "name": "postalCode",
- "type": "string"
- },
- {
- "name": "companyName",
- "type": "string"
- },
- {
- "name": "fax",
- "type": "string"
- },
- {
- "name": "region",
- "type": "string"
- },
- {
- "name": "customerID",
- "type": "string"
- }
- ]
- },
- {
- "name": "Product",
- "attributes": [
- {
- "name": "reorderLevel",
- "type": "int"
- },
- {
- "name": "unitsInStock",
- "type": "int"
- },
- {
- "name": "unitPrice",
- "type": "float"
- },
- {
- "name": "supplierID",
- "type": "string"
- },
- {
- "name": "productID",
- "type": "string"
- },
- {
- "name": "discontinued",
- "type": "bool"
- },
- {
- "name": "quantityPerUnit",
- "type": "string"
- },
- {
- "name": "categoryID",
- "type": "string"
- },
- {
- "name": "unitsOnOrder",
- "type": "int"
- },
- {
- "name": "productName",
- "type": "string"
- }
- ]
- },
- {
- "name": "Supplier",
- "attributes": [
- {
- "name": "supplierID",
- "type": "string"
- },
- {
- "name": "country",
- "type": "string"
- },
- {
- "name": "address",
- "type": "string"
- },
- {
- "name": "contactTitle",
- "type": "string"
- },
- {
- "name": "city",
- "type": "string"
- },
- {
- "name": "phone",
- "type": "string"
- },
- {
- "name": "contactName",
- "type": "string"
- },
- {
- "name": "postalCode",
- "type": "string"
- },
- {
- "name": "companyName",
- "type": "string"
- },
- {
- "name": "fax",
- "type": "string"
- },
- {
- "name": "region",
- "type": "string"
- },
- {
- "name": "homePage",
- "type": "string"
- }
- ]
- }
- ],
- "edges": [
- {
- "name": "ORDERS",
- "collection": "ORDERS",
- "from": "Order",
- "to": "Product",
- "attributes": [
- {
- "name": "unitPrice",
- "type": "string"
- },
- {
- "name": "productID",
- "type": "string"
- },
- {
- "name": "orderID",
- "type": "string"
- },
- {
- "name": "discount",
- "type": "string"
- },
- {
- "name": "quantity",
- "type": "int"
- }
- ]
- },
- {
- "name": "PART_OF",
- "collection": "PART_OF",
- "from": "Product",
- "to": "Category",
- "attributes": []
- },
- {
- "name": "SUPPLIES",
- "collection": "SUPPLIES",
- "from": "Supplier",
- "to": "Product",
- "attributes": []
- },
- {
- "name": "PURCHASED",
- "collection": "PURCHASED",
- "from": "Customer",
- "to": "Order",
- "attributes": []
- }
- ]
-}
\ No newline at end of file
diff --git a/libs/shared/mock-data/src/schema/northwindSchemaRaw.ts b/libs/shared/mock-data/src/schema/northwindSchemaRaw.ts
new file mode 100644
index 0000000000000000000000000000000000000000..59f248f5fbd9117a1021cc1852100e24c02f85ec
--- /dev/null
+++ b/libs/shared/mock-data/src/schema/northwindSchemaRaw.ts
@@ -0,0 +1,291 @@
+import { SchemaUtils } from '@graphpolaris/schema-utils';
+import { SchemaFromBackend } from 'libs/shared/models/src';
+
+export const northwindSchemaRaw = {
+ nodes: [
+ {
+ name: 'Order',
+ attributes: [
+ {
+ name: 'customerID',
+ type: 'string',
+ },
+ {
+ name: 'shipCity',
+ type: 'string',
+ },
+ {
+ name: 'orderID',
+ type: 'string',
+ },
+ {
+ name: 'freight',
+ type: 'string',
+ },
+ {
+ name: 'requiredDate',
+ type: 'string',
+ },
+ {
+ name: 'employeeID',
+ type: 'string',
+ },
+ {
+ name: 'shipName',
+ type: 'string',
+ },
+ {
+ name: 'shipPostalCode',
+ type: 'string',
+ },
+ {
+ name: 'orderDate',
+ type: 'string',
+ },
+ {
+ name: 'shipRegion',
+ type: 'string',
+ },
+ {
+ name: 'shipCountry',
+ type: 'string',
+ },
+ {
+ name: 'shippedDate',
+ type: 'string',
+ },
+ {
+ name: 'shipVia',
+ type: 'string',
+ },
+ {
+ name: 'shipAddress',
+ type: 'string',
+ },
+ ],
+ },
+ {
+ name: 'Category',
+ attributes: [
+ {
+ name: 'categoryID',
+ type: 'string',
+ },
+ {
+ name: 'description',
+ type: 'string',
+ },
+ {
+ name: 'categoryName',
+ type: 'string',
+ },
+ {
+ name: 'picture',
+ type: 'string',
+ },
+ ],
+ },
+ {
+ name: 'Customer',
+ attributes: [
+ {
+ name: 'country',
+ type: 'string',
+ },
+ {
+ name: 'address',
+ type: 'string',
+ },
+ {
+ name: 'contactTitle',
+ type: 'string',
+ },
+ {
+ name: 'city',
+ type: 'string',
+ },
+ {
+ name: 'phone',
+ type: 'string',
+ },
+ {
+ name: 'contactName',
+ type: 'string',
+ },
+ {
+ name: 'postalCode',
+ type: 'string',
+ },
+ {
+ name: 'companyName',
+ type: 'string',
+ },
+ {
+ name: 'fax',
+ type: 'string',
+ },
+ {
+ name: 'region',
+ type: 'string',
+ },
+ {
+ name: 'customerID',
+ type: 'string',
+ },
+ ],
+ },
+ {
+ name: 'Product',
+ attributes: [
+ {
+ name: 'reorderLevel',
+ type: 'int',
+ },
+ {
+ name: 'unitsInStock',
+ type: 'int',
+ },
+ {
+ name: 'unitPrice',
+ type: 'float',
+ },
+ {
+ name: 'supplierID',
+ type: 'string',
+ },
+ {
+ name: 'productID',
+ type: 'string',
+ },
+ {
+ name: 'discontinued',
+ type: 'bool',
+ },
+ {
+ name: 'quantityPerUnit',
+ type: 'string',
+ },
+ {
+ name: 'categoryID',
+ type: 'string',
+ },
+ {
+ name: 'unitsOnOrder',
+ type: 'int',
+ },
+ {
+ name: 'productName',
+ type: 'string',
+ },
+ ],
+ },
+ {
+ name: 'Supplier',
+ attributes: [
+ {
+ name: 'supplierID',
+ type: 'string',
+ },
+ {
+ name: 'country',
+ type: 'string',
+ },
+ {
+ name: 'address',
+ type: 'string',
+ },
+ {
+ name: 'contactTitle',
+ type: 'string',
+ },
+ {
+ name: 'city',
+ type: 'string',
+ },
+ {
+ name: 'phone',
+ type: 'string',
+ },
+ {
+ name: 'contactName',
+ type: 'string',
+ },
+ {
+ name: 'postalCode',
+ type: 'string',
+ },
+ {
+ name: 'companyName',
+ type: 'string',
+ },
+ {
+ name: 'fax',
+ type: 'string',
+ },
+ {
+ name: 'region',
+ type: 'string',
+ },
+ {
+ name: 'homePage',
+ type: 'string',
+ },
+ ],
+ },
+ ],
+ edges: [
+ {
+ name: 'ORDERS',
+ collection: 'ORDERS',
+ from: 'Order',
+ to: 'Product',
+ attributes: [
+ {
+ name: 'unitPrice',
+ type: 'string',
+ },
+ {
+ name: 'productID',
+ type: 'string',
+ },
+ {
+ name: 'orderID',
+ type: 'string',
+ },
+ {
+ name: 'discount',
+ type: 'string',
+ },
+ {
+ name: 'quantity',
+ type: 'int',
+ },
+ ],
+ },
+ {
+ name: 'PART_OF',
+ collection: 'PART_OF',
+ from: 'Product',
+ to: 'Category',
+ attributes: [],
+ },
+ {
+ name: 'SUPPLIES',
+ collection: 'SUPPLIES',
+ from: 'Supplier',
+ to: 'Product',
+ attributes: [],
+ },
+ {
+ name: 'PURCHASED',
+ collection: 'PURCHASED',
+ from: 'Customer',
+ to: 'Order',
+ attributes: [],
+ },
+ ],
+};
+
+export const northWindSchema = SchemaUtils.ParseSchemaFromBackend(
+ northwindSchemaRaw as SchemaFromBackend
+);
diff --git a/libs/shared/mock-data/src/schema/simple.ts b/libs/shared/mock-data/src/schema/simple.ts
deleted file mode 100644
index 13c5a91e08a4f6341c5be1255f1428d8e69c677e..0000000000000000000000000000000000000000
--- a/libs/shared/mock-data/src/schema/simple.ts
+++ /dev/null
@@ -1,101 +0,0 @@
- export const simpleSchema = {
- "nodes": [
- {
- "name": "Thijs",
- "attributes": []
- },
- {
- "name": "Airport",
- "attributes": [
- { "name": "city", "type": "string" },
- { "name": "vip", "type": "bool" },
- { "name": "state", "type": "string" }
- ]
- },
- {
- "name": "Airport2",
- "attributes": [
- { "name": "city", "type": "string" },
- { "name": "vip", "type": "bool" },
- { "name": "state", "type": "string" }
- ]
- },
- {
- "name": "Plane",
- "attributes": [
- { "name": "type", "type": "string" },
- { "name": "maxFuelCapacity", "type": "int" }
- ]
- },
- { "name": "Staff", "attributes": [] }
- ],
- "edges": [
- {
- "name": "Airport2:Airport",
- "from": "Airport2",
- "to": "Airport",
- "collection": "flights",
- "attributes": [
- { "name": "arrivalTime", "type": "int" },
- { "name": "departureTime", "type": "int" }
- ]
- },
- {
- "name": "Airport:Staff",
- "from": "Airport",
- "to": "Staff",
- "collection": "flights",
- "attributes": [{ "name": "salary", "type": "int" }]
- },
- {
- "name": "Plane:Airport",
- "from": "Plane",
- "to": "Airport",
- "collection": "flights",
- "attributes": []
- },
- {
- "name": "Airport:Thijs",
- "from": "Airport",
- "to": "Thijs",
- "collection": "flights",
- "attributes": [{ "name": "hallo", "type": "string" }]
- },
- {
- "name": "Thijs:Airport",
- "from": "Thijs",
- "to": "Airport",
- "collection": "flights",
- "attributes": [{ "name": "hallo", "type": "string" }]
- },
- {
- "name": "Staff:Plane",
- "from": "Staff",
- "to": "Plane",
- "collection": "flights",
- "attributes": [{ "name": "hallo", "type": "string" }]
- },
- {
- "name": "Staff:Airport2",
- "from": "Staff",
- "to": "Airport2",
- "collection": "flights",
- "attributes": [{ "name": "hallo", "type": "string" }]
- },
- {
- "name": "Airport2:Plane",
- "from": "Airport2",
- "to": "Plane",
- "collection": "flights",
- "attributes": [{ "name": "hallo", "type": "string" }]
- },
-
- {
- "name": "Airport:Airport",
- "from": "Airport",
- "to": "Airport",
- "collection": "flights",
- "attributes": [{ "name": "test", "type": "string" }]
- }
- ]
-}
diff --git a/libs/shared/mock-data/src/schema/simpleRaw.ts b/libs/shared/mock-data/src/schema/simpleRaw.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e8fee0ca1eea766231f802433ee7f52ecd7b273d
--- /dev/null
+++ b/libs/shared/mock-data/src/schema/simpleRaw.ts
@@ -0,0 +1,108 @@
+import { SchemaUtils } from '@graphpolaris/schema-utils';
+import { SchemaFromBackend } from '@graphpolaris/models';
+
+export const simpleSchemaRaw = {
+ nodes: [
+ {
+ name: 'Thijs',
+ attributes: [],
+ },
+ {
+ name: 'Airport',
+ attributes: [
+ { name: 'city', type: 'string' },
+ { name: 'vip', type: 'bool' },
+ { name: 'state', type: 'string' },
+ ],
+ },
+ {
+ name: 'Airport2',
+ attributes: [
+ { name: 'city', type: 'string' },
+ { name: 'vip', type: 'bool' },
+ { name: 'state', type: 'string' },
+ ],
+ },
+ {
+ name: 'Plane',
+ attributes: [
+ { name: 'type', type: 'string' },
+ { name: 'maxFuelCapacity', type: 'int' },
+ ],
+ },
+ { name: 'Staff', attributes: [] },
+ ],
+ edges: [
+ {
+ name: 'Airport2:Airport',
+ from: 'Airport2',
+ to: 'Airport',
+ collection: 'flights',
+ attributes: [
+ { name: 'arrivalTime', type: 'int' },
+ { name: 'departureTime', type: 'int' },
+ ],
+ },
+ {
+ name: 'Airport:Staff',
+ from: 'Airport',
+ to: 'Staff',
+ collection: 'flights',
+ attributes: [{ name: 'salary', type: 'int' }],
+ },
+ {
+ name: 'Plane:Airport',
+ from: 'Plane',
+ to: 'Airport',
+ collection: 'flights',
+ attributes: [],
+ },
+ {
+ name: 'Airport:Thijs',
+ from: 'Airport',
+ to: 'Thijs',
+ collection: 'flights',
+ attributes: [{ name: 'hallo', type: 'string' }],
+ },
+ {
+ name: 'Thijs:Airport',
+ from: 'Thijs',
+ to: 'Airport',
+ collection: 'flights',
+ attributes: [{ name: 'hallo', type: 'string' }],
+ },
+ {
+ name: 'Staff:Plane',
+ from: 'Staff',
+ to: 'Plane',
+ collection: 'flights',
+ attributes: [{ name: 'hallo', type: 'string' }],
+ },
+ {
+ name: 'Staff:Airport2',
+ from: 'Staff',
+ to: 'Airport2',
+ collection: 'flights',
+ attributes: [{ name: 'hallo', type: 'string' }],
+ },
+ {
+ name: 'Airport2:Plane',
+ from: 'Airport2',
+ to: 'Plane',
+ collection: 'flights',
+ attributes: [{ name: 'hallo', type: 'string' }],
+ },
+
+ {
+ name: 'Airport:Airport',
+ from: 'Airport',
+ to: 'Airport',
+ collection: 'flights',
+ attributes: [{ name: 'test', type: 'string' }],
+ },
+ ],
+};
+
+export const simpleSchema = SchemaUtils.ParseSchemaFromBackend(
+ simpleSchemaRaw as SchemaFromBackend
+);
diff --git a/libs/shared/mock-data/src/schema/twitterSchema.ts b/libs/shared/mock-data/src/schema/twitterSchemaRaw.ts
similarity index 95%
rename from libs/shared/mock-data/src/schema/twitterSchema.ts
rename to libs/shared/mock-data/src/schema/twitterSchemaRaw.ts
index 98a73b9ab4ee84b24275a65c647d26e15612e7cb..ba922222c3fa2d9600f1318649ae59c7d0033f90 100644
--- a/libs/shared/mock-data/src/schema/twitterSchema.ts
+++ b/libs/shared/mock-data/src/schema/twitterSchemaRaw.ts
@@ -1,4 +1,7 @@
-export const twitterSchema = {
+import { SchemaUtils } from '@graphpolaris/schema-utils';
+import { SchemaFromBackend } from 'libs/shared/models/src';
+
+export const twitterSchemaRaw = {
nodes: [
{
name: 'Me',
@@ -311,3 +314,7 @@ export const twitterSchema = {
},
],
};
+
+export const twitterSchema = SchemaUtils.ParseSchemaFromBackend(
+ twitterSchemaRaw as SchemaFromBackend
+);
diff --git a/libs/shared/mock-data/tsconfig.spec.json b/libs/shared/mock-data/tsconfig.spec.json
index d8716fecfa3b7929f162b71e7a966c579a63c071..4afc999ad429eea63e777308527c4e8f629e4198 100644
--- a/libs/shared/mock-data/tsconfig.spec.json
+++ b/libs/shared/mock-data/tsconfig.spec.json
@@ -3,7 +3,8 @@
"compilerOptions": {
"outDir": "../../../dist/out-tsc",
"module": "commonjs",
- "types": ["jest", "node"]
+ "types": ["jest", "node"],
+ "composite": true
},
"include": [
"**/*.test.ts",
diff --git a/libs/shared/models/.babelrc b/libs/shared/models/.babelrc
new file mode 100644
index 0000000000000000000000000000000000000000..ccae900be42788285eb6e1b3a2af4b81f56f14fe
--- /dev/null
+++ b/libs/shared/models/.babelrc
@@ -0,0 +1,12 @@
+{
+ "presets": [
+ [
+ "@nrwl/react/babel",
+ {
+ "runtime": "automatic",
+ "useBuiltIns": "usage"
+ }
+ ]
+ ],
+ "plugins": []
+}
diff --git a/libs/shared/models/.eslintrc.json b/libs/shared/models/.eslintrc.json
new file mode 100644
index 0000000000000000000000000000000000000000..50e59482cfd41dfef0c19bd2027efcfb182f6bc2
--- /dev/null
+++ b/libs/shared/models/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+ "extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"],
+ "ignorePatterns": ["!**/*"],
+ "overrides": [
+ {
+ "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.ts", "*.tsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.js", "*.jsx"],
+ "rules": {}
+ }
+ ]
+}
diff --git a/libs/shared/models/.gitignore b/libs/shared/models/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4eb78c54b0e23b5fdb84ed6c7bc5534217836b58
--- /dev/null
+++ b/libs/shared/models/.gitignore
@@ -0,0 +1,145 @@
+
+# Created by https://www.toptal.com/developers/gitignore/api/node
+# Edit at https://www.toptal.com/developers/gitignore?templates=node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+### Node Patch ###
+# Serverless Webpack directories
+.webpack/
+
+# Optional stylelint cache
+
+# SvelteKit build / generate output
+.svelte-kit
+
+# End of https://www.toptal.com/developers/gitignore/api/node
\ No newline at end of file
diff --git a/libs/shared/models/README.md b/libs/shared/models/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ec693074dd1c5faa437707045ccc5396f8cf6544
--- /dev/null
+++ b/libs/shared/models/README.md
@@ -0,0 +1,7 @@
+# shared-models
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test shared-models` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/shared/models/jest.config.js b/libs/shared/models/jest.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..67188b1bbb706872be6261eb30de2be67e54167d
--- /dev/null
+++ b/libs/shared/models/jest.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+ displayName: 'shared-models',
+ preset: '../../../jest.preset.js',
+ transform: {
+ '^.+\\.[tj]sx?$': 'babel-jest',
+ },
+ moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+ coverageDirectory: '../../../coverage/libs/shared/models',
+};
diff --git a/libs/shared/models/package.json b/libs/shared/models/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..19f478f8b79a11a627b55297a3d2cd190048977f
--- /dev/null
+++ b/libs/shared/models/package.json
@@ -0,0 +1,4 @@
+{
+ "name": "@graphpolaris/models",
+ "version": "0.0.1"
+}
diff --git a/libs/shared/models/project.json b/libs/shared/models/project.json
new file mode 100644
index 0000000000000000000000000000000000000000..16ea9e35534ac1536ac3ddc08b0ddfde33691e94
--- /dev/null
+++ b/libs/shared/models/project.json
@@ -0,0 +1,43 @@
+{
+ "root": "libs/shared/models",
+ "sourceRoot": "libs/shared/models/src",
+ "projectType": "library",
+ "tags": [],
+ "targets": {
+ "build": {
+ "executor": "@nrwl/web:rollup",
+ "outputs": ["{options.outputPath}"],
+ "options": {
+ "outputPath": "dist/libs/shared/models",
+ "tsConfig": "libs/shared/models/tsconfig.lib.json",
+ "project": "libs/shared/models/package.json",
+ "entryFile": "libs/shared/models/src/index.ts",
+ "external": ["react/jsx-runtime"],
+ "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
+ "compiler": "babel",
+ "assets": [
+ {
+ "glob": "libs/shared/models/README.md",
+ "input": ".",
+ "output": "."
+ }
+ ]
+ }
+ },
+ "lint": {
+ "executor": "@nrwl/linter:eslint",
+ "outputs": ["{options.outputFile}"],
+ "options": {
+ "lintFilePatterns": ["libs/shared/models/**/*.{ts,tsx,js,jsx}"]
+ }
+ },
+ "test": {
+ "executor": "@nrwl/jest:jest",
+ "outputs": ["coverage/libs/shared/models"],
+ "options": {
+ "jestConfig": "libs/shared/models/jest.config.js",
+ "passWithNoTests": true
+ }
+ }
+ }
+}
diff --git a/libs/shared/models/src/index.ts b/libs/shared/models/src/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..11a865736e6ed5d85963d39e8b33bc7803c1df0f
--- /dev/null
+++ b/libs/shared/models/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/shared-models';
diff --git a/libs/shared/models/src/lib/shared-models.spec.ts b/libs/shared/models/src/lib/shared-models.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..08a29a089432208f807f885f6069ae25f8b6201e
--- /dev/null
+++ b/libs/shared/models/src/lib/shared-models.spec.ts
@@ -0,0 +1,7 @@
+
+
+describe('SharedModels', () => {
+ it('should render successfully', () => {
+ expect(true).toBeTruthy();
+ });
+});
diff --git a/libs/shared/models/src/lib/shared-models.ts b/libs/shared/models/src/lib/shared-models.ts
new file mode 100644
index 0000000000000000000000000000000000000000..b54d87d4913348e49d02d2531e0eb018b9397b16
--- /dev/null
+++ b/libs/shared/models/src/lib/shared-models.ts
@@ -0,0 +1,27 @@
+/*************** schema format from the backend *************** */
+/** Schema type, consist of nodes and edges */
+export type SchemaFromBackend = {
+ edges: Edge[];
+ nodes: Node[];
+};
+
+/** Attribute type, consist of a name */
+export type Attribute = {
+ name: string;
+ type: 'string' | 'int' | 'bool' | 'float';
+};
+
+/** Node type, consist of a name and a list of attributes */
+export type Node = {
+ name: string;
+ attributes: Attribute[];
+};
+
+/** Edge type, consist of a name, start point, end point and a list of attributes */
+export type Edge = {
+ name: string;
+ to: string;
+ from: string;
+ collection: string;
+ attributes: Attribute[];
+};
\ No newline at end of file
diff --git a/libs/shared/models/tsconfig.json b/libs/shared/models/tsconfig.json
new file mode 100644
index 0000000000000000000000000000000000000000..4b421814593c06b901b07a205f079cc08998a1e0
--- /dev/null
+++ b/libs/shared/models/tsconfig.json
@@ -0,0 +1,25 @@
+{
+ "extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "jsx": "react-jsx",
+ "allowJs": true,
+ "esModuleInterop": true,
+ "allowSyntheticDefaultImports": true,
+ "forceConsistentCasingInFileNames": true,
+ "strict": true,
+ "noImplicitOverride": true,
+ "noPropertyAccessFromIndexSignature": true,
+ "noImplicitReturns": true,
+ "noFallthroughCasesInSwitch": true
+ },
+ "files": [],
+ "include": [],
+ "references": [
+ {
+ "path": "./tsconfig.lib.json"
+ },
+ {
+ "path": "./tsconfig.spec.json"
+ }
+ ]
+}
diff --git a/libs/shared/models/tsconfig.lib.json b/libs/shared/models/tsconfig.lib.json
new file mode 100644
index 0000000000000000000000000000000000000000..36549a100ee959618b742d13c61bd6b40af0f53a
--- /dev/null
+++ b/libs/shared/models/tsconfig.lib.json
@@ -0,0 +1,24 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../../dist/out-tsc",
+ "declaration": true,
+ "types": [],
+ "composite": true
+ },
+ "files": [
+ "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+ "../../../node_modules/@nrwl/react/typings/image.d.ts"
+ ],
+ "exclude": [
+ "**/*.spec.ts",
+ "**/*.test.ts",
+ "**/*.spec.tsx",
+ "**/*.test.tsx",
+ "**/*.spec.js",
+ "**/*.test.js",
+ "**/*.spec.jsx",
+ "**/*.test.jsx"
+ ],
+ "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
diff --git a/libs/shared/models/tsconfig.spec.json b/libs/shared/models/tsconfig.spec.json
new file mode 100644
index 0000000000000000000000000000000000000000..d8716fecfa3b7929f162b71e7a966c579a63c071
--- /dev/null
+++ b/libs/shared/models/tsconfig.spec.json
@@ -0,0 +1,19 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../../dist/out-tsc",
+ "module": "commonjs",
+ "types": ["jest", "node"]
+ },
+ "include": [
+ "**/*.test.ts",
+ "**/*.spec.ts",
+ "**/*.test.tsx",
+ "**/*.spec.tsx",
+ "**/*.test.js",
+ "**/*.spec.js",
+ "**/*.test.jsx",
+ "**/*.spec.jsx",
+ "**/*.d.ts"
+ ]
+}
diff --git a/libs/shared/schema-utils/.babelrc b/libs/shared/schema-utils/.babelrc
new file mode 100644
index 0000000000000000000000000000000000000000..ccae900be42788285eb6e1b3a2af4b81f56f14fe
--- /dev/null
+++ b/libs/shared/schema-utils/.babelrc
@@ -0,0 +1,12 @@
+{
+ "presets": [
+ [
+ "@nrwl/react/babel",
+ {
+ "runtime": "automatic",
+ "useBuiltIns": "usage"
+ }
+ ]
+ ],
+ "plugins": []
+}
diff --git a/libs/shared/schema-utils/.eslintrc.json b/libs/shared/schema-utils/.eslintrc.json
new file mode 100644
index 0000000000000000000000000000000000000000..50e59482cfd41dfef0c19bd2027efcfb182f6bc2
--- /dev/null
+++ b/libs/shared/schema-utils/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+ "extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"],
+ "ignorePatterns": ["!**/*"],
+ "overrides": [
+ {
+ "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.ts", "*.tsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.js", "*.jsx"],
+ "rules": {}
+ }
+ ]
+}
diff --git a/libs/shared/schema-utils/.gitignore b/libs/shared/schema-utils/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4eb78c54b0e23b5fdb84ed6c7bc5534217836b58
--- /dev/null
+++ b/libs/shared/schema-utils/.gitignore
@@ -0,0 +1,145 @@
+
+# Created by https://www.toptal.com/developers/gitignore/api/node
+# Edit at https://www.toptal.com/developers/gitignore?templates=node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+### Node Patch ###
+# Serverless Webpack directories
+.webpack/
+
+# Optional stylelint cache
+
+# SvelteKit build / generate output
+.svelte-kit
+
+# End of https://www.toptal.com/developers/gitignore/api/node
\ No newline at end of file
diff --git a/libs/shared/schema-utils/README.md b/libs/shared/schema-utils/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..99b8629120ccc1f0dafb2ac461ff40de9d45f654
--- /dev/null
+++ b/libs/shared/schema-utils/README.md
@@ -0,0 +1,7 @@
+# shared-schema-utils
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test shared-schema-utils` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/shared/schema-utils/jest.config.js b/libs/shared/schema-utils/jest.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..e351d1abc92c54e097dfd6e58aa1610a9f33c846
--- /dev/null
+++ b/libs/shared/schema-utils/jest.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+ displayName: 'shared-schema-utils',
+ preset: '../../../jest.preset.js',
+ transform: {
+ '^.+\\.[tj]sx?$': 'babel-jest',
+ },
+ moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+ coverageDirectory: '../../../coverage/libs/shared/schema-utils',
+};
diff --git a/libs/shared/schema-utils/package.json b/libs/shared/schema-utils/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..72dadd855d67b38ba862216d0180ffe6626ceabc
--- /dev/null
+++ b/libs/shared/schema-utils/package.json
@@ -0,0 +1,4 @@
+{
+ "name": "@graphpolaris/schema-utils",
+ "version": "0.0.1"
+}
diff --git a/libs/shared/schema-utils/project.json b/libs/shared/schema-utils/project.json
new file mode 100644
index 0000000000000000000000000000000000000000..2414f349be5dbc92606704d842ba58a33e9240c2
--- /dev/null
+++ b/libs/shared/schema-utils/project.json
@@ -0,0 +1,43 @@
+{
+ "root": "libs/shared/schema-utils",
+ "sourceRoot": "libs/shared/schema-utils/src",
+ "projectType": "library",
+ "tags": [],
+ "targets": {
+ "build": {
+ "executor": "@nrwl/web:rollup",
+ "outputs": ["{options.outputPath}"],
+ "options": {
+ "outputPath": "dist/libs/shared/schema-utils",
+ "tsConfig": "libs/shared/schema-utils/tsconfig.lib.json",
+ "project": "libs/shared/schema-utils/package.json",
+ "entryFile": "libs/shared/schema-utils/src/index.ts",
+ "external": ["react/jsx-runtime"],
+ "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
+ "compiler": "babel",
+ "assets": [
+ {
+ "glob": "libs/shared/schema-utils/README.md",
+ "input": ".",
+ "output": "."
+ }
+ ]
+ }
+ },
+ "lint": {
+ "executor": "@nrwl/linter:eslint",
+ "outputs": ["{options.outputFile}"],
+ "options": {
+ "lintFilePatterns": ["libs/shared/schema-utils/**/*.{ts,tsx,js,jsx}"]
+ }
+ },
+ "test": {
+ "executor": "@nrwl/jest:jest",
+ "outputs": ["coverage/libs/shared/schema-utils"],
+ "options": {
+ "jestConfig": "libs/shared/schema-utils/jest.config.js",
+ "passWithNoTests": true
+ }
+ }
+ }
+}
diff --git a/libs/shared/schema-utils/src/index.ts b/libs/shared/schema-utils/src/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..70bd0a41b24658ef1f5a4223f3172bc62f69aa25
--- /dev/null
+++ b/libs/shared/schema-utils/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/schema-utils';
diff --git a/libs/shared/schema-utils/src/lib/schema-utils.spec.ts b/libs/shared/schema-utils/src/lib/schema-utils.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..21f5c4cda1dd36bf007886829531eb8b8a3ff978
--- /dev/null
+++ b/libs/shared/schema-utils/src/lib/schema-utils.spec.ts
@@ -0,0 +1,10 @@
+import { SchemaFromBackend } from "@graphpolaris/shared/data-access/store";
+import { SchemaUtils } from "./schema-utils";
+
+describe('Schema Utils', () => {
+ it('should expose a class SchemaUtils', () => {
+ const clazz = new SchemaUtils()
+ expect(clazz);
+ });
+ });
+
\ No newline at end of file
diff --git a/libs/shared/schema-utils/src/lib/schema-utils.ts b/libs/shared/schema-utils/src/lib/schema-utils.ts
new file mode 100644
index 0000000000000000000000000000000000000000..0ca15baedb7cdbe011e12d9eaf688c0fa23a73ed
--- /dev/null
+++ b/libs/shared/schema-utils/src/lib/schema-utils.ts
@@ -0,0 +1,34 @@
+import { SchemaFromBackend, Node, Edge } from '@graphpolaris/models';
+import Graph, { MultiGraph } from 'graphology';
+
+export class SchemaUtils {
+ public static ParseSchemaFromBackend(
+ schemaFromBackend: SchemaFromBackend
+ ): Graph {
+ const { nodes, edges } = schemaFromBackend;
+ // Instantiate a directed graph that allows self loops and parallel edges
+ const schemaGraph = new MultiGraph({ allowSelfLoops: true });
+ // console.log('parsing schema');
+ // The graph schema needs a node for each node AND edge. These need then be connected
+
+ nodes.forEach((node: Node) => {
+ schemaGraph.addNode(node.name, {
+ name: node.name,
+ attributes: node.attributes,
+ x: 0,
+ y: 0,
+ });
+ });
+
+ // The name of the edge will be name + from + to, since edge names are not unique
+ edges.forEach((edge: Edge) => {
+ const edgeID = [edge.name, '_', edge.from, edge.to].join(''); //ensure that all interpreted as string
+
+ // This node is the actual edge
+ schemaGraph.addDirectedEdgeWithKey(edgeID, edge.from, edge.to, {
+ attribute: edge.attributes,
+ });
+ });
+ return schemaGraph;
+ }
+}
diff --git a/libs/shared/schema-utils/tsconfig.json b/libs/shared/schema-utils/tsconfig.json
new file mode 100644
index 0000000000000000000000000000000000000000..4b421814593c06b901b07a205f079cc08998a1e0
--- /dev/null
+++ b/libs/shared/schema-utils/tsconfig.json
@@ -0,0 +1,25 @@
+{
+ "extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "jsx": "react-jsx",
+ "allowJs": true,
+ "esModuleInterop": true,
+ "allowSyntheticDefaultImports": true,
+ "forceConsistentCasingInFileNames": true,
+ "strict": true,
+ "noImplicitOverride": true,
+ "noPropertyAccessFromIndexSignature": true,
+ "noImplicitReturns": true,
+ "noFallthroughCasesInSwitch": true
+ },
+ "files": [],
+ "include": [],
+ "references": [
+ {
+ "path": "./tsconfig.lib.json"
+ },
+ {
+ "path": "./tsconfig.spec.json"
+ }
+ ]
+}
diff --git a/libs/shared/schema-utils/tsconfig.lib.json b/libs/shared/schema-utils/tsconfig.lib.json
new file mode 100644
index 0000000000000000000000000000000000000000..9c1ac43e8efdd93ba3faef900cc1ececbf0a8eb0
--- /dev/null
+++ b/libs/shared/schema-utils/tsconfig.lib.json
@@ -0,0 +1,22 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../../dist/out-tsc",
+ "types": ["node"]
+ },
+ "files": [
+ "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+ "../../../node_modules/@nrwl/react/typings/image.d.ts"
+ ],
+ "exclude": [
+ "**/*.spec.ts",
+ "**/*.test.ts",
+ "**/*.spec.tsx",
+ "**/*.test.tsx",
+ "**/*.spec.js",
+ "**/*.test.js",
+ "**/*.spec.jsx",
+ "**/*.test.jsx"
+ ],
+ "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
diff --git a/libs/shared/schema-utils/tsconfig.spec.json b/libs/shared/schema-utils/tsconfig.spec.json
new file mode 100644
index 0000000000000000000000000000000000000000..d8716fecfa3b7929f162b71e7a966c579a63c071
--- /dev/null
+++ b/libs/shared/schema-utils/tsconfig.spec.json
@@ -0,0 +1,19 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../../dist/out-tsc",
+ "module": "commonjs",
+ "types": ["jest", "node"]
+ },
+ "include": [
+ "**/*.test.ts",
+ "**/*.spec.ts",
+ "**/*.test.tsx",
+ "**/*.spec.tsx",
+ "**/*.test.js",
+ "**/*.spec.js",
+ "**/*.test.jsx",
+ "**/*.spec.jsx",
+ "**/*.d.ts"
+ ]
+}
diff --git a/package.json b/package.json
index c2b43c2452294a12e6053120ac79ca0192cbcff7..910a0f4083e87cea15b91f10f3475dcdcde43e50 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
"start": "nx serve",
"build": "nx build",
"test": "nx test",
+ "test:all": "nx affected:test --all --codeCoverage --skip-nx-cache",
"prepare": "husky install"
},
"private": true,
@@ -21,7 +22,6 @@
"core-js": "^3.6.5",
"cytoscape": "^3.21.0",
"graphology": "^0.24.0",
- "graphology-library": "^0.7.1",
"graphology-types": "^0.24.0",
"react": "17.0.2",
"react-cookie": "^4.1.1",
@@ -36,8 +36,6 @@
},
"devDependencies": {
"@babel/core": "7.12.13",
- "@babel/plugin-syntax-flow": "^7.16.7",
- "@babel/preset-flow": "^7.16.7",
"@babel/preset-typescript": "7.12.13",
"@commitlint/cli": "^16.0.1",
"@commitlint/config-angular": "^16.0.0",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index f20c2ad210e208b714d8293de109fea2cae4171e..7a399ebf1769e00e2136b3160fbb57ad1ccd3f1a 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -15,8 +15,12 @@
"skipDefaultLibCheck": true,
"baseUrl": ".",
"paths": {
- "@graphpolaris/schema/schema-usecases": [
- "libs/schema/schema-usecases/src/index.ts"
+ "@graphpolaris/graph-layout": ["libs/shared/graph-layout/src/index.ts"],
+ "@graphpolaris/models": ["libs/shared/models/src/index.ts"],
+ "@graphpolaris/schema-utils": ["libs/shared/schema-utils/src/index.ts"],
+ "@graphpolaris/schema/usecases": ["libs/schema/usecases/src/index.ts"],
+ "@graphpolaris/shared/data-access/api": [
+ "libs/shared/data-access/api/src/index.ts"
],
"@graphpolaris/shared/data-access/authorization": [
"libs/shared/data-access/authorization/src/index.ts"
@@ -28,10 +32,6 @@
"libs/shared/data-access/theme/src/index.ts"
],
"@graphpolaris/shared/mock-data": ["libs/shared/mock-data/src/index.ts"],
- "@graphpolaris/shared/graph-layout": [
- "libs/shared/graph-layout/src/index.ts"
- ],
-
"@mui/styled-engine": ["./node_modules/@mui/styled-engine-sc"]
}
},
diff --git a/workspace.json b/workspace.json
index 97e8805f921e5c0d0d72f6684fca76a56c42603d..4b974196b33da4ad2e075a2a3bc4317db624ffa1 100644
--- a/workspace.json
+++ b/workspace.json
@@ -1,12 +1,16 @@
{
"version": 2,
"projects": {
- "schema-schema-usecases": "libs/schema/schema-usecases",
+ "schema-usecases": "libs/schema/usecases",
+ "shared-data-access-api": "libs/shared/data-access/api",
+ "shared-data-access-authorization": "libs/shared/data-access/authorization",
"shared-data-access-store": "libs/shared/data-access/store",
"shared-data-access-theme": "libs/shared/data-access/theme",
+ "shared-graph-layout": "libs/shared/graph-layout",
"shared-mock-data": "libs/shared/mock-data",
+ "shared-models": "libs/shared/models",
+ "shared-schema-utils": "libs/shared/schema-utils",
"web-graphpolaris": "apps/web-graphpolaris",
- "web-graphpolaris-e2e": "apps/web-graphpolaris-e2e",
- "shared-data-access-authorization": "libs/shared/data-access/authorization"
+ "web-graphpolaris-e2e": "apps/web-graphpolaris-e2e"
}
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 898701c938019e6d0d43524054e9e1346a2d9c8d..3d6d637e556c329bdf8245c184f4c09526f253cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1133,7 +1133,7 @@
core-js-compat "^3.20.2"
semver "^6.3.0"
-"@babel/preset-flow@^7.12.1", "@babel/preset-flow@^7.16.7":
+"@babel/preset-flow@^7.12.1":
version "7.16.7"
resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.16.7.tgz#7fd831323ab25eeba6e4b77a589f680e30581cbd"
integrity sha512-6ceP7IyZdUYQ3wUVqyRSQXztd1YmFHWI4Xv11MIqAlE4WqxBSd/FZ61V9k+TS5Gd4mkHOtQtPp9ymRpxH4y1Ug==
@@ -4929,11 +4929,6 @@
"@webassemblyjs/wast-parser" "1.9.0"
"@xtuc/long" "4.2.2"
-"@xmldom/xmldom@^0.7.5":
- version "0.7.5"
- resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d"
- integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==
-
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -4954,11 +4949,6 @@
tslib "^2.3.1"
upath2 "^3.1.12"
-"@yomguithereal/helpers@^1.1.1":
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/@yomguithereal/helpers/-/helpers-1.1.1.tgz#185dfb0f88ca2beec53d0adf6eed15c33b1c549d"
- integrity sha512-UYvAq/XCA7xoh1juWDYsq3W0WywOB+pz8cgVnE1b45ZfdMhBvHDrgmSFG3jXeZSr2tMTYLGHFHON+ekG05Jebg==
-
JSONStream@^1.0.4:
version "1.3.5"
resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -9577,185 +9567,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
-graphology-assertions@~2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/graphology-assertions/-/graphology-assertions-2.2.1.tgz#2fdc64a26434a2aac2de3d6d4ef889a0005ff379"
- integrity sha512-X6yvm8eYDepIyywDM/K0ud/NDD6I5aZj5+D459z4wZFEtb8B33A4NNPsMpjMNwjNdEo1q4VL1Gqp/usoItEP4g==
- dependencies:
- fast-deep-equal "^3.1.3"
- graphology-utils "^2.1.2"
-
-graphology-communities-louvain@~2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/graphology-communities-louvain/-/graphology-communities-louvain-2.0.0.tgz#ef93a89e0122078ce77676f5351731ee7eb58df9"
- integrity sha512-zHqfPBh43XHs5Pp/u2XwdXrPmMLGBEdlgXqciowpa/dsD/VOC7pnD9HquJ3dGuLa2V2cdUAesOehFDb2M7soeA==
- dependencies:
- graphology-indices "^0.16.4"
- graphology-utils "^2.4.4"
- mnemonist "^0.39.0"
- pandemonium "^2.3.0"
-
-graphology-components@~1.5.2:
- version "1.5.2"
- resolved "https://registry.yarnpkg.com/graphology-components/-/graphology-components-1.5.2.tgz#a2bdf0f3e09eee1e3d5913a95442cadcd74b912f"
- integrity sha512-EW26mjHWX9sggUhZcW1OHsOnEV7lj0nx50mcEHFRNucC3MBoe4yDYtBY8HQqUcGH4FdEq0ukNzzweJGLiy58Tg==
- dependencies:
- graphology-indices "^0.16.2"
- graphology-utils "^2.1.2"
-
-graphology-generators@~0.11.2:
- version "0.11.2"
- resolved "https://registry.yarnpkg.com/graphology-generators/-/graphology-generators-0.11.2.tgz#eff2c97e4f5bf401e86ab045470dded95f2ebe24"
- integrity sha512-hx+F0OZRkVdoQ0B1tWrpxoakmHZNex0c6RAoR0PrqJ+6fz/gz6CQ88Qlw78C6yD9nlZVRgepIoDYhRTFV+bEHg==
- dependencies:
- graphology-metrics "^2.0.0"
- graphology-utils "^2.3.0"
-
-graphology-gexf@~0.10.1:
- version "0.10.1"
- resolved "https://registry.yarnpkg.com/graphology-gexf/-/graphology-gexf-0.10.1.tgz#55165379945bc5e1435ab8c12cb51052792c8d58"
- integrity sha512-vNBn5eVOWRSiedwAFVBehuA0KxzOzorBMvRW2md01UZcaVVh0BRzB6uFEB6+QHmdRqtpewhCQ6RQUifQ8r7btg==
- dependencies:
- "@xmldom/xmldom" "^0.7.5"
- graphology-operators "^1.5.0"
- graphology-utils "^2.4.1"
- xml-writer "^1.7.0"
-
-graphology-graphml@^0.5.0:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/graphology-graphml/-/graphology-graphml-0.5.1.tgz#d6573694b16e8daecb3fd33196daf21a92fafa51"
- integrity sha512-h2bpxlMtSC5lxQuv53r2i4sGqapAmeGUsfjbPmIH1v+y2BiEq4kLbqZuE1JKTD5oXQJeSsHksXKhN8pMGXOnxQ==
- dependencies:
- "@xmldom/xmldom" "^0.7.5"
- graphology-operators "^1.5.0"
- graphology-utils "^2.4.1"
- xml-writer "^1.7.0"
-
-graphology-indices@^0.16.2, graphology-indices@^0.16.3, graphology-indices@^0.16.4:
- version "0.16.6"
- resolved "https://registry.yarnpkg.com/graphology-indices/-/graphology-indices-0.16.6.tgz#0de112ef0367e44041490933e34ad2075cb24e80"
- integrity sha512-tozTirLb7pd37wULJ5qeIZfZqKuVln/V+bWmUWJ7MmoTU8YkW5dehOkRz2by/O+5MdJ52imqL8LH4+GCd0yEVw==
- dependencies:
- graphology-utils "^2.4.2"
- mnemonist "^0.39.0"
-
-graphology-layout-force@~0.2.3:
- version "0.2.4"
- resolved "https://registry.yarnpkg.com/graphology-layout-force/-/graphology-layout-force-0.2.4.tgz#a9b5f2aa5c7b56985503d302dbce4c73c76b9eb3"
- integrity sha512-NYZz0YAnDkn5pkm30cvB0IScFoWGtbzJMrqaiH070dYlYJiag12Oc89dbVfaMaVR/w8DMIKxn/ix9Bqj+Umm9Q==
- dependencies:
- graphology-utils "^2.4.2"
-
-graphology-layout-forceatlas2@~0.8.1:
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/graphology-layout-forceatlas2/-/graphology-layout-forceatlas2-0.8.1.tgz#bb6f34f5181616bb25ea7a8adec73c79aef2aa8d"
- integrity sha512-lAm9T0uBxhECZTVyYDMMnPi3l7h5kG2+7yfxqoT9wpgF/omComGc6vR9wmQqClQjSXiM3OU4frO4j2Il5E72Xg==
- dependencies:
- graphology-utils "^2.1.0"
-
-graphology-layout-noverlap@^0.4.1:
- version "0.4.2"
- resolved "https://registry.yarnpkg.com/graphology-layout-noverlap/-/graphology-layout-noverlap-0.4.2.tgz#2ffa054ceeebaa31fcffe695d271fc55707cd29c"
- integrity sha512-13WwZSx96zim6l1dfZONcqLh3oqyRcjIBsqz2c2iJ3ohgs3605IDWjldH41Gnhh462xGB1j6VGmuGhZ2FKISXA==
- dependencies:
- graphology-utils "^2.3.0"
-
-graphology-layout@~0.5.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/graphology-layout/-/graphology-layout-0.5.0.tgz#a0a54861cebae5f486c778dbdafc6294859f23b5"
- integrity sha512-aIeXYPLeGMLvXIkO41TlhBv0ROFWUx1bqR2VQoJ7Mp2IW+TF+rxqMeRUrmyLHoe3HtKo8jhloB2KHp7g6fcDSg==
- dependencies:
- graphology-utils "^2.3.0"
- pandemonium "^1.5.0"
-
-graphology-library@^0.7.1:
- version "0.7.1"
- resolved "https://registry.yarnpkg.com/graphology-library/-/graphology-library-0.7.1.tgz#9fdec0f6d00f5207895dc9b7e299e454bb3c52f8"
- integrity sha512-pKqaMiuKNAaVwYQAL9I3EVADYOh1tcWe1NfxzmoSGWLYdHvalNGAI+c63Wd4DG021He2YUYR6yB5gtccqVUS3Q==
- dependencies:
- graphology-assertions "~2.2.1"
- graphology-communities-louvain "~2.0.0"
- graphology-components "~1.5.2"
- graphology-generators "~0.11.2"
- graphology-gexf "~0.10.1"
- graphology-graphml "^0.5.0"
- graphology-layout "~0.5.0"
- graphology-layout-force "~0.2.3"
- graphology-layout-forceatlas2 "~0.8.1"
- graphology-layout-noverlap "^0.4.1"
- graphology-metrics "~2.0.0"
- graphology-operators "~1.5.0"
- graphology-shortest-path "~2.0.0"
- graphology-simple-path "^0.1.2"
- graphology-traversal "^0.3.0"
- graphology-utils "~2.5.0"
-
-graphology-metrics@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/graphology-metrics/-/graphology-metrics-2.1.0.tgz#7d00bae92d8970583afd020e6d40d8a16c378002"
- integrity sha512-E+y4kgVGxhYl/+bPHEftJeWLS8LgVno4/Wvg+C7IoDIjY6OlIZghgMKDR8LKsxU6GC43mlx08FTZs229cvEkwQ==
- dependencies:
- graphology-shortest-path "^2.0.0"
- graphology-utils "^2.4.4"
- mnemonist "^0.39.0"
-
-graphology-metrics@~2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/graphology-metrics/-/graphology-metrics-2.0.0.tgz#af2bfcadd1d5842d14c9a6092175e22fbab7024f"
- integrity sha512-vh2XaAaiB9Of92ac2imaztFjPHmMIotuIN/rNt/X+DqJhxpuyOp+Ir3fQPVJScvk11zMWOimTsMdLYt1gbXWeQ==
- dependencies:
- graphology-shortest-path "^2.0.0"
- graphology-utils "^2.4.4"
- mnemonist "^0.39.0"
-
-graphology-operators@^1.5.0, graphology-operators@~1.5.0:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/graphology-operators/-/graphology-operators-1.5.1.tgz#67f4447df21baa59b571ab7a4c688a2302f9ce20"
- integrity sha512-VojhTwtKlGtbopHPzOmAsAgM8MJY1HScgAs3G8FobtI+xsSlnFSKQeuWIibXEg6/wwPHGYT2oxMJbgHcwAEr3Q==
- dependencies:
- graphology-utils "^2.0.0"
-
-graphology-shortest-path@^2.0.0, graphology-shortest-path@~2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/graphology-shortest-path/-/graphology-shortest-path-2.0.0.tgz#27a01b3a9980872bd44a197fc77114623dd2b302"
- integrity sha512-6dJWgbr7w4YQKb7Y0w7vhZn2qAkqP+J0IhE9F3vz/HZcx7VSOqnNfTGtYr44BQ5ohdXj0l9iKjlWCb+3vqEINQ==
- dependencies:
- "@yomguithereal/helpers" "^1.1.1"
- graphology-indices "^0.16.3"
- graphology-utils "^2.4.3"
- mnemonist "^0.39.0"
-
-graphology-simple-path@^0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/graphology-simple-path/-/graphology-simple-path-0.1.2.tgz#b8d84852c94a069a8e906faa5274d33df0a53419"
- integrity sha512-jOut2ihx5XMN97eUtmy4ZMp22btx3oa8GnvzQXHiBZOMyaC/gCpupnKVh0IvtzKd0RmmC5lT0zPBAqvU2O7Ejg==
- dependencies:
- graphology-utils "^1.8.0"
- mnemonist "^0.39.0"
-
-graphology-traversal@^0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/graphology-traversal/-/graphology-traversal-0.3.0.tgz#1045af9e35a86932bc964caf110b45338769cfcb"
- integrity sha512-/dexAoGbaRqmBMtv9IBXUuLZg7b5YBpWYXZYirwRaFX0DsQmsqMAJ+Jx0RQndQqLCOJI3LZyheemv3+tLlrjjQ==
- dependencies:
- graphology-indices "^0.16.4"
- graphology-utils "^2.0.0"
-
graphology-types@^0.24.0:
version "0.24.0"
resolved "https://registry.yarnpkg.com/graphology-types/-/graphology-types-0.24.0.tgz#81aaef55226edb692dd63a9ce5eaecc80694cd93"
integrity sha512-3qSanRtucm6rwBjpwuAc18GQcl68NqIRE4OA3wFUzdB2HRVXYoCAUsUJVS898bW+byEgd+BTcwR26CbltNvSWQ==
-graphology-utils@^1.8.0:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/graphology-utils/-/graphology-utils-1.8.0.tgz#41315c468656e2a3e028a76468bbc2fbe42b0145"
- integrity sha512-Pa7SW30OMm8fVtyH49b3GJ/uxlMHGfXly50wIhlcc7ZoX9ahZa7sPBz+obo4WZClrRV6wh3tIu0GJoI42eao1A==
-
-graphology-utils@^2.0.0, graphology-utils@^2.1.0, graphology-utils@^2.1.2, graphology-utils@^2.3.0, graphology-utils@^2.4.1, graphology-utils@^2.4.2, graphology-utils@^2.4.3, graphology-utils@^2.4.4, graphology-utils@~2.5.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/graphology-utils/-/graphology-utils-2.5.0.tgz#ccb0ec8231e4de403ed7a385644c911e40bc4833"
- integrity sha512-TmuBAoM1rZxWo3Wd7qC2Rhnu3KZwq8pWNgjWCFKubn3pt3a1Vh/k3CJaFw4G7k6Mvb6aSdWVYJnlGNThMl+bAQ==
-
graphology@^0.24.0:
version "0.24.0"
resolved "https://registry.yarnpkg.com/graphology/-/graphology-0.24.0.tgz#c3c78b197f8ff6d8d3422a2d705c16e637b295f6"
@@ -12468,13 +12284,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-mnemonist@^0.39.0:
- version "0.39.0"
- resolved "https://registry.yarnpkg.com/mnemonist/-/mnemonist-0.39.0.tgz#4c83dd22e8d9d05dfb721ff66a905fec4c460041"
- integrity sha512-7v08Ldk1lnlywnIShqfKYN7EW4WKLUnkoWApdmR47N1xA2xmEtWERfEvyRCepbuFCETG5OnfaGQpp/p4Bus6ZQ==
- dependencies:
- obliterator "^2.0.1"
-
modify-values@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
@@ -12892,7 +12701,7 @@ objectorarray@^1.0.5:
resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.5.tgz#2c05248bbefabd8f43ad13b41085951aac5e68a5"
integrity sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==
-obliterator@^2.0.1, obliterator@^2.0.2:
+obliterator@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/obliterator/-/obliterator-2.0.2.tgz#25f50dc92e1181371b9d8209d11890f1a3c2fc21"
integrity sha512-g0TrA7SbUggROhDPK8cEu/qpItwH2LSKcNl4tlfBNT54XY+nOsqrs0Q68h1V9b3HOSpIWv15jb1lax2hAggdIg==
@@ -13146,18 +12955,6 @@ pako@~1.0.5:
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
-pandemonium@^1.5.0:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/pandemonium/-/pandemonium-1.5.0.tgz#93f35af555de1420022b341e730215c51c725be3"
- integrity sha512-9PU9fy93rJhZHLMjX+4M1RwZPEYl6g7DdWKGmGNhkgBZR5+tOBVExNZc00kzdEGMxbaAvWdQy9MqGAScGwYlcA==
-
-pandemonium@^2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/pandemonium/-/pandemonium-2.3.0.tgz#d9c70686bb33c3ee4f435162601b0755a439bdcb"
- integrity sha512-/+5rFCn3npqNwAvhKOSRKwAnEWQeXH4xFuur7vWKlj5Z7AM2JNJt1tC2rptfm1M7t7OlXAyeBuRjspqe+gQGHA==
- dependencies:
- mnemonist "^0.39.0"
-
parallel-transform@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
@@ -17314,11 +17111,6 @@ xml-name-validator@^3.0.0:
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
-xml-writer@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/xml-writer/-/xml-writer-1.7.0.tgz#b76f1d591c16a2634ebdb703c7bdbd0fd6819065"
- integrity sha1-t28dWRwWomNOvbcDx729D9aBkGU=
-
xmlchars@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"