Merge branch 'master' into migrate-to-typescript

CHANGELOG.md

@@ -1,3 +1,11 @@
+0.25.2
+------
+- feat: use label property to render info in search inputs and to sort elements
+
+0.25.1
+------
+- chore: export generic Messages
+
 0.25.0
 ------
 - feat: Add inputs search to editComponent

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.25.0",
+  "version": "0.25.2",
   "repository": {
     "type": "git",
     "url": "[email protected]:guillotinaweb/guillotina_react.git"

src/guillo-gmi/components/input/search_input.js

@@ -58,7 +58,6 @@ export const SearchInput = ({
   const wrapperRef = React.useRef(null)
   const { PageSize, SearchEngine } = useConfig()
   const [valueLabel, setValueLabel] = useState(undefined)
-  const [isLoadingData, setIsLoadingData] = useState(false)
   const [uid] = useState(generateUID('search_input'))
 
   useClickAway(wrapperRef, () => {
@@ -85,7 +84,6 @@ export const SearchInput = ({
 
   const inicializeLabels = async () => {
     if (labelProperty !== 'id' && value) {
-      setIsLoadingData(true)
       let searchTermQs = []
       const searchTermParsed = [`id`, value]
       const { get: getSearch } = traversal.registry
@@ -124,7 +122,6 @@ export const SearchInput = ({
         return result
       }, {})
       setValueLabel(newValuesLabel)
-      setIsLoadingData(false)
     }
   }
 
@@ -143,7 +140,7 @@ export const SearchInput = ({
       pageSize: PageSize,
       withDepth: false,
     })
-    let sortParsed = parser(`_sort_des=title`)
+    let sortParsed = parser(`_sort_des=${labelProperty}`)
     let typeNameParsed = []
     if (typeNameQuery) {
       typeNameParsed = parser(`type_name__in=${typeNameQuery}`)
@@ -185,7 +182,7 @@ export const SearchInput = ({
     if (renderTextItemOption) {
       return renderTextItemOption(item)
     }
-    return item.title || item['@name']
+    return get(item, labelProperty, item.title) || item['@name']
   }
 
   useEffect(() => {

src/guillo-gmi/components/input/search_input_list.js

@@ -99,7 +99,7 @@ export const SearchInputList = ({
       pageSize: PageSize,
       withDepth: false,
     })
-    let sortParsed = parser(`_sort_des=title`)
+    let sortParsed = parser(`_sort_des=${labelProperty}`)
     let typeNameParsed = []
     if (typeNameQuery) {
       typeNameParsed = parser(`type_name__in=${typeNameQuery}`)
@@ -188,7 +188,7 @@ export const SearchInputList = ({
     if (renderTextItemOption) {
       return renderTextItemOption(item)
     }
-    return item.title || item['@name']
+    return get(item, labelProperty, item.title) || item['@name']
   }
 
   React.useEffect(() => {

src/guillo-gmi/index.js

@@ -31,3 +31,5 @@ export * from './views/folder'
 export * from './views/item'
 export * from './views/users'
 export * from './views/groups'
+
+export * from './locales/generic_messages'