Merge branch 'main' into leafletFix

Author: KittyJose

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@terminusdb/terminusdb-access-control-component",
-  "version": "6.2.4",
+  "version": "6.0.10",
   "description": "Table for terminusdb",
   "main": "src/index",
   "module": "es6/index",

packages/tdb-access-control-component/package.json

@@ -74,7 +74,7 @@ describe(`Test Document History Widget`, () => {
     cy.get(`button[data-cy=${CONST.CREATE_CHANGE_REQUEST_BUTTON}]`).should('exist').click();
     cy.get(2000)
     cy.wait('@getBranchName').then((interception) => {
-      assert.isNotNull(interception.response.body, '1st API call has data')
+      assert.isNotNull(interception.response.body, 'Intercepting create CR API ')
       //console.log("interception.response.body", interception.response.body)
       branchID = interception.response.body.branchName
     })

packages/tdb-dashboard/cypress/e2e/dashboard/document_history.cy.js

@@ -1,5 +1,9 @@
 /// <reference types="cypress" />
 
+Cypress.on('uncaught:exception', (err, runnable) => {
+  return false;
+});
+
 describe('visit dashboard local', () => {
     const dashboard = "http://localhost:6364/dashboard"
 

packages/tdb-dashboard/cypress/e2e/dashboard/local_dashboard.cy.js

@@ -2,7 +2,11 @@
 
 import { SiGmail } from "react-icons/si"
 
-///8MmY%*2q 
+Cypress.on('uncaught:exception', (err, runnable) => {
+  return false;
+});
+
+///8MmY%*2q
 //tester@terminusdb.com
 
 //emf7V3RaiDXCsx$#@%yy

packages/tdb-dashboard/cypress/e2e/dashboard/login.cy.js

@@ -1,6 +1,10 @@
 
 /// <reference types="cypress" />
 
+Cypress.on('uncaught:exception', (err, runnable) => {
+  return false;
+});
+
 ///8MmY%*2q
 //tester@terminusdb.com
 

packages/tdb-dashboard/cypress/e2e/dashboard/workflow.cy.js

@@ -1,6 +1,6 @@
 {
   "name": "@terminusdb-live/tdb-dashboard",
-  "version": "6.2.4",
+  "version": "6.0.10",
   "description": "react",
   "homepage": "./",
   "main": "src/index",

packages/tdb-dashboard/package.json

@@ -26,13 +26,12 @@ const StepDetail = ({ stepNumber, stepComponent, icon}) => {
 }
 
 
+
 function getStep(stepNumber,supMode) {
   let { organization,dataProduct } = useParams()
   const stepOptions= {
-    "step1":<>
-              Visit <NavLink href="https://platform.openai.com/account/api-keys" className={"mr-1"}>Open AI</NavLink>
-              and create a your Secret API Key
-            </>,
+    "step1":<>Visit <a href="https://platform.openai.com/account/api-keys" target="_blank" className={"mr-1"}>Open AI</a>
+              and create a your Secret API Key</>,
     "step2": {"LOCAL":<>
                 Copy and paste your generated OpenAI API Key in your environment variables, restart the application
               </>,
@@ -42,12 +41,17 @@ function getStep(stepNumber,supMode) {
               },
     "step3":<>
             Go to <NavLink to={`/${organization}/${dataProduct}/openai_configuration`} className={"mr-1"}>Open AI configuration </NavLink> page
-            to add a graphql query and an handlebar template for every Document
+            to add a graphql query and an handlebar template for every Document you like to index
             </>,
-    "step4": <>
+    "step4":  {"REMOTE":<>
               In your profile turn on the Indexing button next to the OpenAI Key field.
               All data products in your team will begin to index.
               </>,
+              "LOCAL":<>
+              Use VectorLink to Semantically search your data products and use the vector embeddings to talk to OpenAI.
+              Click <NavLink href="https://terminusdb.com/docs/" className={"mr-1"}>here</NavLink>for more info on how to use VectorLink.
+              </>},
+
     "step5": <>
               Use VectorLink to Semantically search your data products and use the vector embeddings to talk to OpenAI.
               Click <NavLink href="https://terminusdb.com/docs/" className={"mr-1"}>here</NavLink>for more info on how to use VectorLink.
@@ -77,8 +81,8 @@ export const DisplayNoIndexingAction = ({ helpDescription }) => {
           <StepDetail stepNumber={1} stepComponent={getStep(1)} icon={<BsKey/>}/>
           <StepDetail stepNumber={2} stepComponent={getStep(2, connection_type)} icon={<RiUserFollowFill/>}/>
           <StepDetail stepNumber={3} stepComponent={getStep(3)} icon={<SiHandlebarsdotjs/>}/>
-          <StepDetail stepNumber={4} stepComponent={getStep(4)} icon={<RxCheckbox/>}/>
-          <StepDetail stepNumber={5} stepComponent={getStep(5)} icon={<BsSearch/>}/>
+          <StepDetail stepNumber={4} stepComponent={getStep(4, connection_type)} icon={<RxCheckbox/>}/>
+          {connection_type === "REMOTE" && <StepDetail stepNumber={5} stepComponent={getStep(5)} icon={<BsSearch/>}/>}
         </Col>
         <Col md={3}></Col>
       </Row>

packages/tdb-dashboard/src/components/DisplayNoIndexingAction.js

@@ -1,9 +1,9 @@
 import React, {useEffect} from "react"
 import {DocumentsGraphqlTable} from "@terminusdb/terminusdb-documents-ui-template"
-import {gql} from "@apollo/client"
 import {useTDBDocuments} from "@terminusdb/terminusdb-documents-ui-template"
 import {WOQLClientObj} from '../init-woql-client'
 import { Loading } from "./Loading"
+import {getGqlQuery} from "../pages/utils"
 /**
  * 
  * @param {*} setSelected function to get selected document link by user 
@@ -22,7 +22,7 @@ export const DocumentSearchComponent = ({setSelected, doctype}) => {
         }
      },[doctype]);
     const querystr  = documentTablesConfig && documentTablesConfig.objQuery ? documentTablesConfig.objQuery[doctype].query : null
-    const gqlQuery = querystr ? gql`${querystr}` : null
+    const gqlQuery = querystr ? getGqlQuery(querystr) : null
     const tableConfig =  documentTablesConfig && documentTablesConfig.tablesColumnsConfig ? documentTablesConfig.tablesColumnsConfig[doctype] : []
     const advancedSearchConfig = documentTablesConfig && documentTablesConfig.advancedSearchObj ? documentTablesConfig.advancedSearchObj[doctype] : null
 

packages/tdb-dashboard/src/components/DocumentSearchComponent.js

@@ -9,8 +9,12 @@ export const SubmitChangeRequestModal = ({showModal, setShowModal , updateParent
 
     const closeModal = () => setShowModal(false)
 
+    const titleObj= {"Submitted":'Submit the Change Request for review',
+                     "Open" : "Reopen the change request",
+                     "Close" : <Alert variant="danger">You are Closing this change request. You can not undo this operation</Alert>}
+
     const statusUpdate = operation || "Submitted"
-    const title = statusUpdate === "Submitted" ? 'Submit the Change Request for review' : `Reopen the change request`
+    const title = titleObj[statusUpdate]
 
     const runCreate = async () => {
         const message = messageRef.current.value