Skip to content

Commit

Permalink
MODFQMMGR-546:round 2 of requested changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kjain110 committed Oct 22, 2024
1 parent e0d0980 commit 2b6c3ee
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,7 @@
isIdColumn: false,
queryable: true,
visibleByDefault: false,
essential: true,
valueGetter: ":sourceAlias.jsonb->>'enumeration'",
},
{
Expand Down Expand Up @@ -1006,6 +1007,7 @@
queryable: false,
hidden: true,
visibleByDefault: false,
essential: true,
valueGetter: ":sourceAlias.jsonb::text",
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))',
Expand Down
14 changes: 7 additions & 7 deletions src/main/resources/entity-types/users/simple_user_details.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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))",
Expand Down Expand Up @@ -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)'
Expand All @@ -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)'
Expand Down Expand Up @@ -184,7 +184,7 @@
},
isIdColumn: false,
queryable: true,
visibleByDefault: false,
visibleByDefault: true,
valueGetter: ":sourceAlias.jsonb->'personal'->>'phone'",
},
{
Expand Down Expand Up @@ -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)'
Expand All @@ -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))'
Expand Down Expand Up @@ -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))",
Expand Down
2 changes: 1 addition & 1 deletion translations/mod-fqm-manager/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion translations/mod-fqm-manager/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 2b6c3ee

Please sign in to comment.