syntax updates

Author: Sean Bethel

src/assets/src/Reducer.js

@@ -2,6 +2,8 @@ import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import ReactSync from './ReactSync';
 import { Model, Page } from './components';
+
+import { snake_case, studly_case } from './helpers';
 // import * as pages from 'pages';
 
 // import * as models from 'models';
@@ -14,17 +16,19 @@ export default function Reducer(){
 	const models = Model.models;
 
 	const pages = Page.pages;
-	
+
 	const ReactSyncInstance = new ReactSync;
-	
+
 	ReactSyncInstance.boot({pages: pages});
-	
+
 	const { state = {} } = ReactSyncInstance.page_data;
 
 	if(_.isEmpty(state)) return null;
 
 	const model_map = Object.values(models).reduce((accumulator, v) => {
 		accumulator[v.plural] = v;
+		accumulator[snake_case(v.plural)] = v;
+		accumulator[studly_case(v.plural)] = v;
 		return accumulator;
 	}, {});
 	const models_with_keys = Object.values(models).map(C => [C.plural, C]);

src/assets/src/components/Field.js

@@ -12,7 +12,7 @@ class Field extends Component{
 
     this.field_type = Field.field_type.bind(this.props.model);
 
-    this.label = this.props.label || this.props.property;
+    this.label = (this.props.label === false) ? false : (this.props.label || this.props.property);
   }
 
 	/** */
@@ -91,6 +91,9 @@ class Field extends Component{
     }
     if(!field_renders[type.field]) return null;
     const classes = (this.props.className || '') + ' form-group';
+    if(this.label === false){
+	    return field_renders[type.field];
+    }
     return <fieldset className={classes}><label htmlFor={rand}>{this.label}</label> {field_renders[type.field]}</fieldset>;
   }
 

src/assets/src/components/Model.js

@@ -97,10 +97,10 @@ class Model extends Component{
 				}
 			}
 			if(relationValueModels){
-				this[relationName] = relationValueModels;	
+				//this[relationName] = relationValueModels;
+				def(this, relationName, () => relationValueModels);
+				def(this.relations, relationName, () => relationValueModels);
 			}
-			
-// 			this.relations[relationName] = this[relationName];
 
 		}
 		else {
@@ -111,27 +111,12 @@ class Model extends Component{
 			else{
 				def(this, relationName, () => this[relation_type](definition));
 				def(this.relations, relationName, () => this[relation_type](definition));
-/*
-				const resolved = this[relation_type](definition);
-				this[relationName] = resolved;
-				this.relations[relationName] = resolved;
-*/
 			}
 			}
 		});
 
 		this.constructor.boot(this);
-		
-/*
-		for(const i in this.props){
-			if(i in this){
-				console.log(i + ' is alrady set');
-			}
-			else{
-				console.log(i);
-			}
-		}
-*/
+
 	}
 
 	/** */

src/assets/src/components/Shell.js

@@ -24,7 +24,8 @@ class Shell extends Component{
 
 	/** */
 	refresh(){
-		let { Model, url } = this.props;
+		let { url } = this.props;
+/*
 		let fromcache;
 		// this.setState({children: null});
 		if(!this.constructor.cached[url]){
@@ -34,6 +35,8 @@ class Shell extends Component{
 			this.constructor.cached[url] = axios.get(url);
 		}
 		this.constructor.cached[url].then(response => {
+*/
+		axios.get(url).then(response => {
 			this.setState({children: response.data});
 		}).catch((err) => {
 			console.log(err, err.response);
@@ -54,8 +57,9 @@ class Shell extends Component{
 			this.refresh();
 		}
 		else if(!this.constructor.cached[this.props.url]){
-			this.refresh();
+			// this.refresh();
 		}
+		// else this.refresh();
 	}
 
 	/** */
@@ -88,7 +92,10 @@ class Shell extends Component{
 		return (
 			<>{items.map((props, i) => {
 				const normal_props = Model.get_non_reserved_props(remainder);
-				return <Model key={i} {...normal_props} {...props} shell={this} refresh={this.refresh.bind(this)} />;
+				const kname = Model.getPrimaryKey();
+				// debugger
+				const k = Model.make_key(props[kname], 'shell');
+				return <Model key={k} {...normal_props} {...props} shell={this} refresh={this.refresh.bind(this)} />;
 			})}
 			</>
 		);

src/assets/src/components/traits/Eloquent.js

@@ -100,6 +100,7 @@ class Eloquent extends Trait{
 		}
 
 		const qs_string = qs.stringify(qs_object);
+
 		return map[q] + `?${qs_string}`;
 	}
 
@@ -118,7 +119,7 @@ class Eloquent extends Trait{
 		let renderAs = this.props.renderAs || this.props.render || 'Default';
 		let renderName = `render${studly_case(renderAs)}`;
 		if(typeof renderAs === 'function'){
-			return renderAs(this.props);
+			return renderAs(this.props, this);
 		}
 
 		if(typeof this[renderName] === 'function'){

src/assets/src/components/traits/HasKeyProp.js

@@ -12,6 +12,12 @@ class HasKeyProp extends Trait{
     super(targetClass);
   }
 
+	/** */
+  static make_key(id, prefix = ''){
+    return `${prefix}_${this.plural}_${id}`;
+  }
+
+
 	/** */
   unique_key(prefix = ''){
     return `${prefix}_${this.plural}_${this.id}`;

src/assets/src/components/traits/HasRelations.js

@@ -18,6 +18,20 @@ class HasRelations extends Trait{
 	constructor(targetClass){
 		super(targetClass);
 	}
+	
+	
+	getRelation(relation_name){
+		const { definition } = this.schema[relation_name];
+		const { related, foreignKey } = definition;
+		const retval = { ...definition };
+		retval.RelatedModel = Model.getModel(related);
+		retval.render = (renderTypeOrFn = "default") => {
+			if(!this.props[foreignKey]) return null;
+			return <retval.RelatedModel find={this.props[foreignKey]} render={renderTypeOrFn} />
+		};
+		return retval;
+	}
+	
 
 	/** */
 	HasMany(relationship_definition_from_schema){
@@ -95,7 +109,7 @@ withDefault: null
 			return 
 		}
 */
-		console.log('BelongsTo found_item', Class_, found_item, found_item instanceof Model);
+// 		console.log('BelongsTo found_item', Class_, found_item, found_item instanceof Model);
 		return <Class_ {...app_get(`${plural}.${related_id}`)}/>
 
 	}

src/assets/src/components/traits/Queryable.js

@@ -39,7 +39,7 @@ class Queryable extends Trait{
  */
 	static find(id){
 		const { plural, repo } = this;
-		const dotstring = `${plural}.${id}`;		
+		const dotstring = `${plural}.${id}`;	
 		return app_get(dotstring);
 	}
 
@@ -190,14 +190,20 @@ class Queryable extends Trait{
 
 	/** */
 	static refresh_static(){
+		Shell.cache = {};
 		ReactSync.getInstance().update();
 	}
 
 
 	/** */
-	refresh(redirectEndpoint){
+	refresh(){
 		Shell.cache = {};
-		ReactSync.getInstance().update();
+		
+		if(this.props.refresh) this.props.refresh()
+		else{
+			ReactSync.getInstance().update();
+		}
+		
 	}
 
 }

src/helpers.php

@@ -130,6 +130,7 @@ function get_schema($model = null){
             $relations = collect($reflection->getMethods())->filter(function($v) use($model_name, $reflected_relations){
                 if($v->class == $model_name){
 	                $function_text = returnFunctionText($v);
+
 	                $isrel = !!$reflected_relations->first(function($m) use($function_text){
 		                return str_contains($function_text, '->' . $m);
 	                });