Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
8 changes: 1 addition & 7 deletions web/server/vue-cli/src/components/Layout/TheHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@
:key="item.name"
:to="{
name: item.route,
params: $route.params.endpoint ?
{ endpoint: $route.params.endpoint } : {},
query: queries[item.query_namespace] === undefined
? item.query || {}
: queries[item.query_namespace]
Expand Down Expand Up @@ -94,11 +92,7 @@
<v-list-item
v-for="item in configureMenuItems"
:key="item.title"
:to="{
name: item.route,
params: $route.params.endpoint ?
{ endpoint: $route.params.endpoint } : {}
}"
:to="{ name: item.route }"
exact
>
<template v-slot:prepend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
:limit="baseSelectOptionFilter.defaultLimit.value"
:panel="baseSelectOptionFilter.panel.value"
@clear="baseSelectOptionFilter.clear(true)"
@input="setSelectedItems"
@input="baseSelectOptionFilter.setSelectedItems"
>
<template v-slot:icon>
<v-icon color="grey">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ defineProps({
label: { type: String, required: true },
helpMessage: { type: String, default: null },
bus: { type: Object, required: true },
value: { type: Array, required: true },
value: { type: [ Array, Number, Object ], default: null },

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

What was the reason setting it to accept arrays, numbers and objects? In the code this component is used 2 times and on both occasions it is getting a number so theoretically only numbers should be expected. Or did I miss something?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Added it because of the Expected Array, got Object/Number/Null warning, but fixed the actual cause instead, getNumberOfFailedFiles() wasn't calling .toNumber(). value is just Number now.

loading: { type: Boolean, default: false }
});

Expand Down
1 change: 1 addition & 0 deletions web/server/vue-cli/src/views/RunList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ import {
RunSortType
} from "@cc/report-server-types";

import AnalysisInfoDialog from "@/components/AnalysisInfoDialog";

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This dialog was moved to the RunNameColumn itself where it gets activated. Because of this modification, the dialog can be removed from RunList entirely.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Removed it from RunList.vue entirely. Also cleaned up the unused openAnalysisInfoDialog prop in RunNameColumn.vue and ExpandedRun.vue.

import {
AnalyzerStatisticsBtn,
AnalyzerStatisticsDialog,
Expand Down
42 changes: 23 additions & 19 deletions web/server/vue-cli/src/views/Statistics.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@
size="20"
:style="{ 'min-width': '300px' }"
>
<ReportFilter
v-fill-height
:namespace="namespace"
:show-remove-filtered-reports="false"
:report-count="reportCount"
:show-diff-type="false"
:show-compare-to="showCompareTo"
:refresh-filter="refreshFilterState"
@refresh="refresh"
@set-refresh-filter-state="setRefreshFilterState"
/>
<div v-fill-height>
<ReportFilter
:namespace="namespace"
:show-remove-filtered-reports="false"
:report-count="reportCount"
:show-diff-type="false"
:show-compare-to="showCompareTo"
:refresh-filter="refreshFilterState"
@refresh="refresh"
@set-refresh-filter-state="setRefreshFilterState"
/>
</div>
</pane>
<pane>
<div v-fill-height>
Expand All @@ -39,14 +40,17 @@
</v-tab>
</v-tabs>

<keep-alive>
<router-view
:key="$route.name"
:bus="bus"
:namespace="namespace"
@refresh-filter="setRefreshFilterState(true)"
/>
</keep-alive>
<router-view v-slot="{ Component }">
<keep-alive>
<component
:is="Component"
:key="$route.name"
:bus="bus"
:namespace="namespace"
@refresh-filter="setRefreshFilterState(true)"
/>
</keep-alive>
</router-view>
</div>
</pane>
</splitpanes>
Expand Down
Loading