Merge pull request #228 from zimmerman-team/feat/1894

1894: Move or remove ORG id
zimmerman-team · Oct 14, 2020 · b4c5ec1 · b4c5ec1
2 parents 6a1e927 + b4e527e
commit b4c5ec1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/app/modules/querybuilder-module/fragments/core-filters/index.tsx b/src/app/modules/querybuilder-module/fragments/core-filters/index.tsx
@@ -76,7 +76,7 @@ export const CoreFiltersFragment = () => {
         <ConnectedSelect
           {...fragmentConfig.organisations}
           value={store.get('organisations')}
-          options={fetchedsectorOrganisations}
+          options={fetchedsectorOrganisations.sort((a, b) => a.reporting_organisation.localeCompare(b.reporting_organisation))}
           onChange={(e) => store.set('organisations')(e)}
           // placeholder={`All (${fetchedsectorOrganisations.length})`}
           placeholder={`All organisations`}

diff --git a/src/app/modules/querybuilder-module/fragments/core-filters/model.ts b/src/app/modules/querybuilder-module/fragments/core-filters/model.ts
@@ -45,7 +45,7 @@ export const fragmentConfig: FragmentModel = {
     // helperTextUrl: 'http://reference.iatistandard.org/203/codelists/Sector/',
     placeholder: 'All (0)',
     getOptionLabel: (option: OrganisationModel) =>
-      `${option.reporting_organisation_identifier}: ${option.reporting_organisation}`,
+      `${option.reporting_organisation} (${option.reporting_organisation_identifier})`,
     getOptionValue: (option: OrganisationModel) =>
       option.reporting_organisation_identifier,
   },