ywana-core8 0.0.35 → 0.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.35",
+  "version": "0.0.39",
   "description": "ywana-core8",
   "author": "Ernesto Roldan Garcia",
   "license": "MIT",

package/src/domain/ContentEditor.css

@@ -3,7 +3,6 @@
 }
 
 .content-editor>section {
-
     margin-bottom: 1rem;
 }
 
@@ -90,14 +89,12 @@
     background-color: var(--paper-color) !important;
 }
 
-
 .collection-adder td.actions {
     border: solid 0px red;
     display: flex;
     align-items: center;
 }
 
-
 .field-editor {
     padding: 0;
 }

package/src/domain/ContentEditor.js

@@ -14,7 +14,7 @@ export const ContentEditor = ({ content, filter, onChange }) => {
   }
 
   const sections = content.sections()
-
+  console.log('-----------contentEditor------', filter)
   return (
     <div className='content-editor'>
       {sections.map((section) => {

package/src/domain/CreateContentDialog.js

@@ -31,9 +31,10 @@ export const CreateContentDialog = ({ label, type, value = {}, filter, validator
         site.closeDialog();
     }
 
-    function createFilter(field, content) {
-        return field.required === true || field.optional === true
-        // TODO: execute props.filter
+    function filterForm(field, content) {
+        console.log('------ filterForm------------', field.id, filter)
+        const visible =  field.required === true || field.optional === true
+        return filter ? visible && filter(field, content) : visible
     }
 
     const actions = (
@@ -48,7 +49,7 @@ export const CreateContentDialog = ({ label, type, value = {}, filter, validator
     const content = new Content(type, form)
     return (
         <Dialog title={title} open={true} onAction={onAction} actions={actions}>
-            <ContentEditor content={content} onChange={change} filter={createFilter} />
+            <ContentEditor content={content} onChange={change} filter={filterForm} />
             {errors.map(error => <Text use="overline" tag="div" className="error">{error}</Text>)}
         </Dialog>
     )

package/src/domain/EditContentDialog.js

@@ -31,6 +31,11 @@ export const EditContentDialog = ({ label, type, value = {}, filter, validator,
         site.closeDialog();
     }
 
+    function filterForm(field, content) {
+        const visible =  field.required === true || field.optional === true
+        return filter ? visible && filter(field, content) : visible
+    }
+
     const actions = (
         <Fragment>
             <Button label="CLOSE" action={() => onAction("CLOSE")} />
@@ -43,7 +48,7 @@ export const EditContentDialog = ({ label, type, value = {}, filter, validator,
     const content = new Content(type, form)
     return (
         <Dialog title={title} open={true} onAction={onAction} actions={actions}>
-            <ContentEditor content={content} onChange={change} filter={filter} />
+            <ContentEditor content={content} onChange={change} filter={filterForm} />
             {errors.map(error => <Text use="overline" tag="div" className="error">{error}</Text>)}
         </Dialog>
     )

package/src/domain/TablePage.js

@@ -1,11 +1,11 @@
 import equal from 'deep-equal'
 import React, { Fragment, useContext, useEffect, useMemo, useRef, useState } from 'react'
-import { EditContentDialog } from './EditContentDialog'
-import { Content } from './ContentType'
-import { ContentEditor } from './ContentEditor'
-import { HTTPClient, Session } from '../http'
-import { SiteContext, PageContext } from '../site'
 import { Button, DataTable, DropDown, Header, Icon, MenuIcon, MenuItem, Text } from '../html'
+import { HTTPClient, Session } from '../http'
+import { PageContext, SiteContext } from '../site'
+import { ContentEditor } from './ContentEditor'
+import { Content } from './ContentType'
+import { CreateContentDialog } from './CreateContentDialog'
 import "./TablePage.css"
 
 const http = HTTPClient(window.API || process.env.REACT_APP_API, Session);
@@ -16,7 +16,7 @@ const http = HTTPClient(window.API || process.env.REACT_APP_API, Session);
 export const TablePage = (props) => {
 
     const site = useContext(SiteContext)
-    const { id = "table", icon, title, name = "table 1", schema, url, field, delay = 1000, actions, editable, canAdd = true, dev = false, autosave = true, groupBy, validator, scenario } = props
+    const { id = "table", icon, title, name = "table 1", schema, url, field, delay = 1000, actions, editable, canAdd = true, dev = false, autosave = true, groupBy, validator, scenario, formFilter } = props
     const [pageContext, setPageContext] = useContext(PageContext)
     const { selected } = pageContext
     const timer = useRef(null)
@@ -46,7 +46,8 @@ export const TablePage = (props) => {
             await pageContext.create(form);
             setPageContext(Object.assign({}, pageContext))
         }
-        site.openDialog(<EditContentDialog label={`Crear ${name}`} type={schema} onOK={onOK} validator={validator} />);
+        //site.openDialog(<EditContentDialog label={`Crear ${name}`} type={schema} onOK={onOK} validator={validator} />);
+        site.openDialog(<CreateContentDialog label={`Crearr ${name}`} type={schema} onOK={onOK} validator={validator} filter={formFilter}/>);
     }
 
     function change(next) {