refactor(administrative-level): improve list layout

see #250
CodeTanzania · May 24, 2020 · a307f97 · a307f97
1 parent 77d95af
commit a307f97
Show file tree

Hide file tree

Showing 4 changed files with 352 additions and 459 deletions.
diff --git a/src/GeographicalFeatures/AdministrativeLevels/Filters/index.js b/src/GeographicalFeatures/AdministrativeLevels/Filters/index.js
diff --git a/src/GeographicalFeatures/AdministrativeLevels/Form/index.js b/src/GeographicalFeatures/AdministrativeLevels/Form/index.js
@@ -90,6 +90,25 @@ const AdministrativeLevelForm = ({
     }
   };
 
+  // search administrative level exclude self
+  const searchAdministrativeLevels = (optns, me) => {
+    const filter = {};
+    const myId = get(me, '_id');
+    const myLevel = get(me, 'numbers.weight');
+
+    // ignore self from selection
+    if (myId) {
+      // eslint-disable-next-line no-underscore-dangle
+      filter._id = { $nin: [myId] };
+    }
+    // ensure higher levels
+    if (myLevel) {
+      filter['numbers.weight'] = { $lt: myLevel };
+    }
+
+    return getAdministrativeLevels({ ...optns, filter });
+  };
+
   return (
     <Form
       labelCol={labelCol}
@@ -141,7 +160,9 @@ const AdministrativeLevelForm = ({
             name={['relations', 'parent', '_id']}
           >
             <SearchableSelectInput
-              onSearch={getAdministrativeLevels}
+              onSearch={(optns = {}) => {
+                return searchAdministrativeLevels(optns, administrativeLevel);
+              }}
               optionLabel={(parent) => get(parent, 'strings.name.en')}
               optionValue="_id"
               initialValue={get(