ywana-core8 0.0.454 → 0.0.455

package/package.json

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

package/src/domain/ContentViewer.js

@@ -45,7 +45,7 @@ export const ContentViewer = (props) => {
 const FieldViewer = (props) => {
 
     const { field, value } = props
-    const { id, type, item, label, visible = true, optional } = field
+    const { type, item, label, visible = true, optional } = field
 
     if (!visible) return null
 

package/src/domain/TablePage.js

@@ -72,6 +72,7 @@ export const TablePage = (props) => {
             form.filters = filters
             form.layout = {}
             form.user = user
+            form.url = url
             await pageContext.createQuery(form, user)
             setPageContext(Object.assign({}, pageContext))
         }
@@ -146,7 +147,7 @@ export const TablePage = (props) => {
             </Header>
             {canQuery || canFilter ? (
                 <menu className="table-page">
-                    {canQuery ? <TableQueries schema={schema} user={user} /> : null}
+                    {canQuery ? <TableQueries schema={schema} url={url} user={user} /> : null}
                     {canFilter ? <TableFilters schema={schema} onSave={canQuery ? saveQuery : null} /> : null}
                 </menu>
             ) : null}
@@ -222,7 +223,7 @@ const TableSelector = (props) => {
 const TableQueries = (props) => {
 
     const [pageContext, setPageContext] = useContext(PageContext)
-    const { user } = props
+    const { url, user } = props
     const { queries = [] } = pageContext
     const [selected, setSelected] = useState()
 
@@ -241,16 +242,18 @@ const TableQueries = (props) => {
         <Fragment>
             <Header className="table-queries" title={<Text>Queries</Text>} />
             <main className="table-queries">
-                {queries ? queries.map(query => {
-                    const style = selected === query.id ? "selected" : ""
-                    return (
-                        <div className={`table-queries-item ${style}`} onClick={() => select(query)}>
-                            <Icon icon="star" size="small" />
-                            <label>{query.name}</label>
-                            <Icon icon="close" clickable size="small" action={() => remove(query.id)} />
-                        </div>
-                    )
-                }) : <div>...empty...</div>}
+                {queries ? queries
+                    .filter(query => query.url === url)
+                    .map(query => {
+                        const style = selected === query.id ? "selected" : ""
+                        return (
+                            <div className={`table-queries-item ${style}`} onClick={() => select(query)}>
+                                <Icon icon="star" size="small" />
+                                <label>{query.name}</label>
+                                <Icon icon="close" clickable size="small" action={() => remove(query.id)} />
+                            </div>
+                        )
+                    }) : <div>...empty...</div>}
             </main>
         </Fragment>
     )
@@ -272,7 +275,6 @@ const TableFilters = (props) => {
             if (filterSchema[key].filter === false) {
                 delete filterSchema[key]
             } else {
-
                 if (filterSchema[key].type === TYPES.ENTITY) {
                     const fs = filterSchema[key].item
                     for (var key in fs) {
@@ -308,7 +310,9 @@ const TableFilters = (props) => {
     }
 
     function save() {
-        if (onSave) onSave(form)
+        if (onSave) {
+            onSave(form)
+        }
     }
 
     const content = new Content(filterSchema, form)
@@ -316,7 +320,7 @@ const TableFilters = (props) => {
         <Fragment>
             <Header className="table-filters" title={<Text>Filters</Text>} >
                 <Icon icon="filter_list_off" size="small" clickable action={clear} />
-                { onSave ? <Icon icon="save" size="small" clickable action={save} /> : null }
+                {onSave ? <Icon icon="save" size="small" clickable action={save} /> : null}
             </Header>
             <main className="table-filters">
                 <ContentEditor content={content} onChange={change} />
@@ -386,9 +390,7 @@ export const TableEditor = (props) => {
 
     function renderGroupLabel(groupName) {
         const grouper = schema[groupBy]
-
         if (!groupName || !grouper) return ""
-
         if (grouper.options) {
             const options = CHECK['isFunction'](grouper.options) ? grouper.options() : grouper.options
             const option = options.find(option => option.value === groupName)
@@ -399,9 +401,7 @@ export const TableEditor = (props) => {
     }
 
     function renderGroups() {
-
         const items = filter ? filter(all) : all
-
         const groups = items.reduce((groups, item) => {
             const groupName = item[groupBy]
             const group = groups[groupName]
@@ -409,9 +409,7 @@ export const TableEditor = (props) => {
             groups[groupName].push(item)
             return groups
         }, {})
-
         return Object.keys(groups).map(groupName => {
-
             const table = {
                 columns: Object.values(schema)
                     .filter(field => field.column === true)
@@ -442,7 +440,6 @@ export const TableEditor = (props) => {
                         return item
                     })
             }
-
             table.columns.push({ id: "actions" })
             const groupSize = groups[groupName].length
             const title = <span><span className="size">{groupSize}</span>{renderGroupLabel(groupName)}</span>