diff --git a/src/__demo__/FileMenu.stories.js b/src/__demo__/FileMenu.stories.js index 6b6afcfac..1f3f6b92c 100644 --- a/src/__demo__/FileMenu.stories.js +++ b/src/__demo__/FileMenu.stories.js @@ -20,11 +20,9 @@ const visObject = { id: 'a8LrqsBQlHP', created: '2012-11-05T09:17:23.388', name: 'ANC: 1-3 dropout rate Yearly', - publicAccess: '--------', displayDescription: 'some _italic (10%)_ and some *bold (10%)*', displayName: 'ANC: 1-3 dropout rate Yearly', description: 'some _italic (10%)_ and some *bold (10%)*', - externalAccess: false, access: { read: true, update: true, @@ -36,14 +34,6 @@ const visObject = { lastUpdatedBy: user, user, translations: [], - userAccesses: [ - { - access: 'rw------', - displayName: 'John Barnes', - id: 'DXyJmlo9rge', - userUid: 'DXyJmlo9rge', - }, - ], } const visReadonlyObject = { diff --git a/src/__demo__/data/avgTotalAggregationType.visualization.json b/src/__demo__/data/avgTotalAggregationType.visualization.json index e69ce4c3a..e9ad07991 100644 --- a/src/__demo__/data/avgTotalAggregationType.visualization.json +++ b/src/__demo__/data/avgTotalAggregationType.visualization.json @@ -1 +1,256 @@ -{"lastUpdated":"2021-02-16T15:49:51.280","id":"y7HNJWxKvfp","created":"2014-11-26T13:12:08.949","name":"TEST: Column percentage aggregation","publicAccess":"--------","legendDisplayStyle":"FILL","type":"PIVOT_TABLE","hideEmptyColumns":false,"subscribed":false,"rowSubTotals":true,"cumulativeValues":false,"showDimensionLabels":true,"sortOrder":0,"fontSize":"NORMAL","favorite":false,"topLimit":0,"displayName":"TEST: Column percentage aggregation","percentStackedValues":false,"noSpaceBetweenColumns":false,"showHierarchy":false,"hideTitle":false,"colorSet":"DEFAULT","skipRounding":false,"showData":false,"numberType":"VALUE","hideEmptyRows":true,"parentGraphMap":{"bG0PlyD0iP3":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","nX05QLraDhO":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","WAjjFMDJKcx":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","Umh4HKqqFp6":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","AnXoUM1tfNT":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","RzgSFJ9E46G":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","ZpE2POxvl9P":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","KfUCAQoOIae":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","azRICFoILuh":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","pMEnu7BjqMz":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","jNb63DIHuwU":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","EuoA3Crpqts":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","TSyzvBiovKh":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","egv5Es0QlQP":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS"},"displayDensity":"NORMAL","regressionType":"NONE","completedOnly":false,"colTotals":true,"hideEmptyRowItems":"NONE","aggregationType":"DEFAULT","hideSubtitle":false,"hideLegend":false,"colSubTotals":true,"legendDisplayStrategy":"FIXED","rowTotals":false,"digitGroupSeparator":"SPACE","regression":false,"fontStyle":{},"access":{"read":true,"update":true,"externalize":true,"delete":true,"write":true,"manage":true},"reportingParams":{"parentOrganisationUnit":false,"reportingPeriod":false,"organisationUnit":false,"grandParentOrganisationUnit":false},"lastUpdatedBy":{"displayName":"Tom Wakiki","id":"GOLswS44mh8","username":"system"},"user":{"displayName":"Tom Wakiki"},"translations":[],"yearlySeries":[],"interpretations":[],"userGroupAccesses":[],"subscribers":[],"columns":[{"dimension":"dx","items":[{"name":"ANC 1 Coverage","id":"Uvn6LCg7dVU","displayName":"ANC 1 Coverage","displayShortName":"ANC 1 Coverage","dimensionItemType":"INDICATOR"},{"name":"ANC 3 Coverage","id":"sB79w2hiLp8","displayName":"ANC 3 Coverage","displayShortName":"ANC 3 Coverage","dimensionItemType":"INDICATOR"}]},{"dimension":"pe","items":[{"name":"LAST_4_QUARTERS","id":"LAST_4_QUARTERS","displayName":"LAST_4_QUARTERS","displayShortName":"LAST_4_QUARTERS","dimensionItemType":"PERIOD"}]}],"series":[],"userAccesses":[],"favorites":[],"filters":[],"rows":[{"dimension":"ou","items":[{"name":"Baoma Station CHP","id":"jNb63DIHuwU","displayName":"Baoma Station CHP","displayShortName":"Baoma Station CHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Blamawo MCHP","id":"WAjjFMDJKcx","displayName":"Blamawo MCHP","displayShortName":"Blamawo MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Faabu CHP","id":"ZpE2POxvl9P","displayName":"Faabu CHP","displayShortName":"Faabu CHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Gerehun CHC","id":"TSyzvBiovKh","displayName":"Gerehun CHC","displayShortName":"Gerehun CHC","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Golu MCHP","id":"azRICFoILuh","displayName":"Golu MCHP","displayShortName":"Golu MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Jembe CHC","id":"Umh4HKqqFp6","displayName":"Jembe CHC","displayShortName":"Jembe CHC","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Jormu MCHP","id":"RzgSFJ9E46G","displayName":"Jormu MCHP","displayShortName":"Jormu MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Kigbai MCHP","id":"egv5Es0QlQP","displayName":"Kigbai MCHP","displayShortName":"Kigbai MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Kpumbu MCHP","id":"pMEnu7BjqMz","displayName":"Kpumbu MCHP","displayShortName":"Kpumbu MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Mbundorbu MCHP","id":"EuoA3Crpqts","displayName":"Mbundorbu MCHP","displayShortName":"Mbundorbu MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Pelewahun (Baoma) MCHP","id":"KfUCAQoOIae","displayName":"Pelewahun (Baoma) MCHP","displayShortName":"PelewahunBaomaMCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Tugbebu CHP","id":"bG0PlyD0iP3","displayName":"Tugbebu CHP","displayShortName":"Tugbebu CHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Yakaji MCHP","id":"AnXoUM1tfNT","displayName":"Yakaji MCHP","displayShortName":"Yakaji MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Yamandu CHC","id":"nX05QLraDhO","displayName":"Yamandu CHC","displayShortName":"Yamandu CHC","dimensionItemType":"ORGANISATION_UNIT"},{"name":"LEVEL-4","id":"LEVEL-4","displayName":"LEVEL-4"}]},{"dimension":"uIuxlbV1vRT","items":[{"name":"Eastern Area","id":"nlX2VoouN63","displayName":"Eastern Area","displayShortName":"Eastern Area","dimensionItemType":"ORGANISATION_UNIT_GROUP"},{"name":"Northern Area","id":"J40PpdN4Wkk","displayName":"Northern Area","displayShortName":"Northern Area","dimensionItemType":"ORGANISATION_UNIT_GROUP"},{"name":"Southern Area","id":"jqBqIXoXpfy","displayName":"Southern Area","displayShortName":"Southern Area","dimensionItemType":"ORGANISATION_UNIT_GROUP"},{"name":"Western Area","id":"b0EsAxm8Nge","displayName":"Western Area","displayShortName":"Western Area","dimensionItemType":"ORGANISATION_UNIT_GROUP"}]}]} \ No newline at end of file +{ + "lastUpdated": "2021-02-16T15:49:51.280", + "id": "y7HNJWxKvfp", + "created": "2014-11-26T13:12:08.949", + "name": "TEST: Column percentage aggregation", + "legendDisplayStyle": "FILL", + "type": "PIVOT_TABLE", + "hideEmptyColumns": false, + "subscribed": false, + "rowSubTotals": true, + "cumulativeValues": false, + "showDimensionLabels": true, + "sortOrder": 0, + "fontSize": "NORMAL", + "favorite": false, + "topLimit": 0, + "displayName": "TEST: Column percentage aggregation", + "percentStackedValues": false, + "noSpaceBetweenColumns": false, + "showHierarchy": false, + "hideTitle": false, + "colorSet": "DEFAULT", + "skipRounding": false, + "showData": false, + "numberType": "VALUE", + "hideEmptyRows": true, + "parentGraphMap": { + "bG0PlyD0iP3": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "nX05QLraDhO": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "WAjjFMDJKcx": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "Umh4HKqqFp6": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "AnXoUM1tfNT": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "RzgSFJ9E46G": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "ZpE2POxvl9P": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "KfUCAQoOIae": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "azRICFoILuh": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "pMEnu7BjqMz": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "jNb63DIHuwU": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "EuoA3Crpqts": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "TSyzvBiovKh": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS", + "egv5Es0QlQP": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS" + }, + "displayDensity": "NORMAL", + "regressionType": "NONE", + "completedOnly": false, + "colTotals": true, + "hideEmptyRowItems": "NONE", + "aggregationType": "DEFAULT", + "hideSubtitle": false, + "hideLegend": false, + "colSubTotals": true, + "legendDisplayStrategy": "FIXED", + "rowTotals": false, + "digitGroupSeparator": "SPACE", + "regression": false, + "fontStyle": {}, + "access": { + "read": true, + "update": true, + "externalize": true, + "delete": true, + "write": true, + "manage": true + }, + "reportingParams": { + "parentOrganisationUnit": false, + "reportingPeriod": false, + "organisationUnit": false, + "grandParentOrganisationUnit": false + }, + "lastUpdatedBy": { + "displayName": "Tom Wakiki", + "id": "GOLswS44mh8", + "username": "system" + }, + "user": { "displayName": "Tom Wakiki" }, + "translations": [], + "yearlySeries": [], + "interpretations": [], + "subscribers": [], + "columns": [ + { + "dimension": "dx", + "items": [ + { + "name": "ANC 1 Coverage", + "id": "Uvn6LCg7dVU", + "displayName": "ANC 1 Coverage", + "displayShortName": "ANC 1 Coverage", + "dimensionItemType": "INDICATOR" + }, + { + "name": "ANC 3 Coverage", + "id": "sB79w2hiLp8", + "displayName": "ANC 3 Coverage", + "displayShortName": "ANC 3 Coverage", + "dimensionItemType": "INDICATOR" + } + ] + }, + { + "dimension": "pe", + "items": [ + { + "name": "LAST_4_QUARTERS", + "id": "LAST_4_QUARTERS", + "displayName": "LAST_4_QUARTERS", + "displayShortName": "LAST_4_QUARTERS", + "dimensionItemType": "PERIOD" + } + ] + } + ], + "series": [], + "favorites": [], + "filters": [], + "rows": [ + { + "dimension": "ou", + "items": [ + { + "name": "Baoma Station CHP", + "id": "jNb63DIHuwU", + "displayName": "Baoma Station CHP", + "displayShortName": "Baoma Station CHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Blamawo MCHP", + "id": "WAjjFMDJKcx", + "displayName": "Blamawo MCHP", + "displayShortName": "Blamawo MCHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Faabu CHP", + "id": "ZpE2POxvl9P", + "displayName": "Faabu CHP", + "displayShortName": "Faabu CHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Gerehun CHC", + "id": "TSyzvBiovKh", + "displayName": "Gerehun CHC", + "displayShortName": "Gerehun CHC", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Golu MCHP", + "id": "azRICFoILuh", + "displayName": "Golu MCHP", + "displayShortName": "Golu MCHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Jembe CHC", + "id": "Umh4HKqqFp6", + "displayName": "Jembe CHC", + "displayShortName": "Jembe CHC", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Jormu MCHP", + "id": "RzgSFJ9E46G", + "displayName": "Jormu MCHP", + "displayShortName": "Jormu MCHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Kigbai MCHP", + "id": "egv5Es0QlQP", + "displayName": "Kigbai MCHP", + "displayShortName": "Kigbai MCHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Kpumbu MCHP", + "id": "pMEnu7BjqMz", + "displayName": "Kpumbu MCHP", + "displayShortName": "Kpumbu MCHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Mbundorbu MCHP", + "id": "EuoA3Crpqts", + "displayName": "Mbundorbu MCHP", + "displayShortName": "Mbundorbu MCHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Pelewahun (Baoma) MCHP", + "id": "KfUCAQoOIae", + "displayName": "Pelewahun (Baoma) MCHP", + "displayShortName": "PelewahunBaomaMCHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Tugbebu CHP", + "id": "bG0PlyD0iP3", + "displayName": "Tugbebu CHP", + "displayShortName": "Tugbebu CHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Yakaji MCHP", + "id": "AnXoUM1tfNT", + "displayName": "Yakaji MCHP", + "displayShortName": "Yakaji MCHP", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "name": "Yamandu CHC", + "id": "nX05QLraDhO", + "displayName": "Yamandu CHC", + "displayShortName": "Yamandu CHC", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { "name": "LEVEL-4", "id": "LEVEL-4", "displayName": "LEVEL-4" } + ] + }, + { + "dimension": "uIuxlbV1vRT", + "items": [ + { + "name": "Eastern Area", + "id": "nlX2VoouN63", + "displayName": "Eastern Area", + "displayShortName": "Eastern Area", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "name": "Northern Area", + "id": "J40PpdN4Wkk", + "displayName": "Northern Area", + "displayShortName": "Northern Area", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "name": "Southern Area", + "id": "jqBqIXoXpfy", + "displayName": "Southern Area", + "displayShortName": "Southern Area", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "name": "Western Area", + "id": "b0EsAxm8Nge", + "displayName": "Western Area", + "displayShortName": "Western Area", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + } + ] + } + ] +} diff --git a/src/__demo__/data/deep.visualization.json b/src/__demo__/data/deep.visualization.json index 241d69996..6a72d8247 100644 --- a/src/__demo__/data/deep.visualization.json +++ b/src/__demo__/data/deep.visualization.json @@ -1,343 +1,330 @@ { - "lastUpdated": "2017-10-09T15:58:39.672", - "id": "zLlhKD36wC5", - "created": "2016-08-02T19:58:19.493", - "name": "Immunization data by facility type last 4 quarters (lars)", - "publicAccess": "rw------", - "legendDisplayStyle": "FILL", - "hideEmptyColumns": false, - "subscribed": false, - "rowSubTotals": true, - "showDimensionLabels": true, - "sortOrder": 0, - "fontSize": "NORMAL", - "favorite": false, - "topLimit": 0, - "displayName": "Immunization data by facility type last 4 quarters (lars)", - "showHierarchy": false, - "cumulative": false, - "hideTitle": false, - "skipRounding": false, - "hideEmptyRows": false, - "parentGraphMap": { - "jUb8gELQApl": "ImspTQPwCqd", - "TEQlaapDQoK": "ImspTQPwCqd", - "eIQbndfxQMb": "ImspTQPwCqd", - "Vth0fbpFcsO": "ImspTQPwCqd", - "PMa2VCrupOd": "ImspTQPwCqd", - "O6uvpzGd5pu": "ImspTQPwCqd", - "bL4ooGhyHRQ": "ImspTQPwCqd", - "kJq2mPyFEHo": "ImspTQPwCqd", - "fdc6uOvgoji": "ImspTQPwCqd", - "at6UHUQatSo": "ImspTQPwCqd", - "lc3eMKXaEfw": "ImspTQPwCqd", - "qhqAxPSTUXp": "ImspTQPwCqd", - "jmIPBj66vD6": "ImspTQPwCqd" - }, - "displayDensity": "NORMAL", - "completedOnly": false, - "colTotals": true, - "aggregationType": "DEFAULT", - "hideSubtitle": false, - "legendDisplayStrategy": "FIXED", - "colSubTotals": true, - "rowTotals": true, - "digitGroupSeparator": "SPACE", - "regression": false, - "reportParams": { - "paramGrandParentOrganisationUnit": false, - "paramReportingPeriod": false, - "paramOrganisationUnit": false, - "paramParentOrganisationUnit": false - }, - "access": { - "read": true, - "update": true, - "externalize": true, - "delete": true, - "write": true, - "manage": true - }, - "lastUpdatedBy": { "id": "GOLswS44mh8" }, - "user": { - "displayName": "Tom Wakiki", - "userCredentials": { "username": "system" } - }, - "dataElementGroupSetDimensions": [], - "attributeDimensions": [], - "translations": [], - "interpretations": [], - "userGroupAccesses": [ - { - "access": "r-r-----", - "userGroupUid": "Rg8wusV7QYi", - "displayName": "HIV Program Coordinators", - "id": "Rg8wusV7QYi" + "lastUpdated": "2017-10-09T15:58:39.672", + "id": "zLlhKD36wC5", + "created": "2016-08-02T19:58:19.493", + "name": "Immunization data by facility type last 4 quarters (lars)", + "legendDisplayStyle": "FILL", + "hideEmptyColumns": false, + "subscribed": false, + "rowSubTotals": true, + "showDimensionLabels": true, + "sortOrder": 0, + "fontSize": "NORMAL", + "favorite": false, + "topLimit": 0, + "displayName": "Immunization data by facility type last 4 quarters (lars)", + "showHierarchy": false, + "cumulative": false, + "hideTitle": false, + "skipRounding": false, + "hideEmptyRows": false, + "parentGraphMap": { + "jUb8gELQApl": "ImspTQPwCqd", + "TEQlaapDQoK": "ImspTQPwCqd", + "eIQbndfxQMb": "ImspTQPwCqd", + "Vth0fbpFcsO": "ImspTQPwCqd", + "PMa2VCrupOd": "ImspTQPwCqd", + "O6uvpzGd5pu": "ImspTQPwCqd", + "bL4ooGhyHRQ": "ImspTQPwCqd", + "kJq2mPyFEHo": "ImspTQPwCqd", + "fdc6uOvgoji": "ImspTQPwCqd", + "at6UHUQatSo": "ImspTQPwCqd", + "lc3eMKXaEfw": "ImspTQPwCqd", + "qhqAxPSTUXp": "ImspTQPwCqd", + "jmIPBj66vD6": "ImspTQPwCqd" }, - { - "access": "rwr-----", - "userGroupUid": "qMjBflJMOfB", - "displayName": "Family Planning Program", - "id": "qMjBflJMOfB" - } - ], - "columns": [ - { - "dimension": "pe", - "items": [ - { - "id": "LAST_4_QUARTERS", - "name": "LAST_4_QUARTERS", - "dimensionItemType": "PERIOD" - } - ] - }, - { - "dimension": "J5jldMd8OHv", - "items": [ - { - "id": "uYxK4wmcPqA", - "name": "CHP", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" - }, - { - "id": "tDZVQ1WtwpA", - "name": "Hospital", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" - }, - { - "id": "EYbopBOJWsW", - "name": "MCHP", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" - }, - { - "id": "RXL3lPSK8oG", - "name": "Clinic", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" - }, - { - "id": "CXw2yu5fodb", - "name": "CHC", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" - } - ] - }, - { - "dimension": "fMZEcRHuamy", - "items": [ - { - "id": "qkPbeWaFsnU", - "name": "Fixed", - "dimensionItemType": "CATEGORY_OPTION" - }, - { - "id": "wbrDrL2aYEc", - "name": "Outreach", - "dimensionItemType": "CATEGORY_OPTION" - } - ] - } - ], - "dataElementDimensions": [], - "categoryDimensions": [ - { - "category": { "id": "fMZEcRHuamy" }, - "categoryOptions": [{ "id": "qkPbeWaFsnU" }, { "id": "wbrDrL2aYEc" }] - } - ], - "programIndicatorDimensions": [], - "attributeValues": [], - "userAccesses": [], - "dataDimensionItems": [ - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "s46m5MS0hxu" } - }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "UOlfIjgN8X6" } - }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "YtbsuPPo010" } - }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "x3Do5e7g4Qo" } - }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "pikOziyCXbM" } - }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "O05mAByOgAv" } - }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "vI2csg55S9C" } + "displayDensity": "NORMAL", + "completedOnly": false, + "colTotals": true, + "aggregationType": "DEFAULT", + "hideSubtitle": false, + "legendDisplayStrategy": "FIXED", + "colSubTotals": true, + "rowTotals": true, + "digitGroupSeparator": "SPACE", + "regression": false, + "reportParams": { + "paramGrandParentOrganisationUnit": false, + "paramReportingPeriod": false, + "paramOrganisationUnit": false, + "paramParentOrganisationUnit": false }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "fClA2Erf6IO" } + "access": { + "read": true, + "update": true, + "externalize": true, + "delete": true, + "write": true, + "manage": true }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "I78gJm4KBo7" } + "lastUpdatedBy": { "id": "GOLswS44mh8" }, + "user": { + "displayName": "Tom Wakiki", + "username": "system" }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "n6aMJNLdvep" } - }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { "id": "l6byfWFUGaP" } - } - ], - "categoryOptionGroupSetDimensions": [], - "organisationUnitGroupSetDimensions": [ - { - "organisationUnitGroupSet": { "id": "J5jldMd8OHv" }, - "organisationUnitGroups": [ - { "id": "uYxK4wmcPqA" }, - { "id": "tDZVQ1WtwpA" }, - { "id": "EYbopBOJWsW" }, - { "id": "RXL3lPSK8oG" }, - { "id": "CXw2yu5fodb" } - ] - } - ], - "filters": [], - "rows": [ - { - "dimension": "dx", - "items": [ - { - "id": "s46m5MS0hxu", - "name": "BCG doses given", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "UOlfIjgN8X6", - "name": "Fully Immunized child", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "YtbsuPPo010", - "name": "Measles doses given", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "x3Do5e7g4Qo", - "name": "OPV0 doses given", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "pikOziyCXbM", - "name": "OPV1 doses given", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "O05mAByOgAv", - "name": "OPV2 doses given", - "dimensionItemType": "DATA_ELEMENT" + "dataElementGroupSetDimensions": [], + "attributeDimensions": [], + "translations": [], + "interpretations": [], + "columns": [ + { + "dimension": "pe", + "items": [ + { + "id": "LAST_4_QUARTERS", + "name": "LAST_4_QUARTERS", + "dimensionItemType": "PERIOD" + } + ] }, { - "id": "vI2csg55S9C", - "name": "OPV3 doses given", - "dimensionItemType": "DATA_ELEMENT" + "dimension": "J5jldMd8OHv", + "items": [ + { + "id": "uYxK4wmcPqA", + "name": "CHP", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "id": "tDZVQ1WtwpA", + "name": "Hospital", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "id": "EYbopBOJWsW", + "name": "MCHP", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "id": "RXL3lPSK8oG", + "name": "Clinic", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "id": "CXw2yu5fodb", + "name": "CHC", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + } + ] }, { - "id": "fClA2Erf6IO", - "name": "Penta1 doses given", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "I78gJm4KBo7", - "name": "Penta2 doses given", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "n6aMJNLdvep", - "name": "Penta3 doses given", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "l6byfWFUGaP", - "name": "Yellow Fever doses given", - "dimensionItemType": "DATA_ELEMENT" + "dimension": "fMZEcRHuamy", + "items": [ + { + "id": "qkPbeWaFsnU", + "name": "Fixed", + "dimensionItemType": "CATEGORY_OPTION" + }, + { + "id": "wbrDrL2aYEc", + "name": "Outreach", + "dimensionItemType": "CATEGORY_OPTION" + } + ] } - ] - }, - { - "dimension": "ou", - "items": [ - { - "id": "O6uvpzGd5pu", - "name": "Bo", - "dimensionItemType": "ORGANISATION_UNIT" - }, + ], + "dataElementDimensions": [], + "categoryDimensions": [ + { + "category": { "id": "fMZEcRHuamy" }, + "categoryOptions": [ + { "id": "qkPbeWaFsnU" }, + { "id": "wbrDrL2aYEc" } + ] + } + ], + "programIndicatorDimensions": [], + "attributeValues": [], + "dataDimensionItems": [ { - "id": "fdc6uOvgoji", - "name": "Bombali", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "s46m5MS0hxu" } }, { - "id": "lc3eMKXaEfw", - "name": "Bonthe", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "UOlfIjgN8X6" } }, { - "id": "jUb8gELQApl", - "name": "Kailahun", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "YtbsuPPo010" } }, { - "id": "PMa2VCrupOd", - "name": "Kambia", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "x3Do5e7g4Qo" } }, { - "id": "kJq2mPyFEHo", - "name": "Kenema", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "pikOziyCXbM" } }, { - "id": "qhqAxPSTUXp", - "name": "Koinadugu", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "O05mAByOgAv" } }, { - "id": "Vth0fbpFcsO", - "name": "Kono", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "vI2csg55S9C" } }, { - "id": "jmIPBj66vD6", - "name": "Moyamba", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "fClA2Erf6IO" } }, { - "id": "TEQlaapDQoK", - "name": "Port Loko", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "I78gJm4KBo7" } }, { - "id": "bL4ooGhyHRQ", - "name": "Pujehun", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "n6aMJNLdvep" } }, { - "id": "eIQbndfxQMb", - "name": "Tonkolili", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { "id": "l6byfWFUGaP" } + } + ], + "categoryOptionGroupSetDimensions": [], + "organisationUnitGroupSetDimensions": [ + { + "organisationUnitGroupSet": { "id": "J5jldMd8OHv" }, + "organisationUnitGroups": [ + { "id": "uYxK4wmcPqA" }, + { "id": "tDZVQ1WtwpA" }, + { "id": "EYbopBOJWsW" }, + { "id": "RXL3lPSK8oG" }, + { "id": "CXw2yu5fodb" } + ] + } + ], + "filters": [], + "rows": [ + { + "dimension": "dx", + "items": [ + { + "id": "s46m5MS0hxu", + "name": "BCG doses given", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "UOlfIjgN8X6", + "name": "Fully Immunized child", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "YtbsuPPo010", + "name": "Measles doses given", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "x3Do5e7g4Qo", + "name": "OPV0 doses given", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "pikOziyCXbM", + "name": "OPV1 doses given", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "O05mAByOgAv", + "name": "OPV2 doses given", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "vI2csg55S9C", + "name": "OPV3 doses given", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "fClA2Erf6IO", + "name": "Penta1 doses given", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "I78gJm4KBo7", + "name": "Penta2 doses given", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "n6aMJNLdvep", + "name": "Penta3 doses given", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "l6byfWFUGaP", + "name": "Yellow Fever doses given", + "dimensionItemType": "DATA_ELEMENT" + } + ] }, { - "id": "at6UHUQatSo", - "name": "Western Area", - "dimensionItemType": "ORGANISATION_UNIT" + "dimension": "ou", + "items": [ + { + "id": "O6uvpzGd5pu", + "name": "Bo", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "fdc6uOvgoji", + "name": "Bombali", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "lc3eMKXaEfw", + "name": "Bonthe", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "jUb8gELQApl", + "name": "Kailahun", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "PMa2VCrupOd", + "name": "Kambia", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "kJq2mPyFEHo", + "name": "Kenema", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "qhqAxPSTUXp", + "name": "Koinadugu", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "Vth0fbpFcsO", + "name": "Kono", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "jmIPBj66vD6", + "name": "Moyamba", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "TEQlaapDQoK", + "name": "Port Loko", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "bL4ooGhyHRQ", + "name": "Pujehun", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "eIQbndfxQMb", + "name": "Tonkolili", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "at6UHUQatSo", + "name": "Western Area", + "dimensionItemType": "ORGANISATION_UNIT" + } + ] } - ] - } - ] + ] } diff --git a/src/__demo__/data/deepWithFilters.visualization.json b/src/__demo__/data/deepWithFilters.visualization.json index 4f6f60a28..26a0e949a 100644 --- a/src/__demo__/data/deepWithFilters.visualization.json +++ b/src/__demo__/data/deepWithFilters.visualization.json @@ -9,7 +9,6 @@ "legend": { "showKey": false }, - "publicAccess": "--------", "type": "PIVOT_TABLE", "hideEmptyColumns": false, "hideEmptyRows": false, @@ -75,9 +74,7 @@ "translations": [], "yearlySeries": [], "interpretations": [], - "userGroupAccesses": [], "subscribers": [], - "userAccesses": [], "favorites": [], "columns": [ { diff --git a/src/__demo__/data/degs.visualization.json b/src/__demo__/data/degs.visualization.json index 3b9efc946..1619f3449 100644 --- a/src/__demo__/data/degs.visualization.json +++ b/src/__demo__/data/degs.visualization.json @@ -3,7 +3,6 @@ "id": "HkFOAFahojr", "created": "2020-03-05T15:50:10.007", "name": "AUSTIN TEST - DEGS", - "publicAccess": "--------", "legendDisplayStyle": "FILL", "type": "COLUMN", "hideEmptyColumns": false, @@ -64,14 +63,11 @@ "user": { "name": "Tom Wakiki", "displayName": "Tom Wakiki", - "userCredentials": { - "username": "system" - } + "username": "system" }, "translations": [], "yearlySeries": [], "interpretations": [], - "userGroupAccesses": [], "subscribers": [], "optionalAxes": [], "columns": [ @@ -88,7 +84,6 @@ ] } ], - "userAccesses": [], "favorites": [], "filters": [ { @@ -118,4 +113,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/__demo__/data/diseaseWeeks.visualization.json b/src/__demo__/data/diseaseWeeks.visualization.json index 43bad798c..d40a53d26 100644 --- a/src/__demo__/data/diseaseWeeks.visualization.json +++ b/src/__demo__/data/diseaseWeeks.visualization.json @@ -3,7 +3,6 @@ "id": "hY0eM8AWg6k", "created": "2017-05-30T14:29:44.670", "name": "IDSR: Disease Week 1-12 Sierra Leone", - "publicAccess": "rw------", "legendDisplayStyle": "FILL", "type": "PIVOT_TABLE", "hideEmptyColumns": false, @@ -64,14 +63,11 @@ "user": { "name": "Tom Wakiki", "displayName": "Tom Wakiki", - "userCredentials": { - "username": "system" - } + "username": "system" }, "translations": [], "yearlySeries": [], "interpretations": [], - "userGroupAccesses": [], "subscribers": [], "optionalAxes": [], "columns": [ @@ -116,7 +112,6 @@ ] } ], - "userAccesses": [], "favorites": [], "filters": [ { @@ -223,4 +218,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/__demo__/data/emptyColumns.visualization.json b/src/__demo__/data/emptyColumns.visualization.json index b266a5ac4..cb4584bd5 100644 --- a/src/__demo__/data/emptyColumns.visualization.json +++ b/src/__demo__/data/emptyColumns.visualization.json @@ -3,7 +3,6 @@ "id": "CcjaXXU4VNb", "created": "2020-03-04T10:03:46.755", "name": "TEST_EMPTY_COLUMNS", - "publicAccess": "--------", "legendDisplayStyle": "FILL", "type": "PIVOT_TABLE", "hideEmptyColumns": true, @@ -64,14 +63,11 @@ "user": { "name": "Tom Wakiki", "displayName": "Tom Wakiki", - "userCredentials": { - "username": "system" - } + "username": "system" }, "translations": [], "yearlySeries": [], "interpretations": [], - "userGroupAccesses": [], "subscribers": [], "optionalAxes": [], "columns": [ @@ -99,7 +95,6 @@ "items": [] } ], - "userAccesses": [], "favorites": [], "filters": [ { @@ -129,4 +124,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/__demo__/data/emptyRows.visualization.json b/src/__demo__/data/emptyRows.visualization.json index d8de8e54b..93dade178 100644 --- a/src/__demo__/data/emptyRows.visualization.json +++ b/src/__demo__/data/emptyRows.visualization.json @@ -1,325 +1,320 @@ { - "lastUpdated": "2020-01-09T15:04:43.097", - "id": "s9c4lyOr6jO", - "created": "2020-01-09T15:04:43.097", - "name": "_EMPTY_ROWS_", - "publicAccess": "rw------", - "legendDisplayStyle": "FILL", - "hideEmptyColumns": false, - "subscribed": false, - "rowSubTotals": true, - "displayDescription": "ANC visits by facility type and last 12 months", - "showDimensionLabels": false, - "sortOrder": 0, - "fontSize": "NORMAL", - "favorite": false, - "topLimit": 0, - "displayName": "_EMPTY_ROWS_", - "showHierarchy": false, - "cumulative": false, - "hideTitle": false, - "skipRounding": false, - "numberType": "VALUE", - "hideEmptyRows": true, - "parentGraphMap": { - "jUb8gELQApl": "ImspTQPwCqd", - "TEQlaapDQoK": "ImspTQPwCqd", - "eIQbndfxQMb": "ImspTQPwCqd", - "Vth0fbpFcsO": "ImspTQPwCqd", - "PMa2VCrupOd": "ImspTQPwCqd", - "O6uvpzGd5pu": "ImspTQPwCqd", - "bL4ooGhyHRQ": "ImspTQPwCqd", - "kJq2mPyFEHo": "ImspTQPwCqd", - "fdc6uOvgoji": "ImspTQPwCqd", - "at6UHUQatSo": "ImspTQPwCqd", - "lc3eMKXaEfw": "ImspTQPwCqd", - "qhqAxPSTUXp": "ImspTQPwCqd", - "jmIPBj66vD6": "ImspTQPwCqd" - }, - "displayDensity": "NORMAL", - "completedOnly": false, - "colTotals": true, - "aggregationType": "DEFAULT", - "hideSubtitle": false, - "description": "ANC visits by facility type and last 12 months", - "title": "ANC visits and IPT by facility type2", - "legendDisplayStrategy": "FIXED", - "colSubTotals": true, - "rowTotals": true, - "digitGroupSeparator": "SPACE", - "regression": false, - "reportParams": { - "paramGrandParentOrganisationUnit": false, - "paramReportingPeriod": false, - "paramOrganisationUnit": false, - "paramParentOrganisationUnit": false - }, - "access": { - "read": true, - "update": true, - "externalize": true, - "delete": true, - "write": true, - "manage": true - }, - "lastUpdatedBy": { - "id": "xE7jOejl9FI" - }, - "user": { - "displayName": "John Traore", - "userCredentials": { - "username": "admin" - } - }, - "dataElementGroupSetDimensions": [], - "attributeDimensions": [], - "translations": [], - "interpretations": [], - "userGroupAccesses": [], - "subscribers": [], - "columns": [ - { - "dimension": "dx", - "items": [ - { - "id": "fbfJHSPpUQD", - "name": "ANC 1st visit", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "cYeuwXTCPkU", - "name": "ANC 2nd visit", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "Jtf34kNZhzP", - "name": "ANC 3rd visit", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "hfdmMSPBgLG", - "name": "ANC 4th or more visits", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "bqK6eSIwo3h", - "name": "IPT 1st dose given at PHU", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "yTHydhurQQU", - "name": "IPT 1st dose given by TBA", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "V37YqbqpEhV", - "name": "IPT 2nd dose given at PHU", - "dimensionItemType": "DATA_ELEMENT" - }, - { - "id": "SA7WeFZnUci", - "name": "IPT 2nd dose given by TBA", - "dimensionItemType": "DATA_ELEMENT" - } - ] - }, - { - "dimension": "pe", - "items": [ - { - "id": "LAST_12_MONTHS", - "name": "LAST_12_MONTHS", - "dimensionItemType": "PERIOD" - } - ] - } - ], - "dataElementDimensions": [], - "categoryDimensions": [], - "programIndicatorDimensions": [], - "attributeValues": [], - "userAccesses": [], - "favorites": [], - "dataDimensionItems": [ - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { - "id": "fbfJHSPpUQD" - } + "lastUpdated": "2020-01-09T15:04:43.097", + "id": "s9c4lyOr6jO", + "created": "2020-01-09T15:04:43.097", + "name": "_EMPTY_ROWS_", + "legendDisplayStyle": "FILL", + "hideEmptyColumns": false, + "subscribed": false, + "rowSubTotals": true, + "displayDescription": "ANC visits by facility type and last 12 months", + "showDimensionLabels": false, + "sortOrder": 0, + "fontSize": "NORMAL", + "favorite": false, + "topLimit": 0, + "displayName": "_EMPTY_ROWS_", + "showHierarchy": false, + "cumulative": false, + "hideTitle": false, + "skipRounding": false, + "numberType": "VALUE", + "hideEmptyRows": true, + "parentGraphMap": { + "jUb8gELQApl": "ImspTQPwCqd", + "TEQlaapDQoK": "ImspTQPwCqd", + "eIQbndfxQMb": "ImspTQPwCqd", + "Vth0fbpFcsO": "ImspTQPwCqd", + "PMa2VCrupOd": "ImspTQPwCqd", + "O6uvpzGd5pu": "ImspTQPwCqd", + "bL4ooGhyHRQ": "ImspTQPwCqd", + "kJq2mPyFEHo": "ImspTQPwCqd", + "fdc6uOvgoji": "ImspTQPwCqd", + "at6UHUQatSo": "ImspTQPwCqd", + "lc3eMKXaEfw": "ImspTQPwCqd", + "qhqAxPSTUXp": "ImspTQPwCqd", + "jmIPBj66vD6": "ImspTQPwCqd" }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { - "id": "cYeuwXTCPkU" - } + "displayDensity": "NORMAL", + "completedOnly": false, + "colTotals": true, + "aggregationType": "DEFAULT", + "hideSubtitle": false, + "description": "ANC visits by facility type and last 12 months", + "title": "ANC visits and IPT by facility type2", + "legendDisplayStrategy": "FIXED", + "colSubTotals": true, + "rowTotals": true, + "digitGroupSeparator": "SPACE", + "regression": false, + "reportParams": { + "paramGrandParentOrganisationUnit": false, + "paramReportingPeriod": false, + "paramOrganisationUnit": false, + "paramParentOrganisationUnit": false }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { - "id": "Jtf34kNZhzP" - } + "access": { + "read": true, + "update": true, + "externalize": true, + "delete": true, + "write": true, + "manage": true }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { - "id": "hfdmMSPBgLG" - } + "lastUpdatedBy": { + "id": "xE7jOejl9FI" }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { - "id": "bqK6eSIwo3h" - } + "user": { + "displayName": "John Traore", + "username": "admin" }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { - "id": "yTHydhurQQU" - } - }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { - "id": "V37YqbqpEhV" - } - }, - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { - "id": "SA7WeFZnUci" - } - } - ], - "categoryOptionGroupSetDimensions": [], - "organisationUnitGroupSetDimensions": [ - { - "organisationUnitGroupSet": { - "id": "J5jldMd8OHv" - }, - "organisationUnitGroups": [ - { - "id": "uYxK4wmcPqA" - }, - { - "id": "tDZVQ1WtwpA" - }, - { - "id": "EYbopBOJWsW" - }, - { - "id": "RXL3lPSK8oG" + "dataElementGroupSetDimensions": [], + "attributeDimensions": [], + "translations": [], + "interpretations": [], + "subscribers": [], + "columns": [ + { + "dimension": "dx", + "items": [ + { + "id": "fbfJHSPpUQD", + "name": "ANC 1st visit", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "cYeuwXTCPkU", + "name": "ANC 2nd visit", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "Jtf34kNZhzP", + "name": "ANC 3rd visit", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "hfdmMSPBgLG", + "name": "ANC 4th or more visits", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "bqK6eSIwo3h", + "name": "IPT 1st dose given at PHU", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "yTHydhurQQU", + "name": "IPT 1st dose given by TBA", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "V37YqbqpEhV", + "name": "IPT 2nd dose given at PHU", + "dimensionItemType": "DATA_ELEMENT" + }, + { + "id": "SA7WeFZnUci", + "name": "IPT 2nd dose given by TBA", + "dimensionItemType": "DATA_ELEMENT" + } + ] }, { - "id": "CXw2yu5fodb" + "dimension": "pe", + "items": [ + { + "id": "LAST_12_MONTHS", + "name": "LAST_12_MONTHS", + "dimensionItemType": "PERIOD" + } + ] } - ] - } - ], - "filters": [], - "rows": [ - { - "dimension": "ou", - "items": [ - { - "id": "jUb8gELQApl", - "name": "Kailahun", - "dimensionItemType": "ORGANISATION_UNIT" + ], + "dataElementDimensions": [], + "categoryDimensions": [], + "programIndicatorDimensions": [], + "attributeValues": [], + "favorites": [], + "dataDimensionItems": [ + { + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { + "id": "fbfJHSPpUQD" + } }, { - "id": "TEQlaapDQoK", - "name": "Port Loko", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { + "id": "cYeuwXTCPkU" + } }, { - "id": "eIQbndfxQMb", - "name": "Tonkolili", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { + "id": "Jtf34kNZhzP" + } }, { - "id": "Vth0fbpFcsO", - "name": "Kono", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { + "id": "hfdmMSPBgLG" + } }, { - "id": "PMa2VCrupOd", - "name": "Kambia", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { + "id": "bqK6eSIwo3h" + } }, { - "id": "O6uvpzGd5pu", - "name": "Bo", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { + "id": "yTHydhurQQU" + } }, { - "id": "bL4ooGhyHRQ", - "name": "Pujehun", - "dimensionItemType": "ORGANISATION_UNIT" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { + "id": "V37YqbqpEhV" + } }, { - "id": "kJq2mPyFEHo", - "name": "Kenema", - "dimensionItemType": "ORGANISATION_UNIT" - }, - { - "id": "fdc6uOvgoji", - "name": "Bombali", - "dimensionItemType": "ORGANISATION_UNIT" - }, - { - "id": "at6UHUQatSo", - "name": "Western Area", - "dimensionItemType": "ORGANISATION_UNIT" - }, - { - "id": "lc3eMKXaEfw", - "name": "Bonthe", - "dimensionItemType": "ORGANISATION_UNIT" - }, - { - "id": "qhqAxPSTUXp", - "name": "Koinadugu", - "dimensionItemType": "ORGANISATION_UNIT" - }, - { - "id": "jmIPBj66vD6", - "name": "Moyamba", - "dimensionItemType": "ORGANISATION_UNIT" - }, - { - "id": "LEVEL-4", - "name": "LEVEL-4" + "dataDimensionItemType": "DATA_ELEMENT", + "dataElement": { + "id": "SA7WeFZnUci" + } } - ] - }, - { - "dimension": "J5jldMd8OHv", - "items": [ - { - "id": "uYxK4wmcPqA", - "name": "CHP", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" - }, - { - "id": "tDZVQ1WtwpA", - "name": "Hospital", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" - }, - { - "id": "EYbopBOJWsW", - "name": "MCHP", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" - }, - { - "id": "RXL3lPSK8oG", - "name": "Clinic", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" + ], + "categoryOptionGroupSetDimensions": [], + "organisationUnitGroupSetDimensions": [ + { + "organisationUnitGroupSet": { + "id": "J5jldMd8OHv" + }, + "organisationUnitGroups": [ + { + "id": "uYxK4wmcPqA" + }, + { + "id": "tDZVQ1WtwpA" + }, + { + "id": "EYbopBOJWsW" + }, + { + "id": "RXL3lPSK8oG" + }, + { + "id": "CXw2yu5fodb" + } + ] + } + ], + "filters": [], + "rows": [ + { + "dimension": "ou", + "items": [ + { + "id": "jUb8gELQApl", + "name": "Kailahun", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "TEQlaapDQoK", + "name": "Port Loko", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "eIQbndfxQMb", + "name": "Tonkolili", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "Vth0fbpFcsO", + "name": "Kono", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "PMa2VCrupOd", + "name": "Kambia", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "O6uvpzGd5pu", + "name": "Bo", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "bL4ooGhyHRQ", + "name": "Pujehun", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "kJq2mPyFEHo", + "name": "Kenema", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "fdc6uOvgoji", + "name": "Bombali", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "at6UHUQatSo", + "name": "Western Area", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "lc3eMKXaEfw", + "name": "Bonthe", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "qhqAxPSTUXp", + "name": "Koinadugu", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "jmIPBj66vD6", + "name": "Moyamba", + "dimensionItemType": "ORGANISATION_UNIT" + }, + { + "id": "LEVEL-4", + "name": "LEVEL-4" + } + ] }, { - "id": "CXw2yu5fodb", - "name": "CHC", - "dimensionItemType": "ORGANISATION_UNIT_GROUP" + "dimension": "J5jldMd8OHv", + "items": [ + { + "id": "uYxK4wmcPqA", + "name": "CHP", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "id": "tDZVQ1WtwpA", + "name": "Hospital", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "id": "EYbopBOJWsW", + "name": "MCHP", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "id": "RXL3lPSK8oG", + "name": "Clinic", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + }, + { + "id": "CXw2yu5fodb", + "name": "CHC", + "dimensionItemType": "ORGANISATION_UNIT_GROUP" + } + ] } - ] - } - ] + ] } diff --git a/src/__demo__/data/hierarchy.visualization.json b/src/__demo__/data/hierarchy.visualization.json index 615965a94..6d42d953d 100644 --- a/src/__demo__/data/hierarchy.visualization.json +++ b/src/__demo__/data/hierarchy.visualization.json @@ -1 +1,118 @@ -{"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"}]}]} \ No newline at end of file +{ + "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", + "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": [], + "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" + } + ] + } + ], + "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" } + ] + } + ] +} diff --git a/src/__demo__/data/lastFiveYears.visualization.json b/src/__demo__/data/lastFiveYears.visualization.json index 4d82a1e4c..dd3b38d41 100644 --- a/src/__demo__/data/lastFiveYears.visualization.json +++ b/src/__demo__/data/lastFiveYears.visualization.json @@ -3,7 +3,6 @@ "id": "jWJZ6I3bNZx", "created": "2020-09-07T13:01:07.853", "name": "TEST - Empty Columns Error", - "publicAccess": "--------", "legendDisplayStyle": "FILL", "type": "PIVOT_TABLE", "hideEmptyColumns": false, @@ -64,14 +63,11 @@ "user": { "name": "Astride Traore", "displayName": "Astride Traore", - "userCredentials": { - "username": "admin" - } + "username": "admin" }, "translations": [], "yearlySeries": [], "interpretations": [], - "userGroupAccesses": [], "subscribers": [], "optionalAxes": [], "columns": [ @@ -88,7 +84,6 @@ ] } ], - "userAccesses": [], "favorites": [], "filters": [ { @@ -118,4 +113,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/__demo__/data/narrative.visualization.json b/src/__demo__/data/narrative.visualization.json index deb03c86e..a337f58c3 100644 --- a/src/__demo__/data/narrative.visualization.json +++ b/src/__demo__/data/narrative.visualization.json @@ -3,7 +3,6 @@ "id": "HUaPWsVnlr4", "created": "2020-03-05T15:28:19.270", "name": "AUSTIN TEST - Narrative", - "publicAccess": "rw------", "legendDisplayStyle": "FILL", "hideEmptyColumns": false, "subscribed": false, @@ -52,15 +51,12 @@ }, "user": { "displayName": "Tom Wakiki", - "userCredentials": { - "username": "system" - } + "username": "system" }, "dataElementGroupSetDimensions": [], "attributeDimensions": [], "translations": [], "interpretations": [], - "userGroupAccesses": [], "subscribers": [], "columns": [ { @@ -83,7 +79,6 @@ "categoryDimensions": [], "programIndicatorDimensions": [], "attributeValues": [], - "userAccesses": [], "favorites": [], "dataDimensionItems": [ { @@ -128,4 +123,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/__demo__/data/simple.visualization.json b/src/__demo__/data/simple.visualization.json index 0a688998d..b472683ef 100644 --- a/src/__demo__/data/simple.visualization.json +++ b/src/__demo__/data/simple.visualization.json @@ -1,134 +1,163 @@ { - "lastUpdated": "2017-05-16T16:02:20.929", - "id": "tWg9OiyV7mu", - "created": "2012-11-13T18:33:17.032", "name": "ANC: ANC 1 Visits Cumulative Numbers", - "publicAccess": "rw------", - "legendDisplayStyle": "FILL", - "hideEmptyColumns": false, - "subscribed": false, - "rowSubTotals": false, - "showDimensionLabels": false, - "sortOrder": 0, + "created": "2012-11-13T18:33:17.032", + "lastUpdated": "2017-05-16T16:02:20.929", + "translations": [], + "createdBy": { + "id": "GOLswS44mh8", + "code": null, + "name": "Tom Wakiki", + "displayName": "Tom Wakiki", + "username": "system" + }, + "sharing": { + "owner": "GOLswS44mh8", + "external": false, + "users": {}, + "userGroups": {}, + "public": "rw------" + }, + "displayDensity": "NORMAL", "fontSize": "NORMAL", - "favorite": false, + "sortOrder": 0, "topLimit": 0, - "displayName": "ANC: ANC 1 Visits Cumulative Numbers", - "showHierarchy": false, - "cumulative": false, - "hideTitle": false, - "skipRounding": false, "hideEmptyRows": false, - "parentGraphMap": { - "ImspTQPwCqd": "" - }, - "displayDensity": "NORMAL", + "showHierarchy": false, + "userOrganisationUnit": false, + "userOrganisationUnitChildren": false, + "userOrganisationUnitGrandChildren": false, "completedOnly": false, - "colTotals": true, + "skipRounding": false, + "filterDimensions": [], + "dataDimensionItems": [{ "dataDimensionItemType": "DATA_ELEMENT" }], + "organisationUnits": [{ "id": "ImspTQPwCqd" }], + "periods": [], + "dataElementGroupSetDimensions": [], + "organisationUnitGroupSetDimensions": [ + { + "organisationUnitGroupSet": { "id": "J5jldMd8OHv" }, + "organisationUnitGroups": [ + { "id": "uYxK4wmcPqA" }, + { "id": "tDZVQ1WtwpA" }, + { "id": "EYbopBOJWsW" }, + { "id": "RXL3lPSK8oG" }, + { "id": "CXw2yu5fodb" } + ] + } + ], + "organisationUnitLevels": [], + "categoryDimensions": [], + "categoryOptionGroupSetDimensions": [], + "attributeDimensions": [], + "dataElementDimensions": [], + "programIndicatorDimensions": [], + "itemOrganisationUnitGroups": [], + "subscribers": [], "aggregationType": "DEFAULT", - "hideSubtitle": false, - "legendDisplayStrategy": "FIXED", - "colSubTotals": false, - "rowTotals": true, "digitGroupSeparator": "SPACE", - "regression": false, - "reportParams": { - "paramGrandParentOrganisationUnit": false, - "paramReportingPeriod": false, - "paramOrganisationUnit": true, - "paramParentOrganisationUnit": false + "hideLegend": false, + "noSpaceBetweenColumns": false, + "cumulativeValues": true, + "percentStackedValues": false, + "showData": false, + "colTotals": true, + "rowTotals": true, + "rowSubTotals": false, + "colSubTotals": false, + "hideTitle": false, + "hideSubtitle": false, + "showDimensionLabels": false, + "interpretations": [], + "type": "PIVOT_TABLE", + "reportingParams": { + "grandParentOrganisationUnit": false, + "parentOrganisationUnit": false, + "organisationUnit": true, + "reportingPeriod": false }, + "columnDimensions": ["dx"], + "rowDimensions": ["pe", "ou"], + "yearlySeries": [], + "regression": false, + "hideEmptyColumns": false, + "fixColumnHeaders": false, + "fixRowHeaders": false, + "filters": [], + "parentGraphMap": { "ImspTQPwCqd": "" }, + "columns": [{ "id": "dx" }], + "rows": [{ "id": "pe" }, { "id": "ou" }], + "subscribed": false, "access": { - "read": true, - "update": true, + "manage": true, "externalize": true, - "delete": true, "write": true, - "manage": true + "read": true, + "update": true, + "delete": true }, + "displayName": "ANC: ANC 1 Visits Cumulative Numbers", + "favorite": false, "user": { + "id": "GOLswS44mh8", + "code": null, + "name": "Tom Wakiki", "displayName": "Tom Wakiki", - "userCredentials": { - "username": "system" - } + "username": "system" }, - "dataElementGroupSetDimensions": [], - "attributeDimensions": [], - "translations": [], - "interpretations": [], - "userGroupAccesses": [], - "columns": [ - { - "dimension": "dx", - "items": [ - { - "id": "fbfJHSPpUQD", - "name": "ANC 1st visit", - "dimensionItemType": "DATA_ELEMENT" - } - ] - } - ], - "dataElementDimensions": [], - "categoryDimensions": [], - "programIndicatorDimensions": [], + "href": "https://debug.dhis2.org/dev/api/visualizations/tWg9OiyV7mu", + "displayFormName": "ANC: ANC 1 Visits Cumulative Numbers", + "id": "tWg9OiyV7mu", "attributeValues": [], - "userAccesses": [], - "dataDimensionItems": [ - { - "dataDimensionItemType": "DATA_ELEMENT", - "dataElement": { - "id": "fbfJHSPpUQD" - } - } - ], - "categoryOptionGroupSetDimensions": [], - "organisationUnitGroupSetDimensions": [ - { - "organisationUnitGroupSet": { - "id": "J5jldMd8OHv" - }, - "organisationUnitGroups": [ - { - "id": "uYxK4wmcPqA" - }, - { - "id": "tDZVQ1WtwpA" - }, - { - "id": "EYbopBOJWsW" - }, - { - "id": "RXL3lPSK8oG" - }, - { - "id": "CXw2yu5fodb" - } - ] - } - ], - "filters": [ - { - "dimension": "ou", - "items": [ - { - "id": "ImspTQPwCqd", - "name": "Sierra Leone", - "dimensionItemType": "ORGANISATION_UNIT" - } - ] - } - ], - "rows": [ - { - "dimension": "pe", - "items": [ - { - "id": "LAST_12_MONTHS", - "name": "LAST_12_MONTHS", - "dimensionItemType": "PERIOD" - } - ] - } - ] + "relativePeriods": { + "thisDay": false, + "yesterday": false, + "last3Days": false, + "last7Days": false, + "last14Days": false, + "last30Days": false, + "last60Days": false, + "last90Days": false, + "last180Days": false, + "thisMonth": false, + "lastMonth": false, + "thisBimonth": false, + "lastBimonth": false, + "thisQuarter": false, + "lastQuarter": false, + "thisSixMonth": false, + "lastSixMonth": false, + "weeksThisYear": false, + "monthsThisYear": false, + "biMonthsThisYear": false, + "quartersThisYear": false, + "thisYear": false, + "monthsLastYear": false, + "quartersLastYear": false, + "lastYear": false, + "last5Years": false, + "last10Years": false, + "last12Months": true, + "last6Months": false, + "last3Months": false, + "last6BiMonths": false, + "last4Quarters": false, + "last2SixMonths": false, + "thisFinancialYear": false, + "lastFinancialYear": false, + "last5FinancialYears": false, + "last10FinancialYears": false, + "thisWeek": false, + "lastWeek": false, + "thisBiWeek": false, + "lastBiWeek": false, + "last4Weeks": false, + "last4BiWeeks": false, + "last12Weeks": false, + "last52Weeks": false + }, + "legend": { "showKey": false, "style": "FILL", "strategy": "FIXED" }, + "sorting": [], + "optionalAxes": [], + "icons": [], + "seriesKey": { "hidden": false } } diff --git a/src/__demo__/data/target-with-legend.visualization.json b/src/__demo__/data/target-with-legend.visualization.json index 232081f34..f711722ce 100644 --- a/src/__demo__/data/target-with-legend.visualization.json +++ b/src/__demo__/data/target-with-legend.visualization.json @@ -3,7 +3,6 @@ "id": "yyG85tyRhs4", "created": "2017-05-19T16:03:12.490", "name": "ER: Emergency report Result vs Target Rural and Urban with legend", - "publicAccess": "rw------", "legendDisplayStyle": "FILL", "type": "PIVOT_TABLE", "hideEmptyColumns": false, @@ -72,14 +71,11 @@ "user": { "name": "Tom Wakiki", "displayName": "Tom Wakiki", - "userCredentials": { - "username": "system" - } + "username": "system" }, "translations": [], "yearlySeries": [], "interpretations": [], - "userGroupAccesses": [], "optionalAxes": [], "columns": [ { @@ -137,7 +133,6 @@ ] } ], - "userAccesses": [], "filters": [], "rows": [ { @@ -207,4 +202,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/__demo__/data/under-above-100.legendSet.json b/src/__demo__/data/under-above-100.legendSet.json index 2c75dcc98..ba037201a 100644 --- a/src/__demo__/data/under-above-100.legendSet.json +++ b/src/__demo__/data/under-above-100.legendSet.json @@ -1,113 +1,97 @@ { "code": "UA100", + "name": "Under or above 100%", "created": "2017-05-19T15:43:40.983", "lastUpdated": "2017-05-19T15:43:40.983", - "name": "Under or above 100%", - "href": "http://localhost:8080/api/32/legendSets/gFJUXah1uRH", - "id": "gFJUXah1uRH", - "displayName": "Under or above 100%", - "publicAccess": "rw------", - "externalAccess": false, - "favorite": false, - "lastUpdatedBy": { - "id": "GOLswS44mh8" + "translations": [], + "createdBy": { + "id": "GOLswS44mh8", + "code": null, + "name": "Tom Wakiki", + "displayName": "Tom Wakiki", + "username": "system" }, - "access": { - "read": true, - "update": true, - "externalize": false, - "delete": true, - "write": true, - "manage": true + "favorites": [], + "lastUpdatedBy": { + "id": "GOLswS44mh8", + "code": null, + "name": "Tom Wakiki", + "displayName": "Tom Wakiki", + "username": "system" }, - "user": { - "id": "GOLswS44mh8" + "sharing": { + "owner": "GOLswS44mh8", + "external": false, + "users": {}, + "userGroups": {}, + "public": "rw------" }, - "favorites": [ - - ], - "userGroupAccesses": [ - - ], - "attributeValues": [ - - ], "legends": [ - { - "lastUpdated": "2017-05-19T15:43:40.983", - "id": "I0lBkYHTjPw", - "created": "2017-05-19T15:43:40.983", - "name": "Above 100%", - "endValue": 900.0, - "color": "#B4F3BD", - "displayName": "Above 100%", - "externalAccess": false, - "startValue": 100.0, - "favorite": false, - "access": { - "read": true, - "update": true, - "externalize": false, - "delete": true, - "write": true, - "manage": true - }, - "favorites": [ - - ], - "translations": [ - - ], - "userGroupAccesses": [ - - ], - "attributeValues": [ - - ], - "userAccesses": [ - - ] - }, - { - "lastUpdated": "2017-05-19T15:43:40.984", - "id": "qCU0BSbmwjX", - "created": "2017-05-19T15:43:40.984", - "name": "Under 100%", - "endValue": 100.0, - "color": "#FF9C89", - "displayName": "Under 100%", - "externalAccess": false, - "startValue": 0.0, - "favorite": false, - "access": { - "read": true, - "update": true, - "externalize": false, - "delete": true, - "write": true, - "manage": true + { + "name": "Above 100%", + "created": "2017-05-19T15:43:40.983", + "lastUpdated": "2017-05-19T15:43:40.983", + "translations": [], + "favorites": [], + "sharing": { "external": false, "users": {}, "userGroups": {} }, + "startValue": 100.0, + "endValue": 900.0, + "color": "#B4F3BD", + "access": { + "manage": true, + "externalize": false, + "write": true, + "read": true, + "update": true, + "delete": true + }, + "displayName": "Above 100%", + "favorite": false, + "id": "I0lBkYHTjPw", + "attributeValues": [] }, - "favorites": [ - - ], - "translations": [ - - ], - "userGroupAccesses": [ - - ], - "attributeValues": [ - - ], - "userAccesses": [ - - ] - } - ], - "translations": [ - + { + "name": "Under 100%", + "created": "2017-05-19T15:43:40.984", + "lastUpdated": "2017-05-19T15:43:40.984", + "translations": [], + "favorites": [], + "sharing": { "external": false, "users": {}, "userGroups": {} }, + "startValue": 0.0, + "endValue": 100.0, + "color": "#FF9C89", + "access": { + "manage": true, + "externalize": false, + "write": true, + "read": true, + "update": true, + "delete": true + }, + "displayName": "Under 100%", + "favorite": false, + "id": "qCU0BSbmwjX", + "attributeValues": [] + } ], - "userAccesses": [ - - ] - } \ No newline at end of file + "access": { + "manage": true, + "externalize": false, + "write": true, + "read": true, + "update": true, + "delete": true + }, + "displayName": "Under or above 100%", + "favorite": false, + "user": { + "id": "GOLswS44mh8", + "code": null, + "name": "Tom Wakiki", + "displayName": "Tom Wakiki", + "username": "system" + }, + "href": "https://debug.dhis2.org/dev/api/legendSets/gFJUXah1uRH", + "id": "gFJUXah1uRH", + "attributeValues": [] +} diff --git a/src/__demo__/data/weeklyColumns.visualization.json b/src/__demo__/data/weeklyColumns.visualization.json index 03ec13ee6..aad212ae4 100644 --- a/src/__demo__/data/weeklyColumns.visualization.json +++ b/src/__demo__/data/weeklyColumns.visualization.json @@ -3,7 +3,6 @@ "id": "YXZjH1F9ntO", "created": "2020-09-07T13:01:07.853", "name": "TEST - Empty Columns Error 2", - "publicAccess": "--------", "legendDisplayStyle": "FILL", "type": "PIVOT_TABLE", "hideEmptyColumns": false, @@ -64,14 +63,11 @@ "user": { "name": "Astride Traore", "displayName": "Astride Traore", - "userCredentials": { - "username": "admin" - } + "username": "admin" }, "translations": [], "yearlySeries": [], "interpretations": [], - "userGroupAccesses": [], "subscribers": [], "optionalAxes": [], "columns": [ @@ -459,7 +455,6 @@ ] } ], - "userAccesses": [], "favorites": [], "filters": [ { @@ -489,4 +484,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/__fixtures__/json/chartAllFields.json b/src/__fixtures__/json/chartAllFields.json index 4274ab366..4b9fc61a9 100644 --- a/src/__fixtures__/json/chartAllFields.json +++ b/src/__fixtures__/json/chartAllFields.json @@ -3,7 +3,6 @@ "id": "UlfTKWZWV4u", "created": "2018-04-13T14:48:36.803", "name": "ANC: 1 and 3 coverage Yearly", - "publicAccess": "rw------", "type": "BAR", "subscribed": false, "displayDescription": "This chart allows us to compare the performance of districts and allows peers to measure their performance against each other. This implies we can spot poor performers as we all as top performers.", @@ -39,9 +38,7 @@ }, "user": { "displayName": "John Traore", - "userCredentials": { - "username": "admin" - } + "username": "admin" }, "dataElementGroupSetDimensions": [], "attributeDimensions": [], @@ -60,7 +57,6 @@ "created": "2018-06-01T14:25:01.086", "name": "DU4EnxBgP3A", "displayName": "DU4EnxBgP3A", - "publicAccess": "rw------", "type": "CHART", "externalAccess": false, "text": "

bla bla test and some smiles \"smiley\"

", @@ -80,9 +76,7 @@ "user": { "id": "xE7jOejl9FI", "displayName": "John Traore", - "userCredentials": { - "username": "admin" - } + "username": "admin" }, "chart": { "id": "UlfTKWZWV4u" @@ -91,9 +85,7 @@ "likedBy": [], "translations": [], "comments": [], - "userGroupAccesses": [], "attributeValues": [], - "userAccesses": [], "mentions": [] }, { @@ -103,7 +95,6 @@ "created": "2018-03-16T11:01:15.076", "name": "HBeV5W36cOx", "displayName": "HBeV5W36cOx", - "publicAccess": "rw------", "type": "CHART", "externalAccess": false, "text": "test interpretation", @@ -123,9 +114,7 @@ "user": { "id": "xE7jOejl9FI", "displayName": "John Traore", - "userCredentials": { - "username": "admin" - } + "username": "admin" }, "chart": { "id": "UlfTKWZWV4u" @@ -134,9 +123,7 @@ "likedBy": [], "translations": [], "comments": [], - "userGroupAccesses": [], - "attributeValues": [], - "userAccesses": [] + "attributeValues": [] }, { "lastUpdated": "2018-10-10T18:20:04.272", @@ -145,7 +132,6 @@ "created": "2018-10-10T18:20:04.272", "name": "Db1s6CsNsca", "displayName": "Db1s6CsNsca", - "publicAccess": "rw------", "type": "CHART", "externalAccess": false, "text": "Bo, Tonkolili and Western Area are the best performers.", @@ -165,9 +151,7 @@ "user": { "id": "GOLswS44mh8", "displayName": "Tom Wakiki", - "userCredentials": { - "username": "system" - } + "username": "system" }, "chart": { "id": "UlfTKWZWV4u" @@ -176,9 +160,7 @@ "likedBy": [], "translations": [], "comments": [], - "userGroupAccesses": [], - "attributeValues": [], - "userAccesses": [] + "attributeValues": [] }, { "lastUpdated": "2018-11-03T11:02:30.780", @@ -187,7 +169,6 @@ "created": "2018-11-03T11:02:30.780", "name": "c5sjWWhIPDE", "displayName": "c5sjWWhIPDE", - "publicAccess": "--------", "type": "CHART", "externalAccess": false, "text": "ANC 1 looks low in Kono! What could be the reason?", @@ -207,9 +188,7 @@ "user": { "id": "GOLswS44mh8", "displayName": "Tom Wakiki", - "userCredentials": { - "username": "system" - } + "username": "system" }, "chart": { "id": "UlfTKWZWV4u" @@ -218,12 +197,9 @@ "likedBy": [], "translations": [], "comments": [], - "userGroupAccesses": [], - "attributeValues": [], - "userAccesses": [] + "attributeValues": [] } ], - "userGroupAccesses": [], "columns": [ { "dimension": "dx", @@ -245,7 +221,6 @@ "categoryDimensions": [], "programIndicatorDimensions": [], "attributeValues": [], - "userAccesses": [], "favorites": [], "dataDimensionItems": [ { diff --git a/src/components/Toolbar/HoverMenuBar/HoverMenuDropdown.js b/src/components/Toolbar/HoverMenuBar/HoverMenuDropdown.js index fbcdf146c..1999647a6 100644 --- a/src/components/Toolbar/HoverMenuBar/HoverMenuDropdown.js +++ b/src/components/Toolbar/HoverMenuBar/HoverMenuDropdown.js @@ -1,5 +1,4 @@ -import { Popper } from '@dhis2-ui/popper' -import { Portal } from '@dhis2-ui/portal' +import { Popper, Portal } from '@dhis2/ui' import cx from 'classnames' import PropTypes from 'prop-types' import React, { useRef } from 'react' diff --git a/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.js b/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.js index b336d7e87..c106742a9 100644 --- a/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.js +++ b/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.js @@ -1,6 +1,4 @@ -import { IconChevronRight24 } from '@dhis2/ui-icons' -import { Popper } from '@dhis2-ui/popper' -import { Portal } from '@dhis2-ui/portal' +import { Popper, Portal, IconChevronRight24 } from '@dhis2/ui' import cx from 'classnames' import PropTypes from 'prop-types' import React, { useRef } from 'react' diff --git a/src/components/Toolbar/UpdateButton.js b/src/components/Toolbar/UpdateButton.js index 5ac678afa..ee3b2c6ef 100644 --- a/src/components/Toolbar/UpdateButton.js +++ b/src/components/Toolbar/UpdateButton.js @@ -1,7 +1,5 @@ import i18n from '@dhis2/d2-i18n' -import { colors } from '@dhis2/ui-constants' -import { IconSync16 } from '@dhis2/ui-icons' -import { CircularLoader } from '@dhis2-ui/loader' +import { CircularLoader, IconSync16, colors } from '@dhis2/ui' import PropTypes from 'prop-types' import React from 'react' import menuButtonStyles from './MenuButton.styles.js'