Merge pull request #177 from terminusdb/fix_bug

fix clone, add update database details, fix query editor

Author: KittyJose

package-lock.json

@@ -44,7 +44,7 @@
   "repository": {},
   "author": "terminusdb group",
   "dependencies": {
-    "@terminusdb/terminusdb-client": "^10.0.25",
+    "@terminusdb/terminusdb-client": "^10.0.27",
     "babel-jest": "^29.3.1",
     "classnames": "^2.2.5",
     "date-fns": "^2.28.0",

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

@@ -39,10 +39,17 @@ module.exports = (env, argv) => ({
           },
         },
         {
-          test: /\.(css|less)$/,
+          test: /\.(css)$/,
           use: [
             MiniCssExtractPlugin.loader,
-            'css-loader', 'less-loader'
+            'css-loader',
+          ],
+        },
+        {
+          test: /\.(less)$/,
+          use: [
+            MiniCssExtractPlugin.loader,
+            'less-loader',
           ],
         },
         {

packages/tdb-access-control-component/webpack.config.js

@@ -45,7 +45,7 @@
     "@graphiql/toolkit": "^0.8.0",
     "@stripe/react-stripe-js": "^1.16.4",
     "@stripe/stripe-js": "^1.46.0",
-    "@terminusdb/terminusdb-client": "^10.0.25",
+    "@terminusdb/terminusdb-client": "^10.0.27",
     "axios": "^0.21.1",
     "babel-jest": "^29.3.1",
     "classnames": "^2.2.5",

packages/tdb-dashboard/package.json

@@ -13,8 +13,9 @@ import { ManageDatabase } from "../hooks/ManageDatabase"
 import { useParams } from "react-router-dom"
 import { Loading } from "./Loading"
 import {DocumentControlObj} from "../hooks/DocumentControlContext"
+import { UTILS } from "@terminusdb/terminusdb-client"
 
-export const AboutDataProduct = ({dataProductDetails, setShowDeleteModal, healthColor ,branches}) =>{
+export const AboutDataProduct = ({dataProductDetails, setShowDeleteModal, setShowUpdate, healthColor ,branches}) =>{
     const {dataProduct,organization} =useParams()
     const [showHealth, setShowHealth]=useState(false)
     const [branchCount, setBranchCount]= useState(0)
@@ -61,20 +62,33 @@ export const AboutDataProduct = ({dataProductDetails, setShowDeleteModal, health
 		const orgName = cloneInTeam.current.value
         const dbName = cloneDBName.current.value
 
-		const tmpClient = woqlClient.copy()
-		const connection = tmpClient.connectionConfig
-		connection.api_extension = `${organization}/`
-		
-		const cloneSource= {
-			label:dataProduct,
-			comment:"please clone the db",
-			remote_url: `${connection.dbURLFragment()}`
-		}
-		const success = await cloneDatabase(cloneSource,orgName,dbName)
-		if(success){
-            window.location.replace(`/${orgName}/${dbName}`)
-		}
+        if(!UTILS.checkValidName(dbName)) {
+            setCloneError("The database name is mandatory and can only contain underscores and alphanumeric characters.")
+          
+        }else if(orgName === "false"){
+            setCloneError("Please select an organization from the list")
+        }else{
+            const tmpClient = woqlClient.copy()
+            const connection = tmpClient.connectionConfig
+            connection.api_extension = `${organization}/`
+            
+            const cloneSource= {
+                label:dbName,
+                comment:"please clone the db",
+                remote_url: `${connection.dbURLFragment()}`
+            }
+          //
+          
+          const success = await cloneDatabase(cloneSource,orgName,dbName)
+            if(success){
+                window.location.replace(`/${orgName}/${dbName}`)
+            }
+        }
 	}
+
+    const showUpdateHandler = () =>{
+        setShowUpdate(dataProductDetails)
+    }
 
     return <React.Fragment> 
         <HealthModal dataProduct={dataProduct} showHealth={showHealth} setShowHealth={setShowHealth}/>
@@ -128,8 +142,18 @@ export const AboutDataProduct = ({dataProductDetails, setShowDeleteModal, health
                         {/*<h6 className="text-break text-light">{getCloneUrl()}</h6>*/}
                     </span>
                 </span>
-        
-            
+                {accessControlDashboard && accessControlDashboard.createDB() && <Fragment>
+                    <div className="w-100 d-block align-items-center gx-0">
+                        <Button variant="secondary" 
+                            id="update_database"
+                            title={`Update Data Product ${dataProduct} info`} 
+                            className=" btn btn-lg h2 fw-bold w-100 mt-4"
+                            onClick={showUpdateHandler}>
+                             Update Dataproduct details 
+                        </Button>
+                    </div>
+                    </Fragment>
+                } 
             </Card.Body>
         </Card>
         <hr className="my-4 border-indigo dropdown-divider" role="separator"></hr>

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

@@ -37,7 +37,7 @@ export const DataProductItems = (props) => {
             onClick={(e) => handleClick(item)}     
             icon={false} 
             className="sub-menu-title">
-            {item.label}
+            {item.label || item.name}
         </MenuItem>
     }
 

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

@@ -147,10 +147,10 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
                    //   view={(tableConfig ? tableConfig.json() : {})}
                       limit={limit}
                       start={start}
-                      orderBy={{}} 
+                      orderBy={[]} 
                       setFilters = {changeFilters}
                       setLimits={changeLimits}
-                     // setOrder={changeOrder}
+                      //setOrder={changeOrder}
                      // query={null}
                       loading={loading}
                       totalRows={rowCount}

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

@@ -16,6 +16,6 @@ export const NewDataProduct = ({css}) => {
         <Button id="new_data_product" variant="info" className={`btn-new-data-product btn ${css}`}   title="Create New Data Product" onClick={handleNew}>
             <FaPlus className="me-2"/> <label className="opacity-1 fw-bold">New Data Product</label>
         </Button>
-        <NewDatabaseModal setShowModal={setShowModal} showModal={showModal}/>
+        {showModal && <NewDatabaseModal setShowModal={setShowModal} showModal={showModal}/>}
     </React.Fragment>
 }