Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove userCredentials api references #1750

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+1,218 −929
Draft

chore: remove userCredentials api references #1750

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69b012b
chore: remove deprecated userCredentials references
edoardo Jan 27, 2025
54b91c1
chore: import from @dhis2/ui instead of @dhis2-ui
edoardo Jan 27, 2025
3cf0dc4
chore: remove references to deprecated objects
edoardo Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
chore: remove deprecated userCredentials references
@edoardo
edoardo committed Jan 27, 2025
commit 69b012b09ae6eb300d653aca514c27cc832dcf96
617 changes: 310 additions & 307 deletions src/__demo__/data/deep.visualization.json
View file

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions src/__demo__/data/degs.visualization.json
View file
Original file line number Diff line number Diff line change
@@ -64,9 +64,7 @@
"user": {
"name": "Tom Wakiki",
"displayName": "Tom Wakiki",
"userCredentials": {
"username": "system"
}
"username": "system"
},
"translations": [],
"yearlySeries": [],
@@ -118,4 +116,5 @@
]
}
]
}
}

7 changes: 3 additions & 4 deletions src/__demo__/data/diseaseWeeks.visualization.json
View file
Original file line number Diff line number Diff line change
@@ -64,9 +64,7 @@
"user": {
"name": "Tom Wakiki",
"displayName": "Tom Wakiki",
"userCredentials": {
"username": "system"
}
"username": "system"
},
"translations": [],
"yearlySeries": [],
@@ -223,4 +221,5 @@
]
}
]
}
}

7 changes: 3 additions & 4 deletions src/__demo__/data/emptyColumns.visualization.json
View file
Original file line number Diff line number Diff line change
@@ -64,9 +64,7 @@
"user": {
"name": "Tom Wakiki",
"displayName": "Tom Wakiki",
"userCredentials": {
"username": "system"
}
"username": "system"
},
"translations": [],
"yearlySeries": [],
@@ -129,4 +127,5 @@
]
}
]
}
}

592 changes: 295 additions & 297 deletions src/__demo__/data/emptyRows.visualization.json
View file

Large diffs are not rendered by default.

123 changes: 122 additions & 1 deletion src/__demo__/data/hierarchy.visualization.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,122 @@
{"lastUpdated":"2017-05-19T16:35:05.056","id":"qfMh2IjOxvw","created":"2017-05-19T16:35:05.056","name":"ANC: ANC 1st and 2nd visits at facilities with hierarchy","publicAccess":"rw------","legendDisplayStyle":"FILL","type":"PIVOT_TABLE","hideEmptyColumns":false,"subscribed":false,"rowSubTotals":true,"showDimensionLabels":true,"sortOrder":0,"fontSize":"NORMAL","favorite":false,"topLimit":0,"displayName":"ANC: ANC 1st and 2nd visits at facilities with hierarchy","percentStackedValues":false,"noSpaceBetweenColumns":false,"showHierarchy":true,"cumulative":false,"hideTitle":false,"skipRounding":false,"showData":false,"hideEmptyRows":false,"parentGraphMap":{"ImspTQPwCqd":""},"displayDensity":"NORMAL","completedOnly":false,"colTotals":true,"aggregationType":"DEFAULT","hideSubtitle":false,"hideLegend":false,"colSubTotals":true,"legendDisplayStrategy":"FIXED","rowTotals":true,"digitGroupSeparator":"SPACE","regression":false,"access":{"read":true,"update":true,"externalize":true,"delete":true,"write":true,"manage":true,"data":{"read":false,"write":false}},"reportingParams":{"parentOrganisationUnit":false,"reportingPeriod":false,"organisationUnit":false,"grandParentOrganisationUnit":false},"lastUpdatedBy":{"id":"GOLswS44mh8"},"user":{"name":"Tom Wakiki","displayName":"Tom Wakiki","userCredentials":{"username":"system"}},"translations":[],"yearlySeries":[],"interpretations":[],"userGroupAccesses":[],"optionalAxes":[],"columns":[{"dimension":"dx","items":[{"name":"ANC 1st visit","id":"fbfJHSPpUQD","displayName":"ANC 1st visit","displayShortName":"ANC 1st visit","dimensionItemType":"DATA_ELEMENT"},{"name":"ANC 2nd visit","id":"cYeuwXTCPkU","displayName":"ANC 2nd visit","displayShortName":"ANC 2nd visit","dimensionItemType":"DATA_ELEMENT"}]},{"dimension":"pe","items":[{"name":"THIS_YEAR","id":"THIS_YEAR","displayName":"THIS_YEAR","displayShortName":"THIS_YEAR","dimensionItemType":"PERIOD"},{"name":"LAST_YEAR","id":"LAST_YEAR","displayName":"LAST_YEAR","displayShortName":"LAST_YEAR","dimensionItemType":"PERIOD"}]}],"userAccesses":[],"filters":[],"rows":[{"dimension":"ou","items":[{"name":"Sierra Leone","id":"ImspTQPwCqd","displayName":"Sierra Leone","displayShortName":"Sierra Leone","dimensionItemType":"ORGANISATION_UNIT"},{"name":"LEVEL-4","id":"LEVEL-4","displayName":"LEVEL-4"}]}]}
{
"lastUpdated": "2017-05-19T16:35:05.056",
"id": "qfMh2IjOxvw",
"created": "2017-05-19T16:35:05.056",
"name": "ANC: ANC 1st and 2nd visits at facilities with hierarchy",
"publicAccess": "rw------",
"legendDisplayStyle": "FILL",
"type": "PIVOT_TABLE",
"hideEmptyColumns": false,
"subscribed": false,
"rowSubTotals": true,
"showDimensionLabels": true,
"sortOrder": 0,
"fontSize": "NORMAL",
"favorite": false,
"topLimit": 0,
"displayName": "ANC: ANC 1st and 2nd visits at facilities with hierarchy",
"percentStackedValues": false,
"noSpaceBetweenColumns": false,
"showHierarchy": true,
"cumulative": false,
"hideTitle": false,
"skipRounding": false,
"showData": false,
"hideEmptyRows": false,
"parentGraphMap": { "ImspTQPwCqd": "" },
"displayDensity": "NORMAL",
"completedOnly": false,
"colTotals": true,
"aggregationType": "DEFAULT",
"hideSubtitle": false,
"hideLegend": false,
"colSubTotals": true,
"legendDisplayStrategy": "FIXED",
"rowTotals": true,
"digitGroupSeparator": "SPACE",
"regression": false,
"access": {
"read": true,
"update": true,
"externalize": true,
"delete": true,
"write": true,
"manage": true,
"data": { "read": false, "write": false }
},
"reportingParams": {
"parentOrganisationUnit": false,
"reportingPeriod": false,
"organisationUnit": false,
"grandParentOrganisationUnit": false
},
"lastUpdatedBy": { "id": "GOLswS44mh8" },
"user": {
"name": "Tom Wakiki",
"displayName": "Tom Wakiki",
"username": "system"
},
"translations": [],
"yearlySeries": [],
"interpretations": [],
"userGroupAccesses": [],
"optionalAxes": [],
"columns": [
{
"dimension": "dx",
"items": [
{
"name": "ANC 1st visit",
"id": "fbfJHSPpUQD",
"displayName": "ANC 1st visit",
"displayShortName": "ANC 1st visit",
"dimensionItemType": "DATA_ELEMENT"
},
{
"name": "ANC 2nd visit",
"id": "cYeuwXTCPkU",
"displayName": "ANC 2nd visit",
"displayShortName": "ANC 2nd visit",
"dimensionItemType": "DATA_ELEMENT"
}
]
},
{
"dimension": "pe",
"items": [
{
"name": "THIS_YEAR",
"id": "THIS_YEAR",
"displayName": "THIS_YEAR",
"displayShortName": "THIS_YEAR",
"dimensionItemType": "PERIOD"
},
{
"name": "LAST_YEAR",
"id": "LAST_YEAR",
"displayName": "LAST_YEAR",
"displayShortName": "LAST_YEAR",
"dimensionItemType": "PERIOD"
}
]
}
],
"userAccesses": [],
"filters": [],
"rows": [
{
"dimension": "ou",
"items": [
{
"name": "Sierra Leone",
"id": "ImspTQPwCqd",
"displayName": "Sierra Leone",
"displayShortName": "Sierra Leone",
"dimensionItemType": "ORGANISATION_UNIT"
},
{ "name": "LEVEL-4", "id": "LEVEL-4", "displayName": "LEVEL-4" }
]
}
]
}

7 changes: 3 additions & 4 deletions src/__demo__/data/lastFiveYears.visualization.json
View file
Original file line number Diff line number Diff line change
@@ -64,9 +64,7 @@
"user": {
"name": "Astride Traore",
"displayName": "Astride Traore",
"userCredentials": {
"username": "admin"
}
"username": "admin"
},
"translations": [],
"yearlySeries": [],
@@ -118,4 +116,5 @@
]
}
]
}
}

7 changes: 3 additions & 4 deletions src/__demo__/data/narrative.visualization.json
View file
Original file line number Diff line number Diff line change
@@ -52,9 +52,7 @@
},
"user": {
"displayName": "Tom Wakiki",
"userCredentials": {
"username": "system"
}
"username": "system"
},
"dataElementGroupSetDimensions": [],
"attributeDimensions": [],
@@ -128,4 +126,5 @@
]
}
]
}
}

4 changes: 1 addition & 3 deletions src/__demo__/data/simple.visualization.json
View file
Original file line number Diff line number Diff line change
@@ -48,9 +48,7 @@
},
"user": {
"displayName": "Tom Wakiki",
"userCredentials": {
"username": "system"
}
"username": "system"
},
"dataElementGroupSetDimensions": [],
"attributeDimensions": [],
7 changes: 3 additions & 4 deletions src/__demo__/data/target-with-legend.visualization.json
View file
Original file line number Diff line number Diff line change
@@ -72,9 +72,7 @@
"user": {
"name": "Tom Wakiki",
"displayName": "Tom Wakiki",
"userCredentials": {
"username": "system"
}
"username": "system"
},
"translations": [],
"yearlySeries": [],
@@ -207,4 +205,5 @@
]
}
]
}
}

7 changes: 3 additions & 4 deletions src/__demo__/data/weeklyColumns.visualization.json
View file
Original file line number Diff line number Diff line change
@@ -64,9 +64,7 @@
"user": {
"name": "Astride Traore",
"displayName": "Astride Traore",
"userCredentials": {
"username": "admin"
}
"username": "admin"
},
"translations": [],
"yearlySeries": [],
@@ -489,4 +487,5 @@
]
}
]
}
}

20 changes: 5 additions & 15 deletions src/__fixtures__/json/chartAllFields.json
View file
Original file line number Diff line number Diff line change
@@ -39,9 +39,7 @@
},
"user": {
"displayName": "John Traore",
"userCredentials": {
"username": "admin"
}
"username": "admin"
},
"dataElementGroupSetDimensions": [],
"attributeDimensions": [],
@@ -80,9 +78,7 @@
"user": {
"id": "xE7jOejl9FI",
"displayName": "John Traore",
"userCredentials": {
"username": "admin"
}
"username": "admin"
},
"chart": {
"id": "UlfTKWZWV4u"
@@ -123,9 +119,7 @@
"user": {
"id": "xE7jOejl9FI",
"displayName": "John Traore",
"userCredentials": {
"username": "admin"
}
"username": "admin"
},
"chart": {
"id": "UlfTKWZWV4u"
@@ -165,9 +159,7 @@
"user": {
"id": "GOLswS44mh8",
"displayName": "Tom Wakiki",
"userCredentials": {
"username": "system"
}
"username": "system"
},
"chart": {
"id": "UlfTKWZWV4u"
@@ -207,9 +199,7 @@
"user": {
"id": "GOLswS44mh8",
"displayName": "Tom Wakiki",
"userCredentials": {
"username": "system"
}
"username": "system"
},
"chart": {
"id": "UlfTKWZWV4u"