ywana-core8 0.0.744 → 0.0.746

package/package.json

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

package/src/domain/CollectionPage.js

@@ -81,7 +81,7 @@ export const CollectionPage = (props) => {
             </Header>
             <menu className={`collection-page ${className} ${hiddenStyle}`}>
                 {canFilter ? <CollectionFilters schema={schema} initial={filters} /> : null}
-                {levels ? <CollectionTree schema={schema} icon={icon} levels={levels} onSelect={onSelect} sorter={sorter} searchBy={searchBy} namer={namer} /> : <CollectionList groupBy={groupBy} onSelect={onSelect} searchBy={searchBy} itemRenderer={listItemRenderer} />}
+                {levels ? <CollectionTree schema={schema} icon={icon} levels={levels} onSelect={onSelect} sorter={sorter} searchBy={searchBy} namer={namer} /> : <CollectionList groupBy={groupBy} onSelect={onSelect} searchBy={searchBy} itemRenderer={listItemRenderer} sorter={sorter} />}
             </menu>
             <main key={id} className={`collection-page ${className}`}>
                 <CollectionEditor icon={icon} schema={schema} layout={editor} autosave={autosave} delay={delay} canDelete={canDelete} onReload={reloadSelection} patch={patch} onChange={onChange} actions={editorActions} title={editorTitle} />
@@ -189,7 +189,7 @@ const FilterResume = (props) => {
  */
 const CollectionList = (props) => {
 
-    const { groupBy, onSelect, searchBy = [], itemRenderer } = props
+    const { groupBy, onSelect, searchBy = [], itemRenderer, sorter } = props
     const [pageContext, setPageContext] = useContext(PageContext)
     const { all = [] } = pageContext
     const [filter, setFilter] = useState()
@@ -221,8 +221,9 @@ const CollectionList = (props) => {
         return items
     }
 
-    const items = search()
-    const items2 = items.map(content => {
+    const searched = search()
+    const sorted = sorter ? sorter(searched) : searched
+    const items2 = sorted.map(content => {
         if (itemRenderer) return itemRenderer(content)
         return {
             id: content.id,
@@ -319,7 +320,7 @@ export const CollectionTree = (props) => {
     function search() {
         const items = filter ? all.filter(item => {
             const result = searchBy.some(fieldName => {
-                const value = item[fieldName]
+                const value = item[fieldName] ? item[fieldName].toUpperCase() : ""
                 return value ? value.indexOf(filter.toUpperCase()) >= 0 : false
             })
             return result
@@ -375,9 +376,12 @@ const CollectionEditor = (props) => {
     }
 
     async function remove() {
-        await pageContext.remove(selected.id)
-        pageContext.clear()
-        setPageContext(Object.assign({}, pageContext))
+        const accept = site.confirm("¿ Esta seguro ?")
+        if (accept === true) {
+            await pageContext.remove(selected.id)
+            pageContext.clear()
+            setPageContext(Object.assign({}, pageContext))
+        }
     }
 
     function change(next) {