🐛 Add locationId to personFinder, fix endless wait cursor

Author: Jonas Gossens

examples/react-chayns-personfinder/Example.jsx

@@ -36,7 +36,14 @@ export default class PersonFinderExample extends PureComponent {
                 <PersonFinder
                     dynamic
                     placeholder="UAC 1"
-                    uacIds={[1]}
+                    uacId={1}
+                    onChange={PersonFinderExample.handleSelect}
+                />
+                <PersonFinder
+                    dynamic
+                    placeholder="UAC 1 Location 1"
+                    uacId={1}
+                    locationId={1}
                     onChange={PersonFinderExample.handleSelect}
                 />
                 <PersonFinder

src/react-chayns-personfinder/README.md

@@ -40,6 +40,7 @@ Then it can be used like in the following example:
 | defaultValues | Tags that should be added to the TagInput (multiple-prop) on initial rendering                     | array          |               |
 | boxClassName  | ClassName of the box-overlay                                                                       | string         |               |
 | uacId         | ID of the UAC-Group to search in                                                                   | number         |               |
+| locationId    | LocationId of the UAC-Group to search in                                                           | number         |               |
 
 ## Clear the PersonFinder
 If you want to clear the PersonFinder, you need to have a reference to the ReactElement:

src/react-chayns-personfinder/component/PersonFinder.jsx

@@ -10,13 +10,15 @@ export default class PersonFinder extends Component {
         showPersons: PropTypes.bool,
         showSites: PropTypes.bool,
         uacId: PropTypes.number,
+        locationId: PropTypes.number,
     };
 
     static defaultProps = {
         multiple: false,
         showPersons: true,
         showSites: false,
         uacId: null,
+        locationId: null,
     };
 
     personFinder = React.createRef();

src/react-chayns-personfinder/component/PersonFinderData.jsx

@@ -30,6 +30,7 @@ export default class PersonFinderData extends Component {
         autoLoading: PropTypes.bool,
         boxClassName: PropTypes.string,
         uacId: PropTypes.number,
+        locationId: PropTypes.number,
     };
 
     static defaultProps = {
@@ -43,6 +44,7 @@ export default class PersonFinderData extends Component {
         autoLoading: true,
         boxClassName: null,
         uacId: null,
+        locationId: null,
     };
 
     resultList = null;
@@ -163,7 +165,7 @@ export default class PersonFinderData extends Component {
         }
 
         const {
-            persons: enablePersons, sites: enableSites, includeOwn, uacId,
+            persons: enablePersons, sites: enableSites, includeOwn, uacId, locationId,
         } = this.props;
 
         const promises = [];
@@ -172,7 +174,7 @@ export default class PersonFinderData extends Component {
         const loadSites = enableSites && this.loadMore[LOCATION_RELATION] && (type === ALL_RELATIONS || type === LOCATION_RELATION);
 
         if (uacId) {
-            promises.push(loadPersons ? this.fetchUacPersons(value, uacId) : Promise.resolve(false));
+            promises.push(loadPersons ? this.fetchUacPersons(value, uacId, locationId) : Promise.resolve(false));
         } else {
             promises.push(loadPersons ? this.fetchPersonRelations(value, includeOwn) : Promise.resolve(false));
         }
@@ -229,7 +231,7 @@ export default class PersonFinderData extends Component {
     }
 
     // eslint-disable-next-line class-methods-use-this
-    async fetchUacPersons(value, uacId) {
+    async fetchUacPersons(value, uacId, locationId) {
         const config = {
             method: 'GET',
             headers: {
@@ -238,23 +240,26 @@ export default class PersonFinderData extends Component {
             mode: 'cors',
         };
 
-        const response = await fetch(`https://sub50.tobit.com/backend/${uacId}/usergroup/1/users?filter=${value}`, config);
-        const json = await response.json();
-
-        const result = { related: [], unrelated: [], type: PERSON_RELATION };
-        json.forEach((item) => {
-            result.related.push({
-                firstName: item.firstname,
-                lastName: item.lastname,
-                personId: item.personId,
-                relationCount: 0,
-                relations: [],
-                score: 0,
-                userId: item.id,
+        const response = await fetch(`https://sub50.tobit.com/backend/${locationId || chayns.env.site.locationId}/usergroup/${uacId}/users?filter=${value}`, config);
+        if (response.status === 200) {
+            const json = await response.json();
+
+            const result = { related: [], unrelated: [], type: PERSON_RELATION };
+            json.forEach((item) => {
+                result.related.push({
+                    firstName: item.firstname,
+                    lastName: item.lastname,
+                    personId: item.personId,
+                    relationCount: 0,
+                    relations: [],
+                    score: 0,
+                    userId: item.id,
+                });
             });
-        });
 
-        return Promise.resolve(result);
+            return Promise.resolve(result);
+        }
+        return Promise.resolve(null);
     }
 
     async fetchPersonRelations(value, canFindOwn = false) {