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

Jump to bottom

fix(dashboard): performance and refactoring #41065

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
+54 −91
Draft

fix(dashboard): performance and refactoring #41065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76859a4
refactor(dashboard): rendering 2 versions of dashboards
ShGKme Oct 23, 2023
405fe6d
perf(dashboard): remove visually-hidden element
ShGKme Oct 23, 2023
6013747
refactor(dashboard): polish styles
ShGKme Oct 23, 2023
da88d22
chore(assets): Recompile assets
ShGKme Oct 24, 2023
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
139 changes: 51 additions & 88 deletions apps/dashboard/src/DashboardApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,21 @@
<Draggable v-model="layout"
class="panels"
v-bind="{swapThreshold: 0.30, delay: 500, delayOnTouchOnly: true, touchStartThreshold: 3}"
handle=".panel--header"
handle=".panel__header"
susnux marked this conversation as resolved.
Show resolved Hide resolved
@end="saveLayout">
<template v-for="panelId in layout">
<div v-if="isApiWidgetV2(panels[panelId].id)"
:key="`${panels[panelId].id}-v2`"
class="panel">
<div class="panel--header">
<h2>
<span :aria-labelledby="`panel-${panels[panelId].id}--header--icon--description`"
aria-hidden="true"
:class="apiWidgets[panels[panelId].id].icon_class"
role="img" />
{{ apiWidgets[panels[panelId].id].title }}
</h2>
<span :id="`panel-${panels[panelId].id}--header--icon--description`" class="hidden-visually">
{{ t('dashboard', '"{title} icon"', { title: apiWidgets[panels[panelId].id].title }) }}
</span>
</div>
<div class="panel--content">
<ApiDashboardWidget :widget="apiWidgets[panels[panelId].id]"
:data="apiWidgetItems[panels[panelId].id]"
:loading="loadingItems" />
</div>
<div v-for="panelId in layout" :key="panels[panelId].id" class="panel">
<h2 class="panel__header">
<span aria-hidden="true" class="panel__header-icon" :class="getWidgetIconClass(panels[panelId])" />
{{ getWidgetTitle(panels[panelId]) }}
</h2>
<div class="panel__content" :class="{ loading: !isApiWidgetV2(panels[panelId].id) && !panels[panelId].mounted }">
<ApiDashboardWidget v-if="isApiWidgetV2(panels[panelId].id)"
:widget="apiWidgets[panels[panelId].id]"
:data="apiWidgetItems[panels[panelId].id]"
:loading="loadingItems" />
<div v-else :ref="panels[panelId].id" :data-id="panels[panelId].id" />
</div>
Comment on lines +17 to 28
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seeing the amount of scoping done here as well as methods used that could be computed, we would benefit from this being a chidren Vue Component directly :)

<ApiDashboardPanel v-for="panelId in layout"
	:key="panels[panelId].id"
	:panel="panels[panelId]" />

<div v-else :key="panels[panelId].id" class="panel">
<div class="panel--header">
<h2>
<span :aria-labelledby="`panel-${panels[panelId].id}--header--icon--description`"
aria-hidden="true"
:class="panels[panelId].iconClass"
role="img" />
{{ panels[panelId].title }}
</h2>
<span :id="`panel-${panels[panelId].id}--header--icon--description`" class="hidden-visually"> {{ t('dashboard', '"{title} icon"', { title: panels[panelId].title }) }} </span>
</div>
<div class="panel--content" :class="{ loading: !panels[panelId].mounted }">
<div :ref="panels[panelId].id" :data-id="panels[panelId].id" />
</div>
</div>
</template>
</div>
</Draggable>

<div class="footer">
Expand Down Expand Up @@ -443,6 +418,7 @@ export default {
this.loadingItems = false
}
},

isApiWidgetV2(id) {
for (const widget of Object.values(this.apiWidgets)) {
if (widget.id === id && widget.item_api_versions.includes(2)) {
Expand All @@ -451,6 +427,14 @@ export default {
}
return false
},

getWidgetIconClass(panel) {
return this.isApiWidgetV2(panel.id) ? this.apiWidgets[panel.id].icon_class : panel.iconClass
},

getWidgetTitle(panel) {
return this.isApiWidgetV2(panel.id) ? this.apiWidgets[panel.id].title : panel.title
},
},
}
</script>
Expand Down Expand Up @@ -484,16 +468,18 @@ export default {
flex-wrap: wrap;
}

.panel, .panels > div {
.panel {
width: 320px;
max-width: 100%;
margin: 16px;
margin: calc(var(--default-grid-baseline) * 4);
align-self: stretch;
background-color: var(--color-main-background-blur);
-webkit-backdrop-filter: var(--filter-background-blur);
backdrop-filter: var(--filter-background-blur);
border-radius: var(--border-radius-rounded);

padding: calc(var(--default-grid-baseline) * 4);

#body-user.theme--highcontrast & {
border: 2px solid var(--color-border);
}
Expand All @@ -502,66 +488,43 @@ export default {
opacity: 0.1;
}

& > .panel--header {
&__header {
display: flex;
z-index: 1;
top: 50px;
padding: 16px;
align-items: flex-end;
margin: 0;
padding: calc(var(--default-grid-baseline) * 4) calc(var(--default-grid-baseline) * 2);
line-height: 24px;
height: 56px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
cursor: grab;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

&, ::v-deep * {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

&:active {
cursor: grabbing;
}

a {
flex-grow: 1;
}

> h2 {
display: block;
align-items: center;
flex-grow: 1;
margin: 0;
font-size: 20px;
line-height: 24px;
font-weight: bold;
padding: 16px 8px;
height: 56px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
cursor: grab;
span {
background-size: 32px;
width: 32px;
height: 32px;
margin-right: 16px;
background-position: center;
float: left;
margin-top: -6px;
}
}
&__header-icon {
background-position: center;
background-size: 32px;
background-repeat: no-repeat;
height: 32px;
width: 32px;
margin-right: 16px;
}

& > .panel--content {
margin: 0 16px 16px 16px;
&__content {
height: 424px;
// We specifically do not want scrollbars inside widgets
overflow: visible;
}

// No need to extend height of widgets if only one column is shown
@media only screen and (max-width: 709px) {
& > .panel--content {
&__content {
height: auto;
}
}
Expand Down
4 changes: 2 additions & 2 deletions dist/dashboard-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dashboard-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading