Skip to content

Commit

Permalink
[deps,refactor] Upd sparql client, refactor renderers
Browse files Browse the repository at this point in the history
  • Loading branch information
amivanoff committed Sep 9, 2021
1 parent 980c0ff commit e74168d
Show file tree
Hide file tree
Showing 5 changed files with 406 additions and 402 deletions.
4 changes: 2 additions & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"yzhang.markdown-all-in-one",
"joaompinto.asciidoctor-vscode",
"henoc.svgeditor",
"msjsdiag.debugger-for-chrome",
"cmstead.jsrefactor",
"eg2.vscode-npm-script",
"esbenp.prettier-vscode",
Expand All @@ -17,7 +16,8 @@
"vscode-icons-team.vscode-icons",
"syler.sass-indented",
"streetsidesoftware.code-spell-checker",
"streetsidesoftware.code-spell-checker-russian"
"streetsidesoftware.code-spell-checker-russian",
"github.vscode-pull-request-github"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": []
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"peerDependencies": {
"@agentlab/ldkg-ui-react": ">=0.1.12",
"@agentlab/sparql-jsld-client": ">=5.0.0-rc.11",
"@agentlab/sparql-jsld-client": ">=5.0.0-rc.12",
"@ant-design/icons": ">=4.6.4",
"@antv/hierarchy": "^0.6.8",
"@antv/layout": "^0.1.18",
Expand All @@ -60,7 +60,7 @@
},
"dependencies": {
"@agentlab/ldkg-ui-react": "^0.1.12",
"@agentlab/sparql-jsld-client": "^5.0.0-rc.11",
"@agentlab/sparql-jsld-client": "^5.0.0-rc.12",
"@antv/hierarchy": "^0.6.8",
"@antv/layout": "^0.1.18",
"@antv/x6": "^1.26.1",
Expand Down Expand Up @@ -93,15 +93,15 @@
"@types/jest": "^27.0.1",
"@types/jquery": "^3.5.6",
"@types/mathjs": "^9.4.2",
"@types/node": "^16.7.10",
"@typescript-eslint/eslint-plugin": "4.30.0",
"@typescript-eslint/parser": "^4.30.0",
"@types/node": "^16.9.0",
"@typescript-eslint/eslint-plugin": "4.31.0",
"@typescript-eslint/parser": "^4.31.0",
"autoprefixer": "^10.3.3",
"babel-loader": "^8.2.2",
"cross-env": "^7.0.3",
"css-loader": "^5.2.6",
"cssnano": "^5.0.6",
"cypress": "^8.2.0",
"cypress": "^8.3.1",
"cypress-storybook": "^0.5.1",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
Expand All @@ -115,14 +115,14 @@
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-react-hooks": "^4.2.0",
"husky": "^7.0.2",
"jest": "^27.1.0",
"jest": "^27.1.1",
"jest-watch-typeahead": "^0.6.4",
"lint-staged": "^11.1.2",
"mathjs": "^9.4.4",
"npm-run-all": "^4.1.5",
"plotly.js": "^2.2.1",
"postcss": "^8.3.5",
"prettier": "^2.3.2",
"prettier": "^2.4.0",
"react-plotly.js": "^2.5.1",
"rimraf": "^3.0.2",
"rollup": "^2.56.3",
Expand All @@ -134,7 +134,7 @@
"sass-loader": "10.1.1",
"storybook-css-modules-preset": "^1.1.1",
"style-loader": "^2.0.0",
"ts-jest": "27.0.5",
"ts-jest": "^27.0.5",
"tslib": "^2.3.1",
"typescript": "4.3.5",
"typescript-plugin-css-modules": "^3.4.0"
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from './components/GraphEditor';
export * from './components/graphRenderer';
export * from './stores/MstDiagramEditorSchemas';
export * from './stores/ViewCard';
export * from './stores/viewClass';
Expand Down
5 changes: 1 addition & 4 deletions stories/GraphRenderer.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -557,14 +557,13 @@ const additionalColls: CollState[] = [
},
];

const renderers = [...antdLayoutRenderers, ...graphRenderers, ...antdControlRenderers];

export default {
title: 'GraphEditor/GraphRenderer',
component: Form,
} as Meta;

const Template: Story<any> = (args: any) => {
const renderers = [...antdLayoutRenderers, ...graphRenderers, ...antdControlRenderers];
registerMstViewKindSchema(MstDiagramNodeVKElement);
registerMstViewKindSchema(MstDiagramEdgeVKElement);

Expand All @@ -590,6 +589,4 @@ export const RemoteData = Template.bind({});
RemoteData.args = {
viewDescrCollId: viewDescrCollConstr['@id'],
viewDescrId: mktpViewDescrs[0]['@id'],
viewKindCollId: viewKindCollConstr['@id'],
viewKindId: mktpViewKinds[0]['@id'],
};
Loading

0 comments on commit e74168d

Please sign in to comment.