Merge pull request #19 from agentlab/issue-17-search-component

GH-17 Port Search component from Expert system
agentlab · Oct 18, 2021 · 23fce9e · 23fce9e
2 parents dbdf71c + c051783
commit 23fce9e
Show file tree

Hide file tree

Showing 41 changed files with 2,481 additions and 263 deletions.
diff --git a/package.json b/package.json
@@ -51,10 +51,10 @@
     "lint-staged": "lint-staged"
   },
   "peerDependencies": {
-    "@agentlab/sparql-jsld-client": ">=5.0.0-rc.16",
+    "@agentlab/sparql-jsld-client": ">=5.0.0-rc.17",
     "@ant-design/icons": ">=4.7.0",
     "@rdfjs/data-model": ">=1.3.4",
-    "@tinymce/tinymce-react": ">=3.12.6",
+    "@tinymce/tinymce-react": ">=3.13.0",
     "antd": ">=4.16.13",
     "history": ">=5.0.1",
     "lodash-es": ">=4.17.21",
@@ -70,8 +70,8 @@
     "react-dom": ">=17.0.2",
     "react-error-boundary": ">=3.1.3",
     "react-horizontal-scrolling-menu": ">=2.4.4",
-    "react-router": ">=6.0.0-beta.6",
-    "react-router-dom": ">=6.0.0-beta.6",
+    "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",
@@ -81,7 +81,7 @@
     "uuid62": ">=1.0.1"
   },
   "dependencies": {
-    "@agentlab/sparql-jsld-client": "^5.0.0-rc.16",
+    "@agentlab/sparql-jsld-client": "^5.0.0-rc.17",
     "@ant-design/icons": "^4.7.0",
     "@tinymce/tinymce-react": "^3.13.0",
     "@types/react": "^17.0.30",
@@ -104,8 +104,8 @@
     "react-horizontal-scrolling-menu": "^2.4.4",
     "react-is": "^17.0.2",
     "react-redux": "^7.2.5",
-    "react-router": "^6.0.0-beta.6",
-    "react-router-dom": "^6.0.0-beta.6",
+    "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",
@@ -119,7 +119,7 @@
     "@babel/core": "^7.15.8",
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-node-resolve": "^13.0.5",
-    "@rollup/plugin-typescript": "^8.2.5",
+    "@rollup/plugin-typescript": "^8.3.0",
     "@storybook/addon-actions": "^6.3.12",
     "@storybook/addon-essentials": "^6.3.12",
     "@storybook/addon-links": "^6.3.12",
@@ -146,7 +146,7 @@
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-flowtype": "^6.1.0",
     "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-jest": "^25.2.1",
+    "eslint-plugin-jest": "^25.2.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.26.1",
@@ -168,7 +168,7 @@
     "sass-loader": "10.1.1",
     "storybook-css-modules-preset": "^1.1.1",
     "style-loader": "^2.0.0",
-    "ts-jest": "^27.0.6",
+    "ts-jest": "^27.0.7",
     "tslib": "^2.3.1",
     "typescript": "4.4.4",
     "typescript-plugin-css-modules": "^3.4.0"

diff --git a/src/DispatchCell.tsx b/src/DispatchCell.tsx
@@ -11,8 +11,9 @@ import { isEqual, maxBy } from 'lodash-es';
 import React, { useContext } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 
+import { CellRendererRegistryEntry } from './renderers';
 import { UnknownRenderer } from './UnknownRenderer';
-import { ErrorFallback, DispatchCellProps, FormsCell, RenderCellProps } from './Form';
+import { ErrorFallback, DispatchCellProps, RenderCellProps } from './Form';
 import { MstContext } from './MstContext';
 
 /**
@@ -47,7 +48,7 @@ export const DispatchCell: React.FC<DispatchCellProps> = React.memo(
         </td>
       );
     } else {
-      const Render: React.FC<RenderCellProps> = (renderer as FormsCell).cell;
+      const Render: React.FC<RenderCellProps> = (renderer as CellRendererRegistryEntry).cell;
       return (
         <ErrorBoundary FallbackComponent={ErrorFallback} onReset={() => {}}>
           <Render

diff --git a/src/Form.tsx b/src/Form.tsx
@@ -14,14 +14,14 @@ import { ErrorBoundary, FallbackProps } from 'react-error-boundary';
 import { Spin } from 'antd';
 import { observer } from 'mobx-react-lite';
 import { getSnapshot } from 'mobx-state-tree';
+import { JsObject } from '@agentlab/sparql-jsld-client';
 
 import { JsonSchema7 } from './models/jsonSchema7';
 //import ModalAntd from './antd/util/AntdModal';
 import { MstContext } from './MstContext';
 import { UnknownRenderer } from './UnknownRenderer';
 import { RankedTester } from './testers';
 import { IViewDescr, IViewDescrElement, IViewKind, IViewKindElement } from './models/uischema';
-import { JsObject } from '@agentlab/sparql-jsld-client';
 
 export interface ControlComponent {
   data: any;
@@ -45,14 +45,6 @@ export interface ControlComponent {
   formData?: any;
 }
 
-export interface FormsRenderer {
-  tester: RankedTester;
-  renderer: React.FC<any>;
-}
-export interface FormsCell {
-  tester: RankedTester;
-  cell: React.FC<any>;
-}
 export interface FormsInitStateProps {
   viewDescrCollId: string;
   viewDescrId: string;

diff --git a/src/MstContext.tsx b/src/MstContext.tsx
@@ -8,12 +8,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  ********************************************************************************/
 import React, { createContext, PropsWithChildren } from 'react';
-import { FormsCell, FormsRenderer } from './Form';
+import { CellRendererRegistryEntry, RendererRegistryEntry } from './renderers';
+import { registerMstViewKindSchema } from './models/MstViewDescr';
 
 export interface MstContextProps {
   store: any;
-  renderers: FormsRenderer[];
-  cells: FormsCell[];
+  renderers: RendererRegistryEntry[];
+  cells: CellRendererRegistryEntry[];
 }
 
 export const MstContext = createContext<MstContextProps>({
@@ -22,6 +23,20 @@ export const MstContext = createContext<MstContextProps>({
   cells: [],
 });
 
-export const MstContextProvider = ({ store, renderers, cells = [], children }: PropsWithChildren<any>): JSX.Element => {
+export const MstContextProvider = ({
+  store,
+  renderers,
+  cells = [],
+  children,
+}: PropsWithChildren<{
+  store: any;
+  renderers: RendererRegistryEntry[];
+  cells?: CellRendererRegistryEntry[];
+}>): JSX.Element => {
+  renderers.forEach((r) => {
+    if ((r as any).mstVkeType) {
+      registerMstViewKindSchema((r as any).mstVkeType);
+    }
+  });
   return <MstContext.Provider value={{ store, renderers, cells }}>{children}</MstContext.Provider>;
 };
diff --git a/src/controls/index.ts b/src/controls/index.ts
@@ -18,6 +18,7 @@ import { antdSliderControlTester, AntdSliderControlWithStore } from './AntdSlide
 import { antdTextControlTester, AntdTextControlWithStore } from './AntdTextControl';
 import { tinyMCEControlTester, TinyMCEControlWithStore } from './TinyMCEControl';
 import { antdImageControlTester, AntdImageControlWithStore } from './AntdImageControl';
+import { antdQueryTester, AntQueryWithStore } from './query/Query';
 
 export const antdControlRenderers: RendererRegistryEntry[] = [
   { tester: antdBooleanControlTester, renderer: AntdBooleanControlWithStore },
@@ -37,6 +38,7 @@ export const antdControlRenderers: RendererRegistryEntry[] = [
   { tester: antdTextControlTester, renderer: AntdTextControlWithStore },
 
   { tester: tinyMCEControlTester, renderer: TinyMCEControlWithStore },
+  { tester: antdQueryTester, renderer: AntQueryWithStore },
 ];
 
 export * from './AntdBooleanControl';
@@ -50,3 +52,4 @@ export * from './AntdSliderControl';
 export * from './AntdTextControl';
 export * from './TinyMCEControl';
 export * from './AntdImageControl';
+export * from './query/Query';