Merge pull request #122 from terminusdb/fix_change_request_id

review payment page

Author: KittyJose

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

@@ -36,6 +36,7 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
         orderBy,
         filterBy,
         loading,
+       // hiddenColumnsArr,
         documentResults } = ControlledGraphqlQuery(apolloClient,query, type, 10, 0, {}, false);
 
     useEffect(() => {
@@ -141,6 +142,7 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
                       result={extractedResults}
                       freewidth={true}
                       config ={tableConfigObj}
+                    //  hiddenColumnsArr = {hiddenColumnsArr}
                    //   view={(tableConfig ? tableConfig.json() : {})}
                       limit={limit}
                       start={start}

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

@@ -12,7 +12,9 @@ export function ControlledGraphqlQuery (apolloClient, graphqlQuery, documentType
   //  const [hasNextPage, setHasNextPage] = useState(true)
     const [controlledRefresh, setControlledRefresh] = useState(0)
     const [data, setData] = useState(null)
- 
+    
+    const [setHiddenColumnsArr, hiddenColumnsArr] = useState([])
+
     //filter is the filter formatted for the query
     let filterTable  = []
 
@@ -157,6 +159,8 @@ export function ControlledGraphqlQuery (apolloClient, graphqlQuery, documentType
         rowCount,
         onRefresh,
         documentResults:data,
+        hiddenColumnsArr,
+        setHiddenColumnsArr,
         // maybe we need to set from outside
        // setDocumentResults,
        // setControlledRefresh,

packages/tdb-dashboard/src/payment/CancelSubscription.js

@@ -54,7 +54,8 @@ export const CancelSubscription = ({showModal, setShowModal}) => {
                 </Card>	
     }
 
-    return <Modal centered size="lg" className="modal-dialog-right" show={showModal} onHide={closeModal}>
+    return <Modal centered size="lg" className="modal-dialog-right" show={showModal} onHide={closeModal} backdrop="static"
+    keyboard={false}>
             <Modal.Header>
                 <Stack direction="horizontal" gap={10} className="justify-content-center"> 	
                     <Modal.Title className="h4 fw-bold">Downgrade to Community</Modal.Title>	

packages/tdb-dashboard/src/payment/PaymentPage.js

@@ -12,7 +12,7 @@ export const PaymentPage = ({showModal, setShowModal, subscriptionObj}) => {
         setShowModal(false)
     }
 
-    return <Modal size="lg" className="modal-dialog-right" show={showModal} onHide={closeModal}>
+    return <Modal size="lg" className="modal-dialog-right" show={showModal} onHide={closeModal} backdrop="static" keyboard={false}>
             <Modal.Header style={{background:subscriptionObj.color}}>
                 <Stack direction="horizontal" gap={10} className="justify-content-center"> 	
                     <Modal.Title className="h4 fw-bold"  >Update to {subscriptionObj.title}</Modal.Title>	

packages/tdb-dashboard/src/payment/StripeManager.js

@@ -24,13 +24,12 @@ export function StripeManager(stripe=null){
       processStart()
       const token = await clientUser.getTokenSilently()
       const options = getOptions(token);
-      const response = await axiosHub.delete(`${baseUrl}/private/subscription`, options)
-      return true
+      await axiosHub.delete(`${baseUrl}/private/subscription`, options)
+      clientUser.userInfo.tier = "Community"
+      processSuccess()  
     }catch(err){
       const message =  err && err.response && err.response.data ? err.response.data.message : 'There was an error processing your request'
       processError(message)
-    }finally{
-      processSuccess()
     }
   }
 

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

@@ -20,7 +20,7 @@ minWidth,
 maxWidth}]*/
 
 //this only render the logic of do the query is in an external hook
-export const GraphqlTable = ({result, config, freewidth, start, filtersBy ,limit, orderBy, totalRows, setLimits, setOrder, setFilters,onRefresh,dowloadConfig})=>{
+export const GraphqlTable = ({hiddenColumnsArr, result, config, freewidth, start, filtersBy ,limit, orderBy, totalRows, setLimits, setOrder, setFilters,onRefresh,dowloadConfig})=>{
    // let wt = TerminusClient.View.table()
    // if(view)  wt.loadJSON(view.table, view.rules)
 
@@ -68,7 +68,7 @@ export const GraphqlTable = ({result, config, freewidth, start, filtersBy ,limit
     };
 
     function formatTableColumns(){
-        const hiddenColumns = []
+        const hiddenColumns = [] //hiddenColumnsArr
         // I visualise the id only if it is the only item
         const colArr = config.columns
         if(!Array.isArray(colArr))return []