merge payment fix and new request end point

Author: Francesca-Bit

packages/tdb-dashboard/src/components/DiffView copy.js

@@ -103,9 +103,7 @@ export const DiffView = ({diffs, CRObject}) => {
         frames, 
         woqlClient:client,
     } = WOQLClientObj()
-    /*const {
-        getChangeRequestByID,
-    } = ChangeRequest()*/
+
     const {id} = useParams()
 
     // pagination constants

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

@@ -103,9 +103,7 @@ export const DiffView = ({diffs, CRObject}) => {
         frames, 
         woqlClient:client,
     } = WOQLClientObj()
-    /*const {
-        getChangeRequestByID,
-    } = ChangeRequest()*/
+
     const {id} = useParams()
 
     // pagination constants

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

@@ -68,6 +68,36 @@ export function ChangeRequest(){
         }     
     }
 
+   
+    const getChangeRequestHead = async(id) =>{
+        try{ 
+            setLoading(true) 
+           // const payload = {id}
+            const result = await woqlClient.sendCustomRequest("GET", `${getUrl()}/${id}/head`)
+            return result
+        }catch(err){
+            const errMessage = formatErrorMessage(err)
+            setError(errMessage)
+        }finally{
+            setLoading(false)
+        }     
+    }
+
+    const rebaseChangeRequestBranch = async(id) =>{
+        try{ 
+            setLoading(true) 
+           // const payload = {id}
+            const result = await woqlClient.sendCustomRequest("PUT", `${getUrl()}/${id}/rebase`,{})
+            return result
+        }catch(err){
+            const errMessage = formatErrorMessage(err)
+            setError(errMessage)
+        }finally{
+            setLoading(false)
+        }     
+    }
+
+
 // TO BE REVIEW ?????
     const getChangeRequestByID = async(id) =>{
         try{ 
@@ -98,7 +128,9 @@ export function ChangeRequest(){
         createChangeRequest,
         getChangeRequestList,
         updateChangeRequestStatus,
-        getChangeRequestByID
+        getChangeRequestByID,
+        getChangeRequestHead,
+        rebaseChangeRequestBranch
     }
 
 }

packages/tdb-dashboard/src/pages/PlansPage.js

@@ -8,6 +8,7 @@ import {WOQLClientObj} from '../init-woql-client'
 import { Feedback } from "./Feedback";
 import {MdEuroSymbol} from "react-icons/md"
 import { StripeManager } from "../payment/StripeManager";
+import {CancelSubscription} from "../payment/CancelSubscription";
 /*
 * the plan card, we use this component in home page
 */
@@ -16,6 +17,7 @@ export const PlansPage = (props) => {
 	const navigate = useNavigate()
 	const [showFeedbackForm, setShowFeedbackForm] = useState(false)
 	const [showModalPlan ,setShowModalPlan] = useState(false)
+	const [showModalCancel ,setShowModalCancel] = useState(false)
 	const {getPaymentMethod,paymentMethod} = StripeManager()
 
 	const tier = clientUser && clientUser.userInfo ? clientUser.userInfo.tier : "Community"
@@ -42,7 +44,7 @@ export const PlansPage = (props) => {
 
 	const communityActions = () =>{
 		if(toBedisabled[tier]){
-			alert("DownGrade")
+			setShowModalCancel(true)
 		}else{
 			navigate("/")
 		}
@@ -78,6 +80,7 @@ export const PlansPage = (props) => {
 	return(<Layout showLeftSideBar={false}>
 		{showModalPlan && <PaymentPage showModal={showModalPlan !== false ? true : false } 
 				setShowModal={setShowModalPlan} subscriptionObj={showModalPlan}/>}
+		{showModalCancel && <CancelSubscription showModal={showModalCancel} setShowModal={setShowModalCancel} />}
 		{showFeedbackForm && < Feedback boxType= {ENTERPRISE_PLAN} setShowFeedbackForm={setShowFeedbackForm}/>}
 		 <Container className="center-align col-md-10">
 		 <Row xs={1} md={4} className="g-4 py-2 w-100">

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

@@ -2,19 +2,26 @@ import React from "react"
 import {WOQLClientObj} from '../init-woql-client'
 import {Modal,Button,Stack, Card} from "react-bootstrap"
 import {MdEuroSymbol} from "react-icons/md"
+import {StripeManager} from "./StripeManager"
 
-export const PaymentPage = ({showModal, setShowModal, tier}) => {
+export const CancelSubscription = ({showModal, setShowModal}) => {
     const {woqlClient, } = WOQLClientObj()
     if(!woqlClient) return ""
 
     const closeModal = () =>{
         setShowModal(false)
     }
 
+    const { succeeded, 
+        error, 
+        processing, deleteSubscrition} = StripeManager()
+
+    
+
     return <Modal size="lg" className="modal-dialog-right" show={showModal} onHide={closeModal}>
-            <Modal.Header style={{background:subscriptionObj.color}}>
+            <Modal.Header>
                 <Stack direction="horizontal" gap={10} className="justify-content-center"> 	
-                    <Modal.Title className="h4 fw-bold">Remove the {tier} Subscription</Modal.Title>	
+                    <Modal.Title className="h4 fw-bold">Downgrade to Community</Modal.Title>	
 				</Stack>
                 <Button variant="close" aria-label="Close" onClick={closeModal} />
             </Modal.Header>
@@ -25,13 +32,13 @@ export const PaymentPage = ({showModal, setShowModal, tier}) => {
                             <Card.Text><MdEuroSymbol />0</Card.Text>
                       </Stack>                
                       <div className="d-flex justify-content-end mt-2"> 
-                        <Button onClick={props.closeModal} disabled={processing} variant="light" >Cancel</Button>
-                        <Button type={"submit"} disabled={processing  || !enableSubmit || !stripe} className="ml-3">
+                        <Button onClick={closeModal} disabled={processing} variant="light" >Cancel</Button>
+                        <Button type={"submit"} disabled={processing} className="ml-3" onClick={deleteSubscrition}>
                             {processing ? "Processing…" : "Downgrade"}
                         </Button>
                       </div>
                       <div className="d-flex justify-content-end mt-2"> 
-                        <span style={{fontSize: "15px", color: "#888" }}>* your account will be billed monthly until cancelled.
+                        <span style={{fontSize: "15px", color: "#888" }}>
                           </span>
                       </div>   
                 </Card>			

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

@@ -34,7 +34,6 @@ export function FormPayment(props) {
   const city = useRef(null);
   const address = useRef(null);
 
-
   const stripe = useStripe();
   const elements = useElements();
 
@@ -96,8 +95,6 @@ export function FormPayment(props) {
     ;
 };
 
-
-
 const renderSuccess = () => {
       function goToHome (){
           navigate("/")