ywana-core8 0.0.628 → 0.0.631

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.628",
+  "version": "0.0.631",
   "description": "ywana-core8",
   "homepage": "https://ywana.github.io/workspace",
   "author": "Ernesto Roldan Garcia",

package/src/domain/CollectionPage.js

@@ -21,7 +21,7 @@ export const CollectionPage = (props) => {
         schema, url, field, host, page, fetching = false,
         actions = [], onSelect,
         canFilter = false, canAdd = false, canDelete = false, canEdit = false, searchBy, addValidator,
-        autosave = false, delay = 1000,
+        autosave = false, delay = 1000, patch = false,
         groupBy, levels, sorter,
         editor,
         footer,
@@ -86,7 +86,7 @@ export const CollectionPage = (props) => {
                 {levels ? <CollectionTree schema={schema} icon={icon} levels={levels} onSelect={onSelect} sorter={sorter} searchBy={searchBy} /> : <CollectionList groupBy={groupBy} onSelect={onSelect} searchBy={searchBy} />}
             </menu>
             <main key={id} className={`collection-page ${className}`}>
-                <CollectionEditor icon={icon} schema={schema} layout={editor} autosave={autosave} delay={delay} canDelete={canDelete} canEdit={canEdit} onReload={reloadSelection} />
+                <CollectionEditor icon={icon} schema={schema} layout={editor} autosave={autosave} delay={delay} canDelete={canDelete} canEdit={canEdit} onReload={reloadSelection} patch={patch}/>
                 {children ? <article>{children}</article> : null}
                 <footer>
                     {footer}
@@ -310,7 +310,7 @@ export const CollectionTree = (props) => {
 const CollectionEditor = (props) => {
     const [pageContext, setPageContext] = useContext(PageContext)
     const { selected } = pageContext
-    const { icon, schema, layout, autosave = false, delay = 1000, canDelete, canEdit, onReload } = props
+    const { icon, schema, layout, autosave = false, delay = 1000, canDelete, canEdit, onReload, patch=false } = props
     const timer = useRef(null)
     const [form, setForm] = useState(selected)
 
@@ -348,7 +348,11 @@ const CollectionEditor = (props) => {
     }
 
     async function save() {
-        await pageContext.update(form)
+        if (patch) { 
+            await pageContext.patch(form.id, form)
+        } else { 
+            await pageContext.update(form) 
+        }
         setPageContext(Object.assign({}, pageContext))
     }
 

package/src/domain/ContentEditor.js

@@ -412,34 +412,10 @@ export const CollectionEditor = ({ field, value = [], onChange, onReload }) => {
     }
   }
 
-  function change(index, cellId, cellValue) {
-    if (onChange) {
-      const next = value.slice()
-      next[index][cellId] = cellValue
-      onChange(id, next)
-    }
-  }
-
   function reload() {
     if (onReload) onReload()
   }
 
- /* const columns = Object.values(item)
-    .filter(field => field.column === true)
-    .map((item) => ({ ...item, onChange: change }))
-  columns.push({ id: 'actions', label: 'Actions' })
-
-  const rows = value.map((item, index) => ({
-    ...item,
-    id: index,
-    actions: [
-      <Icon icon='delete' clickable action={() => remove(index)} size="small" />
-    ]
-  }))
-
-  const table = { columns, rows }
-*/
-
   return (
     <div className='collection-editor'>
       {

package/src/domain/ContentType.js

@@ -123,42 +123,47 @@ export class ContentType {
         const fields = Object.entries(this._schema)
         const next = fields.reduce((next, [name, field]) => {
 
-            const { type, item, optional } = field
+            const { type, item, optional, outsider } = field
             const entryData = data ? data[name] : null
 
-            switch (type) {
+            if (outsider === true) {
+                // Dont send outsider data
+            } else {
 
-                case TYPES.STRING:
-                    next[name] = entryData || field.default
-                    break;
+                switch (type) {
 
-                case TYPES.NUMBER:
-                    next[name] = entryData || field.default
-                    break;
+                    case TYPES.STRING:
+                        next[name] = entryData || field.default
+                        break;
 
-                case TYPES.BOOLEAN:
-                    next[name] = entryData || field.default
-                    break
+                    case TYPES.NUMBER:
+                        next[name] = entryData || field.default
+                        break;
 
-                case TYPES.ENTITY:
-                    if (optional === true && !entryData) break;
-                    const child1 = new ContentType(item)
-                    next[name] = child1.value(entryData)
-                    break;
+                    case TYPES.BOOLEAN:
+                        next[name] = entryData || field.default
+                        break
 
-                case TYPES.ARRAY:
-                    if (item === TYPES.STRING) {
-                        next[name] = entryData ? entryData : []
-                    } else {
-                        const child2 = new ContentType(item)
-                        next[name] = entryData ? entryData.map(data2 => child2.value(data2)) : []
-                    }
-                    break;
+                    case TYPES.ENTITY:
+                        if (optional === true && !entryData) break;
+                        const child1 = new ContentType(item)
+                        next[name] = child1.value(entryData)
+                        break;
 
-                default:
-                    next[name] = field
-                    break;
+                    case TYPES.ARRAY:
+                        if (item === TYPES.STRING) {
+                            next[name] = entryData ? entryData : []
+                        } else {
+                            const child2 = new ContentType(item)
+                            next[name] = entryData ? entryData.map(data2 => child2.value(data2)) : []
+                        }
+                        break;
+
+                    default:
+                        next[name] = field
+                        break;
 
+                }
             }
 
             return next