Skip to content

Commit 4eac538

Browse files
Francesca-BitFrancesca-Bit
committed
fix reject change_request
1 parent 13aeb34 commit 4eac538

File tree

5 files changed

+36
-26
lines changed

5 files changed

+36
-26
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
6060

6161
let extractedResults = documentResults ? extractDocuments(documentResults[type]) : []
6262

63-
const totalRows = 200
64-
6563
function extractDocuments(documentResultsArr) {
6664
if(!documentResultsArr) {
6765
//alert(JSON.stringify(documentResultsArr))
@@ -136,7 +134,7 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
136134
// setOrder={changeOrder}
137135
// query={null}
138136
loading={loading}
139-
totalRows={totalRows}
137+
totalRows={rowCount}
140138
onRefresh={function(){}}
141139
/>}
142140
</Tab>

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
import React, {useState} from "react"
22
import {Button, Form} from "react-bootstrap"
3-
import {WOQLClientObj} from "../init-woql-client"
3+
//import {WOQLClientObj} from "../init-woql-client"
44
import {ChangeRequest} from "../hooks/ChangeRequest"
55
import {
66
REJECT,
77
REJECTED
88
} from "./constants"
99
import {Loading} from "./Loading"
10-
import {useNavigate } from "react-router-dom"
10+
import {useNavigate,useParams } from "react-router-dom"
1111
import {RxCross2} from "react-icons/rx"
1212

13-
export const RejectComponent = ({setKey}) => {
14-
const {
15-
currentCRObject
16-
} = WOQLClientObj()
17-
13+
export const RejectComponent = () => {
14+
const {organization,dataProduct,id} = useParams()
15+
16+
//const {
17+
// currentCRObject
18+
//} = WOQLClientObj()
19+
1820
const {
1921
updateChangeRequestStatus,
2022
getChangeRequestList,
@@ -26,9 +28,12 @@ export const RejectComponent = ({setKey}) => {
2628

2729
/** handle Reject */
2830
async function handleReject () {
29-
let res=await updateChangeRequestStatus(val, REJECTED)
31+
let res=await updateChangeRequestStatus(val, REJECTED, id)
3032
let cr=await getChangeRequestList()
31-
navigate(`/change_requests/`)
33+
if(res){
34+
exitChangeRequestBranch()
35+
navigate(`/${organization}/${dataProduct}`)
36+
}
3237
}
3338

3439
return <Form.Group className="mt-3 mb-5 ml-3 mr-4">

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ export function ControlledGraphqlQuery (apolloClient, graphqlQuery, documentType
4949
}else{
5050
const data = result.data
5151
if(!Array.isArray(data[documentType]))return []
52-
const rowCountTmp = limit*start+data[documentType].length
53-
if(data[documentType].length === (limit+1)){
52+
//current page is the startoffset
53+
const rowCountTmp = currentpage+data[documentType].length
54+
if(data[documentType].length === (currentlimit+1)){
5455
//setHasNextPage(false)
5556
data[documentType].pop()
5657
}
@@ -115,10 +116,11 @@ export function ControlledGraphqlQuery (apolloClient, graphqlQuery, documentType
115116
})
116117
}
117118
setFilters(filtersArr)
119+
setStart(0)
118120
setQueryFilters(filtersTmp)
119121

120122
console.log("changeFilters" ,filtersArr, filtersTmp)
121-
callFetchMore(limit,start,orderBy,filtersTmp)
123+
callFetchMore(limit,0,orderBy,filtersTmp)
122124
}
123125

124126
const changeOrder = (orderByArr,fetchMore=false) =>{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ export const GraphqlTable = ({result, config, freewidth, start, filtersBy ,limit
148148
orderBy={orderBy}
149149
filtersBy={filtersBy}
150150
pages={pages}
151+
limit={limit}
151152
pageNumber={pagenum}
152153
rowCount={totalRows}
153154
setLimits={setLimits}

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { DefaultColumnFilter } from './ColumnFilters';
1111
* sort - no, local, remote
1212
*/
1313

14-
export const ReactTableComponent = ({columns, data, config, pages, freewidth, filtersBy, orderBy, rowCount, pageNumber, setLimits, setOrder, setFilters, pagesizes, onRefresh,hiddenColumns})=>{
14+
export const ReactTableComponent = ({columns, data, limit, config, pages, freewidth, filtersBy, orderBy, rowCount, pageNumber, setLimits, setOrder, setFilters, pagesizes, onRefresh,hiddenColumns})=>{
1515

1616
// console.log("COLUMS", JSON.stringify(columns,null,4))
1717

@@ -20,7 +20,7 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
2020

2121
rowCount = rowCount || data.length
2222

23-
const startPageSize= 10
23+
const startPageSize= limit || 10
2424
const startPageNumber = pageNumber || 0
2525
let ut_config = {
2626
columns,
@@ -33,7 +33,7 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
3333
pageCount : pages || 1,
3434
initialState : {
3535
filters : filtersBy || [],
36-
pageSize : 10,
36+
pageSize : startPageSize,
3737
pageIndex : pageNumber || 0,
3838
hiddenColumns: hiddenColumns
3939
//sortBy : orderBy,
@@ -73,9 +73,9 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
7373
let st = ((pageSize * pageIndex) + 1)
7474
let en = page.length + st - 1
7575
rowCountStr = "Record " + st + " to " + en
76-
if(rowCount){
76+
/* if(rowCount){
7777
total += " of " + rowCount
78-
}
78+
}*/
7979
}
8080

8181
useEffect(() => {
@@ -105,6 +105,10 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
105105
setLimits(pageSize, (pageIndex)*pageSize)
106106
}, [pageIndex, pageSize ])
107107

108+
const onRefreshHandler = () =>{
109+
setLimits(pageSize, (pageIndex)*pageSize)
110+
}
111+
108112

109113
return (
110114
<span>
@@ -157,20 +161,20 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
157161
{pager && data.length>0 &&
158162
<Row md={12} className="mr-0 ml-0">
159163
<Col md={3} className="d-flex justify-content-center align-items-center">
160-
<button id="table_previous" onClick={() =>
164+
<button style={{width:"60px"}} id="table_previous" onClick={() =>
161165
previousPage()}
162166
disabled={!canPreviousPage}>
163167
{'<'}
164168
</button>{' '}
165-
<button id="table_next" onClick={() =>
169+
<button style={{width:"60px"}} id="table_next" onClick={() =>
166170
nextPage()}
167171
disabled={!canNextPage}>
168172
{'>'}
169173
</button>{' '}
170174
</Col>
171175
<Col md={6} className="d-flex justify-content-center align-items-center">
172-
173-
<span id="table_page_number">
176+
177+
<span id="table_page_number" style={{opacity:0}}>
174178
Page{' '}
175179
<strong className="mr-3">
176180
{pageIndex + 1} of {pageCount}
@@ -193,10 +197,10 @@ export const ReactTableComponent = ({columns, data, config, pages, freewidth, fi
193197
</Col>
194198
<Col md={3} className="d-flex justify-content-center align-items-center">
195199
<div className="tdb__toolbar__base">
196-
<button onClick={onRefresh} className="tdb__toolbar__base__button" title="Refresh table contents">
200+
<button onClick={onRefreshHandler} className="tdb__toolbar__base__button" title="Refresh table contents">
197201
<BiRefresh className="tdb__toolbar__base__icon"/>
198202
<span>Refresh</span>
199-
</button>
203+
</button>
200204
</div>
201205
</Col>
202206
</Row>

0 commit comments

Comments
 (0)