Merge pull request #102 from terminusdb/add_payment

remove geo properties from model builder

Author: Francesca-Bit

packages/tdb-dashboard/src/App.css

@@ -1172,3 +1172,10 @@ pre.CodeMirror-line  > span > span.cm-string {
 .graphiql-response {
   overflow: auto !important;
 }
+
+#profile_menu >.dropdown-menu[data-bs-popper] {
+  top: 100%;
+  right: 0;
+  left: auto !important;
+  margin-top: var(--bs-dropdown-spacer);
+}

packages/tdb-dashboard/src/App.js

@@ -39,8 +39,10 @@ export function App (props){
 
     if (clientUser.firstLogin === true) {
         clientUser.firstLogin = false
+
        // navigate(`/${PLANS}`)
         window.location.replace(`/${PLANS}`) 
+
     }
 
     // this happen after confirm you password linking in the email url

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

@@ -107,7 +107,7 @@ export const JSONModelBuilder = ({tab,saveGraph,accessControlEditMode}) => {
                             <input id="schema_save_description" placeholder={"Enter a description to tag update"} type="text" className="form-control" onBlur={handleCommitMessage}/>
                         </div>
                         <button  type="button" id="schema_save_button" className="col-md-1 btn btn-md bg-light text-dark mr-4" onClick={saveChange}>
-                            <BsSave className="small"/> <label className="mt-1">Save Schema</label>
+                            <BsSave className="small"/> <label className="mt-1">Save</label>
                         </button>
                     </div>
                 }

packages/tdb-dashboard/src/init-woql-client.js

@@ -377,7 +377,8 @@ export const WOQLClientProvider = ({children, params}) => {
             }
             //this is for change the base url api for the proxy
             if(opts.connection_type!== "LOCAL"){
-                hubClient.connectionConfig.api_extension = `${orgName}/api/`
+                // add  a new terminusdb method 
+                hubClient.connectionConfig.api_extension = `${UTILS.encodeURISegment(orgName)}/api/`
                 //load the list of system roles
             }
 

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

@@ -36,7 +36,7 @@ export const ModelBuilder = (props) =>{
     if(!dataProduct) return <div>error in loading graph</div>
 
     return <React.Fragment>
-        {reportMessage && <Alert className ="mt-3" variant="danger" dismissible onClose={() => setReport(false)}>
+        {reportMessage && !callServerLoading && <Alert className ="mt-3" variant="danger" dismissible onClose={() => setReport(false)}>
                           <Alert.Heading>{reportMessage.message.title}</Alert.Heading>
 
                         <p>{reportMessage.message.text}</p>

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

@@ -88,7 +88,11 @@ export const PlansPage = (props) => {
 									<Card.Text className="text-light text-left h6">
 										{arr.text}
 									</Card.Text>
+
+									<Stack direction="vertical">
 									{getLabels(arr)}
+									</Stack>
+
 								</Card.Body>
 								<Card.Footer  style={{background:arr.color}}>
 								</Card.Footer >

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

@@ -204,10 +204,12 @@ const renderSuccess = () => {
                         className="border-light-01" type="email" name="email" id="email" placeholder="Email" 
                         defaultValue={props.defaultEmail} />          
                     </FormGroup>             
+
                      <FormGroup className="mb-4">
                       <Form.Label for="name">Company Name</Form.Label>
                       <FormControl ref={companyName}  className="border-light-01" type="text" name="name" id="name" placeholder="Company Name" required={true} />
                     </FormGroup>
+
                     <Row>
                         <Col >
                       <FormGroup className="mb-4">
@@ -226,7 +228,8 @@ const renderSuccess = () => {
                      <FormGroup className="mb-4">
                       <Form.Label for="address">Street Address</Form.Label>
                       <FormControl ref={address}  className="border-light-01" type="text" name="name" id="name" placeholder="Street Address" required={true} />
-                    </FormGroup>  
+
+                    </FormGroup> 
                     <Row>
                     <Col >
                       <FormGroup className="mb-4">

packages/tdb-react-components/src/constants/details-labels.js

@@ -134,7 +134,7 @@ export const STRING_TYPE_DATAPROVIDER={label: 'String Type',
 export const CLASS_PROPERTIES_LIST=[{label:'Enum Property', id:'ChoiceProperty',range:''},
 		    					   {label:'Numeric Property', id:'NumericProperty',defaultRange:'xsd:decimal'},
 		    					   {label:'String Property', id:'StringProperty',defaultRange:'xsd:string'},
-		    					   {label:'Geo Property', id:'GeoProperty',defaultRange:'xdd:coordinate'},
+		    					  // {label:'Geo Property', id:'GeoProperty',defaultRange:'xdd:coordinate'},
 		    					   {label:'Temporal Property', id:'TemporalProperty',defaultRange:'xsd:dateTime'},
 								   {label:'Boolean Property', id:'BooleanProperty',defaultRange:'xsd:boolean'},
 								   {label:'JSON Property', id:'JSONProperty',defaultRange:'sys:JSON'},
@@ -146,7 +146,7 @@ export const GET_ICON_NAME={StringProperty:'custom-img-string',
 							JSONProperty:'custom-img-string',		
 							NumericProperty:'custom-img-number_alt',
 							ChoiceProperty:'custom-img-choice',
-							GeoProperty:'custom-img_map',
+							//GeoProperty:'custom-img_map',
 							TemporalProperty:'custom-img-temporal',
 							LinkProperty:'custom-img-classes'}
 

packages/tdb-react-components/src/treeGraphComponent/hook/modelCallServerHook.js

@@ -102,12 +102,6 @@ export const modelCallServerHook = (woqlClient,branch,ref,dbId, pendoMsgAfterCre
 				await woqlClient.addDocument(newSchema,params,null,commitM)					
 
 				let msg = `Successfully updated schema graph`
-				setReport({
-					status: 'success',
-					message:  msg,
-					time: Date.now() - ts,
-				})
-     
 	            setReloadGraph(Date.now())
 			}catch(err){
 				//console.log("err", err.message)