Skip to content

Commit 39bb645

Browse files
committed
Various adjustments based on PO feedback
1 parent adad37b commit 39bb645

8 files changed

Lines changed: 62 additions & 14 deletions

File tree

fqm-config.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,19 @@ schema = "src/main/resources/fqm/schemas/noteType.yaml"
5151
permissions = ["note.types.collection.get"]
5252
sort = ["id", "ASC"]
5353
includeJsonbField = false
54+
55+
[entityTypes.fieldOverrides.metadata_created_date]
56+
x-fqm-visible-by-default = false
57+
x-fqm-essential = false
58+
59+
[entityTypes.fieldOverrides.metadata_created_by_user_id]
60+
x-fqm-visible-by-default = false
61+
x-fqm-essential = false
62+
63+
[entityTypes.fieldOverrides.metadata_updated_date]
64+
x-fqm-visible-by-default = false
65+
x-fqm-essential = false
66+
67+
[entityTypes.fieldOverrides.metadata_updated_by_user_id]
68+
x-fqm-visible-by-default = false
69+
x-fqm-essential = false

src/main/resources/fqm/schemas/link.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,20 @@ properties:
88
$ref: '../../swagger.api/schemas/common.yaml#/uuid'
99
description: UUID primary key of the link row; used by note_link.link_id
1010
x-fqm-value-getter: ${source}.id
11-
x-fqm-is-id-column: true # Despite the name, this is the unique ID for the link record itself.
12-
x-fqm-visibility: "all"
11+
x-fqm-is-id-column: true
12+
x-fqm-visibility: "hidden"
1313
x-fqm-visible-by-default: true
1414
x-fqm-essential: true
15-
id:
15+
x-fqm-joins-to:
16+
- targetModule: mod-notes
17+
targetEntity: link
18+
targetField: link_id
19+
type: equality-cast-uuid
20+
objectId:
1621
$ref: '../../swagger.api/schemas/link.yaml#/link/properties/id'
1722
type:
1823
$ref: '../../swagger.api/schemas/link.yaml#/link/properties/type'
1924
required:
2025
- linkId
21-
- id
26+
- objectId
2227
- type

src/main/resources/fqm/schemas/noteLink.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ properties:
99
description: UUID of the associated note
1010
x-fqm-value-getter: ${source}.note_id
1111
x-fqm-is-id-column: true # There are 2 ID columns here, matching the table's primary key.
12-
x-fqm-visibility: "all"
12+
x-fqm-visibility: "hidden"
1313
x-fqm-essential: true
14-
x-fqm-visible-by-default: true
14+
x-fqm-visible-by-default: false
1515
x-fqm-joins-to:
1616
- targetModule: mod-notes
1717
targetEntity: note
@@ -22,9 +22,9 @@ properties:
2222
description: UUID of the associated link
2323
x-fqm-value-getter: ${source}.link_id
2424
x-fqm-is-id-column: true # There are 2 ID columns here, matching the table's primary key.
25-
x-fqm-visibility: "all"
25+
x-fqm-visibility: "hidden"
2626
x-fqm-essential: true
27-
x-fqm-visible-by-default: true
27+
x-fqm-visible-by-default: false
2828
x-fqm-joins-to:
2929
- targetModule: mod-notes
3030
targetEntity: link

src/main/resources/swagger.api/schemas/common.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,24 @@ metadata:
1313
description: Date and time when the record was created
1414
x-fqm-value-getter: to_char(${source}.created_date, 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')
1515
x-fqm-visibility: "all"
16+
x-fqm-visible-by-default: true
1617
x-fqm-essential: true
1718
createdByUserId:
1819
$ref: '#/uuid'
1920
description: ID of the user who created the record
2021
x-fqm-value-getter: ${source}.created_by
2122
x-fqm-visibility: "all"
23+
x-fqm-visible-by-default: false
2224
x-fqm-essential: true
25+
x-fqm-joins-to-raw:
26+
- targetId: bb058933-cd06-4539-bd3a-6f248ff98ee2
27+
targetField: id
28+
direction: left
29+
type: equality-cast-uuid
30+
- targetId: f2615ea6-450b-425d-804d-6a495afd9308
31+
targetField: id
32+
direction: left
33+
type: equality-cast-uuid
2334
createdByUsername:
2435
type: string
2536
description: Username of the user who created the record (when available)
@@ -34,13 +45,24 @@ metadata:
3445
description: Date and time when the record was last updated
3546
x-fqm-value-getter: to_char(${source}.updated_date, 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')
3647
x-fqm-visibility: "all"
48+
x-fqm-visible-by-default: false
3749
x-fqm-essential: true
3850
updatedByUserId:
3951
$ref: '#/uuid'
4052
description: ID of the user who last updated the record
4153
x-fqm-value-getter: ${source}.updated_by
4254
x-fqm-visibility: "all"
55+
x-fqm-visible-by-default: false
4356
x-fqm-essential: true
57+
x-fqm-joins-to-raw:
58+
- targetId: bb058933-cd06-4539-bd3a-6f248ff98ee2
59+
targetField: id
60+
direction: left
61+
type: equality-cast-uuid
62+
- targetId: f2615ea6-450b-425d-804d-6a495afd9308
63+
targetField: id
64+
direction: left
65+
type: equality-cast-uuid
4466
updatedByUsername:
4567
type: string
4668
description: Username of the user who updated the record (when available)

src/main/resources/swagger.api/schemas/link.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ link:
88
description: Id of object linked to note
99
x-fqm-value-getter: ${source}.object_id
1010
x-fqm-is-id-column: false # Despite the name, this is not the unique ID for the link record.
11-
x-fqm-visibility: "all"
11+
x-fqm-visibility: "hidden"
1212
x-fqm-essential: true
1313
type:
1414
type: string
1515
description: Type of object linked to note
1616
x-fqm-value-getter: ${source}.object_type
17-
x-fqm-visibility: "all"
17+
x-fqm-visibility: "hidden"
1818
x-fqm-essential: true
1919
required:
2020
- id

src/main/resources/swagger.api/schemas/note.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ note:
88
x-fqm-value-getter: ${source}.id
99
x-fqm-filter-value-getter: ${source}.id
1010
x-fqm-visibility: "all"
11-
x-fqm-visible-by-default: true
11+
x-fqm-visible-by-default: false
1212
x-fqm-essential: true
1313
typeId:
1414
$ref: 'common.yaml#/uuid'
1515
description: Type id of note
1616
x-fqm-value-getter: ${source}.type_id
1717
x-fqm-filter-value-getter: ${source}.type_id
18-
x-fqm-visibility: "all"
18+
x-fqm-visibility: "hidden"
1919
x-fqm-essential: true
2020
x-fqm-joins-to:
2121
- targetModule: mod-notes
@@ -31,27 +31,32 @@ note:
3131
x-fqm-value-getter: ${source}.title
3232
x-fqm-visibility: "all"
3333
x-fqm-visible-by-default: true
34+
x-fqm-essential: true
3435
domain:
3536
type: string
3637
description: Domain associated with this note
3738
x-fqm-value-getter: ${source}.domain
3839
x-fqm-visibility: "all"
3940
x-fqm-visible-by-default: true
41+
x-fqm-essential: true
4042
content:
4143
type: string
4244
description: Content of the note
4345
x-fqm-value-getter: ${source}.content
4446
x-fqm-visibility: "all"
47+
x-fqm-essential: true
4548
popUpOnCheckOut:
4649
type: boolean
4750
description: Flag that specify need of pop-up on check-out app
4851
x-fqm-value-getter: ${source}.pop_up_on_check_out
4952
x-fqm-visibility: "all"
53+
x-fqm-essential: true
5054
popUpOnUser:
5155
type: boolean
5256
description: Flag that specify need of pop-up on users app
5357
x-fqm-value-getter: ${source}.pop_up_on_user
5458
x-fqm-visibility: "all"
59+
x-fqm-essential: true
5560
links:
5661
type: array
5762
description: Collection of links to associated objects

src/main/resources/swagger.api/schemas/noteType.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ noteType:
77
$ref: 'common.yaml#/uuid'
88
description: A UUID identifying this note type
99
x-fqm-value-getter: ${source}.id
10-
x-fqm-visibility: "all"
10+
x-fqm-visibility: "hidden"
1111
x-fqm-essential: true
1212
name:
1313
type: string

translations/mod-notes/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"fqm.entityType.link": "Link",
1616
"fqm.entityType.link._description": "Link records used by notes.",
1717
"fqm.entityType.link.link_id": "Link UUID",
18-
"fqm.entityType.link.id": "Linked record ID",
18+
"fqm.entityType.link.object_id": "Linked record ID",
1919
"fqm.entityType.link.type": "Linked record type",
2020
"fqm.entityType.note_link": "Note link",
2121
"fqm.entityType.note_link._description": "Relationships between notes and link records.",

0 commit comments

Comments
 (0)