Merge pull request #962 from EyeSeeTea/feat/search-metadata-by-id-and…

…-code Search metadata by id and code
EyeSeeTea · Jul 1, 2024 · 92101a9 · 92101a9
2 parents 8f9a7ff + 364d6da
commit 92101a9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-06-10T12:10:57.544Z\n"
-"PO-Revision-Date: 2024-06-10T12:10:57.544Z\n"
+"POT-Creation-Date: 2024-06-26T16:20:27.188Z\n"
+"PO-Revision-Date: 2024-06-26T16:20:27.188Z\n"
 
 msgid ""
 "THIS NEW RELEASE INCLUDES SHARING SETTINGS PER INSTANCES. FOR THIS VERSION "
@@ -523,7 +523,7 @@ msgstr ""
 msgid "Custodian"
 msgstr ""
 
-msgid "Search by "
+msgid "Search by name, code or id"
 msgstr ""
 
 msgid ""

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-12T22:53:44.873Z\n"
+"POT-Creation-Date: 2024-06-26T16:20:27.188Z\n"
 "PO-Revision-Date: 2020-07-10T06:53:30.625Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -524,7 +524,7 @@ msgstr ""
 msgid "Custodian"
 msgstr ""
 
-msgid "Search by "
+msgid "Search by name, code or id"
 msgstr ""
 
 msgid ""

diff --git a/i18n/fr.po b/i18n/fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-12T22:53:44.873Z\n"
+"POT-Creation-Date: 2024-06-26T16:20:27.188Z\n"
 "PO-Revision-Date: 2020-07-10T06:53:30.625Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -524,7 +524,7 @@ msgstr ""
 msgid "Custodian"
 msgstr ""
 
-msgid "Search by "
+msgid "Search by name, code or id"
 msgstr ""
 
 msgid ""

diff --git a/i18n/pt.po b/i18n/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-12T22:53:44.873Z\n"
+"POT-Creation-Date: 2024-06-26T16:20:27.188Z\n"
 "PO-Revision-Date: 2020-07-10T06:53:30.625Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -524,7 +524,7 @@ msgstr ""
 msgid "Custodian"
 msgstr ""
 
-msgid "Search by "
+msgid "Search by name, code or id"
 msgstr ""
 
 msgid ""

diff --git a/src/models/dhis/default.ts b/src/models/dhis/default.ts
@@ -27,7 +27,7 @@ export abstract class D2Model {
     protected static columns = d2BaseModelColumns;
     protected static details = d2BaseModelDetails;
     protected static fields = d2BaseModelFields;
-    protected static searchFilter: SearchFilter = { field: "name", operator: "token" };
+    protected static searchFilter: SearchFilter = { field: "identifiable", operator: "token" };
     protected static initialSorting = ["name", "asc"];
     protected static modelTransform: Function = (objects: object[]) => objects;
     protected static modelFilters: any = {};

diff --git a/src/presentation/react/core/components/metadata-table/MetadataTable.tsx b/src/presentation/react/core/components/metadata-table/MetadataTable.tsx
@@ -664,7 +664,7 @@ const MetadataTable: React.FC<MetadataTableProps> = ({
                 details={details}
                 onChangeSearch={changeSearchFilter}
                 initialState={initialState}
-                searchBoxLabel={i18n.t(`Search by `) + model.getSearchFilter().field}
+                searchBoxLabel={i18n.t(`Search by name, code or id`)}
                 pagination={pager}
                 onChange={handleTableChange}
                 ids={ids}