Skip to content

Commit ee45e94

Browse files
PeterYurkovichzhujeopenshift-merge-bot[bot]etmurasakijgbernalp
authored
COO-1532: Merge Dashboards Feature into main (#764)
* feat: ou-888 integrate perses dashbaord editing panels * ou-1023: integrate remotePluginLoader() * OU-1008: Perses Variable Editing Panel * OU-1004: List perses dashbaords * fix: replace consoleFetch with consoleFetchJSON and make code more readable * perses-data-test-ids * fix imports * OU-1158 [List Perses] - Change Namespace is throwing 404 * fix: seperate into DashboardFrame and DashboardListFrame * OU-1172: Remove Datasource from Editing Ribbon * fix: use namespace for permission check * OU1170 Fix Add Variable - Name with more than 75 chars * fix: add static text translation to success message * feat: In dashboard add Patternfly Toast Alerts, remove Perses Snackbar * OU-1177: DashboardListPage Create Button * fix: Add static text translations, use Patternfly Alerts instead of custom, remove <PageSection /> because we are overriding padding * fix: Reduce 'Create' button size in ListDashboardPage * fix: RBAC handling when user has mixed EDITOR and VIEWER access to projects, alignment of 'create' button * fix: fetch dashboard edit permission using useQuery() * fix: add eslint rule for console.warn * feat: OU-1138 DashboardList Actions Delete, Duplicate, Rename Dashboards * fix: OU-1138 Add translations, add new direct dependency "react-hook-form", remove unncessary logic is Action Modals * fix: OU-1138 Update package.json with new dependency * fix: OU-1138 Remove unnecessary logic checks and update package-lock.json * fix: remove optional translation param * feat: update perses dependencies Signed-off-by: Gabriel Bernal <gbernal@redhat.com> --------- Signed-off-by: Gabriel Bernal <gbernal@redhat.com> Co-authored-by: Jenny Zhu <jenny.a.zhu@gmail.com> Co-authored-by: openshift-merge-bot[bot] <148852131+openshift-merge-bot[bot]@users.noreply.github.com> Co-authored-by: Evelyn Tanigawa Murasaki <emurasak@redhat.com> Co-authored-by: Gabriel Bernal <gbernal@redhat.com>
1 parent ea91306 commit ee45e94

41 files changed

Lines changed: 3245 additions & 2213 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.devcontainer/dev.env
22
.DS_Store
3+
.vscode
34
web/cypress/screenshots/
45
web/cypress/export-env.sh
56
web/screenshots/

config/perses-dashboards.patch.json

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"exact": false,
99
"path": ["/multicloud/monitoring/v2/dashboards"],
1010
"component": {
11-
"$codeRef": "DashboardsPage"
11+
"$codeRef": "DashboardListPage"
1212
}
1313
}
1414
}
@@ -36,7 +36,7 @@
3636
"properties": {
3737
"exact": false,
3838
"path": ["/monitoring/v2/dashboards"],
39-
"component": { "$codeRef": "DashboardsPage" }
39+
"component": { "$codeRef": "DashboardListPage" }
4040
}
4141
}
4242
},
@@ -64,7 +64,7 @@
6464
"properties": {
6565
"exact": false,
6666
"path": ["/virt-monitoring/v2/dashboards"],
67-
"component": { "$codeRef": "DashboardsPage" }
67+
"component": { "$codeRef": "DashboardListPage" }
6868
}
6969
}
7070
},
@@ -83,5 +83,41 @@
8383
"insertAfter": "dashboards-virt"
8484
}
8585
}
86+
},
87+
{
88+
"op": "add",
89+
"path": "/extensions/1",
90+
"value": {
91+
"type": "console.page/route",
92+
"properties": {
93+
"exact": false,
94+
"path": ["/monitoring/v2/dashboards/view"],
95+
"component": { "$codeRef": "DashboardPage" }
96+
}
97+
}
98+
},
99+
{
100+
"op": "add",
101+
"path": "/extensions/1",
102+
"value": {
103+
"type": "console.page/route",
104+
"properties": {
105+
"exact": false,
106+
"path": ["/virt-monitoring/v2/dashboards/view"],
107+
"component": { "$codeRef": "DashboardPage" }
108+
}
109+
}
110+
},
111+
{
112+
"op": "add",
113+
"path": "/extensions/1",
114+
"value": {
115+
"type": "console.page/route",
116+
"properties": {
117+
"exact": false,
118+
"path": ["/multicloud/monitoring/v2/dashboards/view"],
119+
"component": { "$codeRef": "DashboardPage" }
120+
}
121+
}
86122
}
87123
]

0 commit comments

Comments
 (0)