Merge pull request #498 from folio-org/MODFQMMGR-546

round 2 of requested changes
folio-org · Oct 22, 2024 · 94187da · 94187da
2 parents e0d0980 + 2b6c3ee
commit 94187da
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/src/main/resources/entity-types/inventory/simple_item_details.json5 b/src/main/resources/entity-types/inventory/simple_item_details.json5
@@ -733,6 +733,7 @@
       isIdColumn: false,
       queryable: true,
       visibleByDefault: false,
+      essential: true,
       valueGetter: ":sourceAlias.jsonb->>'enumeration'",
     },
     {
@@ -1006,6 +1007,7 @@
       queryable: false,
       hidden: true,
       visibleByDefault: false,
+      essential: true,
       valueGetter: ":sourceAlias.jsonb::text",
     }
   ],

diff --git a/src/main/resources/entity-types/organizations/simple_organizations.json5 b/src/main/resources/entity-types/organizations/simple_organizations.json5
@@ -108,6 +108,7 @@
       isIdColumn: false,
       queryable: true,
       visibleByDefault: true,
+      essential: true,
       valueGetter: ":sourceAlias.jsonb->>'code'",
       filterValueGetter: "lower(${tenant_id}_mod_organizations_storage.f_unaccent(:sourceAlias.jsonb ->> 'code'::text))",
       valueFunction: 'lower(${tenant_id}_mod_organizations_storage.f_unaccent(:value))',

diff --git a/src/main/resources/entity-types/users/simple_user_details.json5 b/src/main/resources/entity-types/users/simple_user_details.json5
@@ -35,7 +35,7 @@
       },
       isIdColumn: false,
       queryable: true,
-      visibleByDefault: false,
+      visibleByDefault: true,
       essential: true,
       valueGetter: ":sourceAlias.jsonb->>'active'",
       filterValueGetter: "lower(${tenant_id}_mod_users.f_unaccent(:sourceAlias.jsonb ->> 'active'::text))",
@@ -117,7 +117,7 @@
       },
       isIdColumn: false,
       queryable: true,
-      visibleByDefault: false,
+      visibleByDefault: true,
       valueGetter: ":sourceAlias.jsonb->'personal'->>'lastName'",
       filterValueGetter: "\"left\"(lower(${tenant_id}_mod_users.f_unaccent((:sourceAlias.jsonb -> 'personal'::text) ->> 'lastName'::text)), 600)",
       valueFunction: '"left"(lower(${tenant_id}_mod_users.f_unaccent(:value)), 600)'
@@ -130,7 +130,7 @@
       },
       isIdColumn: false,
       queryable: true,
-      visibleByDefault: false,
+      visibleByDefault: true,
       valueGetter: ":sourceAlias.jsonb->'personal'->>'firstName'",
       filterValueGetter: "\"left\"(lower(${tenant_id}_mod_users.f_unaccent((:sourceAlias.jsonb -> 'personal'::text) ->> 'firstName'::text)), 600)",
       valueFunction: '"left"(lower(${tenant_id}_mod_users.f_unaccent(:value)), 600)'
@@ -184,7 +184,7 @@
       },
       isIdColumn: false,
       queryable: true,
-      visibleByDefault: false,
+      visibleByDefault: true,
       valueGetter: ":sourceAlias.jsonb->'personal'->>'phone'",
     },
     {
@@ -342,7 +342,7 @@
       },
       isIdColumn: false,
       queryable: true,
-      visibleByDefault: false,
+      visibleByDefault: true,
       valueGetter: ":sourceAlias.jsonb->'personal'->>'preferredFirstName'",
       filterValueGetter: "${tenant_id}_mod_users.f_unaccent((:sourceAlias.jsonb -> 'personal'::text) ->> 'preferredFirstName'::text)",
       valueFunction: '${tenant_id}_mod_users.f_unaccent(:value)'
@@ -355,7 +355,7 @@
       },
       isIdColumn: false,
       queryable: true,
-      visibleByDefault: false,
+      visibleByDefault: true,
       valueGetter: ":sourceAlias.jsonb->>'username'",
       filterValueGetter: "lower(${tenant_id}_mod_users.f_unaccent(:sourceAlias.jsonb ->> 'username'::text))",
       valueFunction: 'lower(${tenant_id}_mod_users.f_unaccent(:value))'
@@ -415,7 +415,7 @@
       },
       isIdColumn: false,
       queryable: true,
-      visibleByDefault: false,
+      visibleByDefault: true,
       essential: true,
       valueGetter: ":sourceAlias.jsonb->>'barcode'",
       filterValueGetter: "lower(${tenant_id}_mod_users.f_unaccent(:sourceAlias.jsonb ->> 'barcode'::text))",

diff --git a/translations/mod-fqm-manager/en.json b/translations/mod-fqm-manager/en.json
@@ -654,7 +654,7 @@
   "entityType.simple_instance.instance_primary_contributor": "Primary contributor",
   "entityType.simple_instance.created_at": "Created date",
   "entityType.simple_instance.created_by": "Created by user UUID",
-  "entityType.simple_instance.discovery_suppress": "Discovery suppress",
+  "entityType.simple_instance.discovery_suppress": "Suppress from discovery",
   "entityType.simple_instance.editions": "Editions",
   "entityType.simple_instance.electronic_access": "Electronic access",
   "entityType.simple_instance.electronic_access.link_text": "Link text",

diff --git a/translations/mod-fqm-manager/en_US.json b/translations/mod-fqm-manager/en_US.json
@@ -703,7 +703,7 @@
     "entityType.simple_instance.complete_updated_date": "Complete updated date",
     "entityType.simple_instance.created_at": "Created date",
     "entityType.simple_instance.created_by": "Created by user UUID",
-    "entityType.simple_instance.discovery_suppress": "Discovery suppress",
+    "entityType.simple_instance.discovery_suppress": "Suppress from discovery",
     "entityType.simple_instance.editions": "Editions",
     "entityType.simple_instance.electronic_access": "Electronic access",
     "entityType.simple_instance.electronic_access.link_text": "Link text",