ywana-core8 0.0.747 → 0.0.749

package/package.json

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

package/src/domain2/CollectionList.js

@@ -8,7 +8,7 @@ import './CollectionList.css'
  */
 export const CollectionList = (props) => {
 
-    const { itemRenderer, groupBy, searchBy = [], sortBy, sortDir } = props
+    const { itemRenderer, groupBy, groupRenderer, searchBy = [], sortBy, sortDir } = props
     const context = useContext(CollectionContext)
     const { all = [], selected, filters, customFilters } = context
     const [search, setSearch] = useState('')
@@ -51,7 +51,7 @@ export const CollectionList = (props) => {
 
     return (
         <div className={`collection-list ${style}`}>
-            <List items={items} onSelect={select} groupBy={groupBy} />
+            <List items={items} onSelect={select} groupBy={groupBy} groupRenderer={groupRenderer} />
             {searchBy.length > 0 ? (
                 <div className="search-box">
                     <Icon icon="search" size="small" />

package/src/domain2/CollectionPage.js

@@ -17,7 +17,7 @@ export const CollectionPage = (props) => {
         title, actions,
         canFilter, customFilters, filtersValue,
         sortBy, sortDir,
-        listGroupBy, listSearchBy, listItemRenderer,
+        listGroupBy, listSearchBy, listItemRenderer, listGroupRenderer,
         customEditor,
     } = props
     
@@ -28,7 +28,7 @@ export const CollectionPage = (props) => {
                     {actions}
                 </Header>
                 {canFilter ? <CollectionFilters schema={schema} >{customFilters}</CollectionFilters> : null}
-                <CollectionList itemRenderer={listItemRenderer} groupBy={listGroupBy} searchBy={listSearchBy} sortBy={sortBy} sortDir={sortDir} />
+                <CollectionList itemRenderer={listItemRenderer} groupBy={listGroupBy} groupRenderer={listGroupRenderer} searchBy={listSearchBy} sortBy={sortBy} sortDir={sortDir} />
                 <CollectionEditor customEditor={customEditor} />
             </CollectionContextProvider>
         </div>

package/src/html/list.js

@@ -8,7 +8,7 @@ import "./list.css"
  */
 export const List = (props) => {
 
-    const { items = [], children, selected, onSelect, groupBy } = props
+    const { items = [], children, selected, onSelect, groupBy, groupRenderer } = props
 
     function select(id) {
         if (onSelect) onSelect(id)
@@ -28,7 +28,7 @@ export const List = (props) => {
  * Grouped List
  */
 const GroupedList = (props) => {
-    const { items = [], children, selected, onSelect, groupBy } = props
+    const { items = [], children, selected, onSelect, groupBy, groupRenderer } = props
 
     const groups = items.reduce((groups, item) => {
         let group = groups.find(g => g.name === item[groupBy])
@@ -42,14 +42,17 @@ const GroupedList = (props) => {
 
     return (
         <div className="list grouped">
-            {groups.map(group => (
-                <Fragment key={group.name}>
-                    <header key={`${group.name}-header`}><Text>{group.name}</Text></header>
-                    <ul key={`${group.name}-ul`}>
-                        {group.items.map(item => <ListItem key={item.id} item={item} selected={selected} onSelect={onSelect} />)}
-                    </ul>
-                </Fragment>
-            ))}
+            {groups.map(group => {
+                const groupTitle = groupRenderer ? groupRenderer(group) : <Text>{group.name}</Text>
+                return (
+                    <Fragment key={group.name}>
+                        <header key={`${group.name}-header`}>{groupTitle}</header>
+                        <ul key={`${group.name}-ul`}>
+                            {group.items.map(item => <ListItem key={item.id} item={item} selected={selected} onSelect={onSelect} />)}
+                        </ul>
+                    </Fragment>
+                )
+            })}
             {children}
         </div>
     )

package/src/html/textfield.js

@@ -120,7 +120,7 @@ export const TextArea = (props) => {
 export const DropDown = (props) => {
 
     const site = useContext(SiteContext)
-    const { id, options = [], value, onChange, predictive = false, readOnly = false, verbose = true, editable = false, onBlur } = props
+    const { id, icon, options = [], value, onChange, predictive = false, readOnly = false, verbose = true, editable = false, onBlur } = props
     const [open, setOpen] = useState(false)
     const [label, setLabel] = useState()
 
@@ -180,7 +180,12 @@ export const DropDown = (props) => {
         if (canShow) {
             const filterActive = predictive === true && label && label.length > 0
             const items = filterActive ? options.filter(option => option.label.toUpperCase().indexOf(label.toUpperCase()) >= 0) : options
-            const lis = items.map(option => <li key={option.value} value={option.value} onClick={() => select(option.value)}><Text>{option.label}</Text></li>)
+            const lis = items.map(option => (
+                <li key={option.value} value={option.value} onClick={() => select(option.value)}>
+                    {icon ? <Icon icon={icon} size="small" /> : ''}
+                    <Text>{option.label}</Text>
+                </li>
+            ))
             return <menu><ul>{lis}</ul></menu>
         } else {
             return null

package/src/widgets/login/ResetPasswordBox.js

@@ -25,7 +25,9 @@ export const ResetPasswordBox = ({ logo, title, userRequired = true, lang = "EN"
                 setError(null)
                 onOK(form)
             } else {
-                setError("New Password and Confirm New Password do not match")
+
+                const errorLabel = lang === "EN" ? "Passwords do not match" : "Las claves no coinciden"
+                setError(errorLabel)
             }
         }
     }