Skip to content

Commit

Permalink
[deps] client, dev, fix tabs order
Browse files Browse the repository at this point in the history
  • Loading branch information
amivanoff committed Oct 20, 2021
1 parent 174d1ac commit 33777d3
Show file tree
Hide file tree
Showing 3 changed files with 327 additions and 320 deletions.
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"lint-staged": "lint-staged"
},
"peerDependencies": {
"@agentlab/sparql-jsld-client": ">=5.0.0-rc.20",
"@agentlab/sparql-jsld-client": ">=5.0.0-rc.21",
"@ant-design/icons": ">=4.7.0",
"@rdfjs/data-model": ">=1.3.4",
"@tinymce/tinymce-react": ">=3.13.0",
Expand All @@ -69,23 +69,23 @@
"react-dnd-html5-backend": ">=12.1.1",
"react-dom": ">=17.0.2",
"react-error-boundary": ">=3.1.3",
"react-horizontal-scrolling-menu": ">=2.4.4",
"react-horizontal-scrolling-menu": ">=2.5.0",
"react-router": ">=6.0.0-beta.7",
"react-router-dom": ">=6.0.0-beta.7",
"react-sortable-hoc": ">=2.0.0",
"react-split-pane": ">=2.0.3",
"react-virtualized": ">=9.22.3",
"styled-components": ">=5.3.1",
"styled-components": ">=5.3.3",
"tinymce": ">=5.9.2",
"uri-js": ">=4.4.1",
"uuid62": ">=1.0.1"
},
"dependencies": {
"@agentlab/sparql-jsld-client": "^5.0.0-rc.20",
"@agentlab/sparql-jsld-client": "^5.0.0-rc.21",
"@ant-design/icons": "^4.7.0",
"@tinymce/tinymce-react": "^3.13.0",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.9",
"@types/react-dom": "^17.0.10",
"@types/react-router": "^5.1.17",
"@types/react-router-dom": "^5.3.1",
"@types/react-virtualized": "^9.21.13",
Expand All @@ -101,7 +101,7 @@
"react-dnd-html5-backend": "12.1.1",
"react-dom": "^17.0.2",
"react-error-boundary": "^3.1.3",
"react-horizontal-scrolling-menu": "^2.4.4",
"react-horizontal-scrolling-menu": "^2.5.0",
"react-is": "^17.0.2",
"react-redux": "^7.2.5",
"react-router": "^6.0.0-beta.7",
Expand All @@ -111,14 +111,14 @@
"react-virtualized": "^9.22.3",
"redux": "^4.1.1",
"remotedev": "^0.2.9",
"styled-components": "^5.3.1",
"styled-components": "^5.3.3",
"tinymce": "5.9.2",
"uri-js": "^4.4.1"
},
"devDependencies": {
"@babel/core": "^7.15.8",
"@rollup/plugin-commonjs": "^21.0.0",
"@rollup/plugin-node-resolve": "^13.0.5",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-node-resolve": "^13.0.6",
"@rollup/plugin-typescript": "^8.3.0",
"@storybook/addon-actions": "^6.3.12",
"@storybook/addon-essentials": "^6.3.12",
Expand All @@ -130,7 +130,7 @@
"@storybook/react": "^6.3.12",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.4.2",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.0.2",
"@typescript-eslint/eslint-plugin": "^5.1.0",
"@typescript-eslint/parser": "^5.1.0",
Expand All @@ -152,7 +152,7 @@
"eslint-plugin-react": "^7.26.1",
"eslint-plugin-react-hooks": "^4.2.0",
"husky": "^7.0.2",
"jest": "^27.3.0",
"jest": "^27.3.1",
"jest-watch-typeahead": "^1.0.0",
"lint-staged": "^11.2.3",
"npm-run-all": "^4.1.5",
Expand Down
8 changes: 5 additions & 3 deletions src/data-controls/TabControlRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,13 @@ export const AntdTabControlWithStore = observer<any>((props) => {
const withConnections = options.connections;
let tabs: JsObject[] = data;

//if (tabs && tabs[0] && tabs[0].rank) {
// tabs = tabs.slice().sort((t1, t2) => t1.rank - t2.rank);
//}

let additionalTabs = (viewKindElement as IMstVkeTabControl).tabs;
if (additionalTabs) {
additionalTabs = additionalTabs.slice().sort((t1, t2) => t2.rank - t1.rank);
additionalTabs = additionalTabs.slice().sort((t1, t2) => t1.rank - t2.rank);
tabs = [...additionalTabs.filter((t) => t.rank <= 100), ...tabs, ...additionalTabs.filter((t) => t.rank > 100)];
}

Expand Down Expand Up @@ -94,5 +98,3 @@ export const AntdTabControlWithStore = observer<any>((props) => {
</div>
);
});

export const antdTabControlTester: RankedTester = rankWith(2, uiTypeIs('aldkg:TabControl'));
Loading

0 comments on commit 33777d3

Please sign in to comment.