Merge pull request #91 from terminusdb/fix_reject

Fix reject

Author: Francesca-Bit

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

@@ -60,8 +60,6 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
 
     let extractedResults = documentResults ? extractDocuments(documentResults[type]) : []
 
-    const totalRows = 200
-
     function extractDocuments(documentResultsArr) {
         if(!documentResultsArr) {
             //alert(JSON.stringify(documentResultsArr))
@@ -136,7 +134,7 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
                      // setOrder={changeOrder}
                      // query={null}
                       loading={loading}
-                      totalRows={totalRows}
+                      totalRows={rowCount}
                       onRefresh={function(){}}
                   />}
             </Tab>

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

@@ -19,7 +19,7 @@ import {CopyButton} from "./utils"
 import {BsSave} from "react-icons/bs"
 
 export const JSONModelBuilder = ({tab,saveGraph,accessControlEditMode}) => {
-    const {getSchemaGraph} = GraphContextObj();
+    const {getSchemaGraph,mainGraphObj} = GraphContextObj();
     const {dataProduct} = WOQLClientObj()
     const [loading, setLoading] = useState(false)
     const [error, setError] = useState(false)
@@ -47,7 +47,7 @@ export const JSONModelBuilder = ({tab,saveGraph,accessControlEditMode}) => {
         if(tab == GRAPH_TAB) return
         setEditMode(false)
         getJSONSchema()
-    }, [tab,dataProduct])
+    }, [tab,dataProduct,mainGraphObj])
 
     const [editMode, setEditMode]=useState(false)
 	const [value, setValue]=useState(false) 
@@ -124,7 +124,7 @@ export const JSONModelBuilder = ({tab,saveGraph,accessControlEditMode}) => {
                             const editorValue =editor.doc.getValue()
                             onBlurHandler(editorValue)
                         }}
-                        value={jsonSchema}
+                        value={value}
                         options={MODEL_BUILDER_EDITOR_OPTIONS}
                         className="model-builder-code-mirror"
                     />

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

@@ -1,20 +1,22 @@
 import React, {useState} from "react"
 import {Button, Form} from "react-bootstrap"
-import {WOQLClientObj} from "../init-woql-client"
+//import {WOQLClientObj} from "../init-woql-client"
 import {ChangeRequest} from "../hooks/ChangeRequest"
 import {
     REJECT,
     REJECTED
 } from "./constants"
 import {Loading} from "./Loading"
-import {useNavigate } from "react-router-dom"
+import {useNavigate,useParams } from "react-router-dom"
 import {RxCross2} from "react-icons/rx"
 
-export const RejectComponent = ({setKey}) => {
-	const {
-        currentCRObject
-    } = WOQLClientObj()
-
+export const RejectComponent = () => {
+	const {organization,dataProduct,id} = useParams()
+	
+	//const {
+       // currentCRObject
+    //} = WOQLClientObj()
+	
     const {
         updateChangeRequestStatus,
         getChangeRequestList,
@@ -26,9 +28,12 @@ export const RejectComponent = ({setKey}) => {
 
     /** handle Reject */
     async function handleReject () {
-        let res=await updateChangeRequestStatus(val, REJECTED)
+        let res=await updateChangeRequestStatus(val, REJECTED, id)
         let cr=await getChangeRequestList()
-        navigate(`/change_requests/`)
+        if(res){
+			exitChangeRequestBranch()
+			navigate(`/${organization}/${dataProduct}`)
+		}
     }
 
 	return <Form.Group className="mt-3 mb-5 ml-3 mr-4">

packages/tdb-dashboard/src/hooks/ControlledGraphqlQuery.js

@@ -49,8 +49,9 @@ export function ControlledGraphqlQuery (apolloClient, graphqlQuery, documentType
         }else{
             const data = result.data 
             if(!Array.isArray(data[documentType]))return []
-                const rowCountTmp  = limit*start+data[documentType].length
-                if(data[documentType].length === (limit+1)){
+                //current page is the startoffset
+                const rowCountTmp  = currentpage+data[documentType].length
+                if(data[documentType].length === (currentlimit+1)){
                 //setHasNextPage(false)
                 data[documentType].pop()
                 }
@@ -115,10 +116,11 @@ export function ControlledGraphqlQuery (apolloClient, graphqlQuery, documentType
           })
         }
         setFilters(filtersArr)
+        setStart(0)
         setQueryFilters(filtersTmp)
 
         console.log("changeFilters" ,filtersArr, filtersTmp)
-        callFetchMore(limit,start,orderBy,filtersTmp)      
+        callFetchMore(limit,0,orderBy,filtersTmp)      
       }
 
      const changeOrder = (orderByArr,fetchMore=false) =>{

packages/tdb-react-table/src/GraphqlTable.js

@@ -148,6 +148,7 @@ export const GraphqlTable = ({result, config, freewidth, start, filtersBy ,limit
                 orderBy={orderBy}
                 filtersBy={filtersBy}
                 pages={pages}
+                limit={limit}
                 pageNumber={pagenum}
                 rowCount={totalRows}
                 setLimits={setLimits}

packages/tdb-react-table/src/ReactTableComponent.js

@@ -11,7 +11,7 @@ import { DefaultColumnFilter } from './ColumnFilters';
  * sort - no, local, remote
  */ 
 
-export const ReactTableComponent = ({columns, data, config, pages, freewidth, filtersBy, orderBy, rowCount, pageNumber, setLimits, setOrder, setFilters, pagesizes, onRefresh,hiddenColumns})=>{
+export const ReactTableComponent = ({columns, data, limit, config, pages, freewidth, filtersBy, orderBy, rowCount, pageNumber, setLimits, setOrder, setFilters, pagesizes, onRefresh,hiddenColumns})=>{
 
    // console.log("COLUMS", JSON.stringify(columns,null,4))
 
@@ -20,7 +20,7 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
 
     rowCount = rowCount || data.length 
 
-    const startPageSize=  10
+    const startPageSize=  limit ||  10
     const startPageNumber = pageNumber || 0
     let ut_config = {
         columns,
@@ -33,7 +33,7 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
         pageCount : pages || 1,
         initialState : {
             filters : filtersBy || [],
-            pageSize : 10,
+            pageSize : startPageSize,
             pageIndex : pageNumber || 0,
             hiddenColumns: hiddenColumns
             //sortBy : orderBy,
@@ -73,9 +73,9 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
         let st = ((pageSize * pageIndex) + 1)
         let en = page.length + st - 1
         rowCountStr = "Record " + st + " to " + en
-        if(rowCount){
+        /* if(rowCount){
             total += " of " + rowCount
-        }
+        }*/
     } 
 
     useEffect(() => {
@@ -105,6 +105,10 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
             setLimits(pageSize, (pageIndex)*pageSize)
      }, [pageIndex, pageSize ])
 
+     const onRefreshHandler = () =>{
+        setLimits(pageSize, (pageIndex)*pageSize)
+     }
+
 
      return (
         <span>
@@ -157,20 +161,20 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
             {pager && data.length>0 &&
                 <Row md={12} className="mr-0 ml-0">
                     <Col md={3} className="d-flex justify-content-center align-items-center">                      
-                        <button id="table_previous" onClick={() => 
+                        <button style={{width:"60px"}} id="table_previous" onClick={() => 
                             previousPage()} 
                             disabled={!canPreviousPage}>
                         {'<'}
                         </button>{' '}
-                        <button id="table_next" onClick={() => 
+                        <button style={{width:"60px"}} id="table_next" onClick={() => 
                             nextPage()} 
                             disabled={!canNextPage}>
                         {'>'}
                         </button>{' '}                      
                     </Col>
                     <Col md={6} className="d-flex justify-content-center align-items-center">
-                        
-                        <span id="table_page_number">
+
+                        <span id="table_page_number"  style={{opacity:0}}>
                             Page{' '}
                             <strong className="mr-3">
                                 {pageIndex  + 1} of {pageCount}
@@ -193,10 +197,10 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
                     </Col>
                     <Col md={3} className="d-flex justify-content-center align-items-center">
                         <div className="tdb__toolbar__base">
-                            <button onClick={onRefresh} className="tdb__toolbar__base__button" title="Refresh table contents">
+                            <button onClick={onRefreshHandler} className="tdb__toolbar__base__button" title="Refresh table contents">
                                 <BiRefresh className="tdb__toolbar__base__icon"/>
                                 <span>Refresh</span>
-                            </button>
+                            </button> 
                         </div>
                     </Col>
               </Row>