Merge branch 'main' into fix_bug

Francesca-Bit · web-flow · commit e96f000d0f6e · 2023-03-14T14:20:07.000Z
diff --git a/packages/tdb-dashboard/package.json b/packages/tdb-dashboard/package.json
@@ -22,7 +22,7 @@
   "scripts": {
     "build-es6": "rimraf es6 && cross-env NODE_ENV=es6 babel ./src -d es6 --extensions '.js'",
     "build": "webpack --mode production",
-    "build-terminusx": "webpack --mode production --env title=TerminusX",
+    "build-terminusx": "webpack --mode production --env title=TerminusCMS",
     "start": "webpack serve --mode development  --open --progress --port 3030 --host localhost --config ./webpack_dev.config.js --history-api-fallback",
     "new": "webpack serve --mode development  --open --progress --port 3035 --host localhost --content-base src --inline --config ./webpack_dev.config.js --history-api-fallback",
     "demo": "webpack serve --progress --port 3030 --host localhost --content-base demo --inline --config demo/webpack.config.js",
diff --git a/packages/tdb-dashboard/src/components/ReviewComponent.js b/packages/tdb-dashboard/src/components/ReviewComponent.js
@@ -93,4 +93,4 @@ export const ReviewComponent = () => {
             </Card>
         </React.Fragment>
         
-}
+}
diff --git a/packages/tdb-documents-ui/README.md b/packages/tdb-documents-ui/README.md
@@ -4,7 +4,7 @@ SDK to build UI from terminusdb documents
 ## Run playground
 Run playground to get a demo.
 
-Create a new data product in TerminusX and name it ```Playground```. 
+Create a new data product in TerminusCMS and name it ```Playground```. 
 Go to /product_model page and copy paste the schema from file - playground/src/schema.json.
 
 Make a .env file and add the following
@@ -20,7 +20,7 @@ After adding .env file, run the below command
 ```npm run playground```
 
 ## Run test
-To connect to a particular data product in TerminusX - add the following variables to .env file 
+To connect to a particular data product in TerminusCMS - add the following variables to .env file 
 
 ```
 SERVER=https://cloud.terminusdb.com/
diff --git a/packages/tdb-documents-ui/package.json b/packages/tdb-documents-ui/package.json
@@ -8,6 +8,7 @@
   "scripts": {
     "build-es6": "rimraf es6 && cross-env NODE_ENV=es6 babel ./src -d es6 --extensions '.js' && babel ./src/css --out-dir es6/css/ --copy-files",
     "build": "npm run build-es6 && rimraf dist && webpack --mode production",
+    "build-playground": "npm run build-es6 && webpack --mode production --config playground/webpack.config.js",
     "playground": "webpack serve --mode development  --open --progress --port 3033 --host localhost --config playground/webpack.config.js",
     "testDb": "webpack serve --mode development  --open --progress --port 3032 --host localhost --config test/webpack.config.js",
     "mockTest": "webpack serve --mode development  --open --progress --port 3035 --host localhost --config mockTest/webpack.config.js",
diff --git a/packages/tdb-documents-ui/playground/build/index.html b/packages/tdb-documents-ui/playground/build/index.html
@@ -21,6 +21,6 @@
 	</head>
 	<body>
 		<div id="root"/>
+		<script src="bundle.js"></script>
 	</body>
-	<script src="bundle.js"></script>
-</html>
+</html>
diff --git a/packages/tdb-documents-ui/src/FrameViewer.js b/packages/tdb-documents-ui/src/FrameViewer.js
@@ -6,7 +6,6 @@ import * as CONST from "./constants"
 import {Alert} from "react-bootstrap"
 import * as util from "./utils"
 import {transformData} from "./extract" 
-import { v4 as uuidv4 } from 'uuid';
 import {DisplayFieldTemplate, DisplayDocumentation} from "./templates"
 
 
diff --git a/packages/tdb-documents-ui/src/dataTypeFrames/widget.js b/packages/tdb-documents-ui/src/dataTypeFrames/widget.js
@@ -11,7 +11,6 @@ import * as helper from "./helpers"
 import * as util from "../utils"
 import MDEditor, { commands }  from '@uiw/react-md-editor';
 import mermaid from "mermaid";
-import uuid from 'react-uuid'
 import InputGroup from 'react-bootstrap/InputGroup';
 
 function booleanField(mode, props) {
@@ -125,7 +124,7 @@ export function getMarkdownUI(props) {
     }).filter(Boolean).join("")
 
     const Code = ({ inline, children = [], className, ...props }) => {
-        const demoid = useRef(`dome${uuid()}`);
+        const demoid = useRef(`dome${crypto.randomUUID()}`);
         const code = getCode(children);
         const demo = useRef(null);
         useEffect(() => {
@@ -197,7 +196,7 @@ export function getViewMarkdownUI(formData, name, uiFrame) {
         }).filter(Boolean).join("")
     
         const Code = ({ inline, children = [], className, ...props }) => {
-            const demoid = useRef(`dome${uuid()}`);
+            const demoid = useRef(`dome${crypto.randomUUID()}`);
             const code = getCode(children);
             const demo = useRef(null);
             useEffect(() => {
diff --git a/packages/tdb-documents-ui/src/maps/geoJSONMapViewer.js b/packages/tdb-documents-ui/src/maps/geoJSONMapViewer.js
@@ -5,7 +5,6 @@ import {renderPositions, customMapOptions, customMarkerOptions} from "./markers"
 import icon from "../constants"
 import "leaflet-arrowheads"
 import L from "leaflet" 
-import uuid from 'react-uuid'
 
 export function geoJSONMapViewer  (args) {
 	 
@@ -16,7 +15,7 @@ export function geoJSONMapViewer  (args) {
       map()
     }, [])
 
-    let mapID=uuid()
+    let mapID=crypto.randomUUID()
 
     const map = () => {
           let mapOptions = customMapOptions(zoom, center)
@@ -46,4 +45,4 @@ export function geoJSONMapViewer  (args) {
     }
 
     return <div id={`tdb__map__geojson__leaflet_${mapID}`} style={{ height: "100vh" }}></div>
-}
+}
diff --git a/packages/tdb-documents-ui/src/maps/pointTypeMap.js b/packages/tdb-documents-ui/src/maps/pointTypeMap.js
@@ -5,12 +5,11 @@ import {customMapOptions, customMarkerOptions} from "./markers"
 import icon from "../constants"
 import "leaflet-arrowheads"
 import L from "leaflet"
-import uuid from 'react-uuid'
 
 export const pointMapViewer = (args) => {
 	let {property, type, documents, zoom, scrollWheelZoom, display, onMarkerClick, polyLine, polygon, icon, geojsonFeature, center, bounds}=args
 	
-	let mapID=uuid()
+	let mapID=crypto.randomUUID()
 
 	useEffect(() => {
 		map()
@@ -54,4 +53,4 @@ export const pointMapViewer = (args) => {
 	}
 
 	return <div id={`map-leaflet-id-${mapID}`} style={{ height: "100vh" }}></div>
-}
+}
diff --git a/packages/tdb-documents-ui/src/maps/polygonMapViewer.js b/packages/tdb-documents-ui/src/maps/polygonMapViewer.js
@@ -6,12 +6,11 @@ import icon from "../constants"
 import "leaflet-arrowheads"
 import L from "leaflet"
 import {MAP_OPTION, MARKER_OPTION} from "./map.constants"
-import uuid from 'react-uuid'
 
 export const polygonMapViewer = (args) => {
 	let {property, documents, zoom, icon, center, bounds, type}=args
 	
-	let mapID=uuid()
+	let mapID=crypto.randomUUID()
 
 	useEffect(() => {
 		map()
@@ -47,4 +46,4 @@ export const polygonMapViewer = (args) => {
 	}
 
 	return <div id={`map-polygon-id-${mapID}`} style={{ height: "100vh" }}></div>
-}
+}
diff --git a/packages/tdb-documents-ui/src/maps/polylineMapViewer.js b/packages/tdb-documents-ui/src/maps/polylineMapViewer.js
@@ -6,12 +6,11 @@ import icon from "../constants"
 import "leaflet-arrowheads"
 import L from "leaflet"
 import {MAP_OPTION, MARKER_OPTION} from "./map.constants"
-import uuid from 'react-uuid'
 
 export const polylineMapViewer = (args) => {
 	let {property, documents, zoom, icon, center, bounds}=args
 
-	let mapID=uuid()
+	let mapID=crypto.randomUUID()
 	
 	useEffect(() => {
 		map()
@@ -53,4 +52,4 @@ export const polylineMapViewer = (args) => {
 	} 
 
 	return <div id={`map-polyline-id-${mapID}`} style={{ height: "100vh" }}></div>
-}
+}
diff --git a/packages/tdb-react-table/src/AdvancedSearch.js b/packages/tdb-react-table/src/AdvancedSearch.js
@@ -184,9 +184,7 @@ export const AdvancedSearch = (props) =>{
 
               if(element.properties.operator === "like"){
                 value = `(?i)${value}`
-              }/*else if(element.properties.operator === "starts_with"){
-                value = value`
-              }*/
+              }
               
               let valueObj = {}
 
@@ -261,4 +259,4 @@ export const AdvancedSearch = (props) =>{
     </div>
 
     
-}
+}

-Original file line number
+Diff line change
             </Card>
         </React.Fragment>
 -}
 +}