add domain to indicator user filter options #546

impactoss · May 4, 2024 · 9b62054 · 9b62054
1 parent 5021069
commit 9b62054
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/app/components/EntityListSidebar/filterOptionsFactory.js b/app/components/EntityListSidebar/filterOptionsFactory.js
@@ -141,6 +141,9 @@ export const makeAttributeFilterOptions = (entities, config, activeOptionId, loc
           } else if (option.reference && !!entity.get(option.reference.key)) {
             filterOptions.options[value] = {
               label: entity.getIn([option.reference.key, 'attributes', option.reference.label]),
+              sublabel: option.reference.sublabel
+                ? entity.getIn([option.reference.key, 'attributes', option.reference.sublabel])
+                : null,
               showCount: true,
               value: queryValue,
               count: 1,
@@ -485,7 +488,6 @@ export const makeConnectionFilterOptions = (
                 const value = `${path}:${connectedId}`;
                 const reference = getEntityReference(connection);
                 const label = getEntityTitle(connection, option.labels, contextIntl);
-                const domain = entity.getIn(['attributes', 'domain']);
                 filterOptions.options[connectedId] = {
                   label,
                   reference,
@@ -496,7 +498,6 @@ export const makeConnectionFilterOptions = (
                   checked: optionChecked(locationQueryValue, value),
                   tags: connection.get('categories'),
                   draft: connection.getIn(['attributes', 'draft']),
-                  domain,
                 };
               }
             }

diff --git a/app/components/forms/MultiSelectControl/Option.js b/app/components/forms/MultiSelectControl/Option.js
@@ -33,7 +33,7 @@ const Id = styled.span`
     font-size: ${(props) => props.theme.sizes.print.small};
   }
 `;
-const Domain = styled.div`
+const Sublabel = styled.div`
   color: ${palette('text', 1)};
   font-size: 0.8em;
   opacity: 0.6;
@@ -52,7 +52,7 @@ class Option extends React.Component { // eslint-disable-line react/prefer-state
   render() {
     const { intl } = this.context;
     const {
-      draft, reference, message, label, messagePrefix, isNew, domain,
+      draft, reference, message, label, messagePrefix, isNew, sublabel,
     } = this.props;
 
     let optionLabel;
@@ -86,10 +86,8 @@ class Option extends React.Component { // eslint-disable-line react/prefer-state
             )
           }
         </div>
-        {domain && (
-          <Domain>
-            <FormattedMessage {...messages.domain} values={{ domain }} />
-          </Domain>
+        {sublabel && (
+          <Sublabel>{sublabel}</Sublabel>
         )}
       </Label>
     );
@@ -101,7 +99,7 @@ Option.propTypes = {
   message: PropTypes.string,
   messagePrefix: PropTypes.string,
   reference: PropTypes.string,
-  domain: PropTypes.string,
+  sublabel: PropTypes.string,
   draft: PropTypes.bool,
   isNew: PropTypes.bool,
 };

diff --git a/app/components/forms/MultiSelectControl/OptionList.js b/app/components/forms/MultiSelectControl/OptionList.js
@@ -234,7 +234,7 @@ class OptionList extends React.PureComponent {
                           message={option.get('message')}
                           isNew={option.get('isNew')}
                           draft={option.get('draft')}
-                          domain={option.get('domain')}
+                          sublabel={option.get('domain') || option.get('sublabel')}
                         />
                       </OptionLabel>
                       { option.get('showCount') && typeof option.get('count') !== 'undefined'

diff --git a/app/containers/EntityListForm/index.js b/app/containers/EntityListForm/index.js
@@ -80,7 +80,6 @@ class EntityListForm extends React.Component { // eslint-disable-line react/pref
     } else {
       formTitle = formOptions.title;
     }
-
     return (
       <Styled
         sidebarResponsiveLarge={!formOptions.advanced}

diff --git a/app/containers/IndicatorList/constants.js b/app/containers/IndicatorList/constants.js
@@ -89,6 +89,7 @@ export const CONFIG = {
         reference: {
           key: 'manager',
           label: 'name',
+          sublabel: 'domain',
           without: true,
         },
       },