Skip to content

Commit

Permalink
changes key of its name
Browse files Browse the repository at this point in the history
  • Loading branch information
ktx-vaidehi committed May 17, 2024
1 parent 703d851 commit 83aeefd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion web/src/components/dashboards/AddDashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export default defineComponent({
list: [],
showDynamicFilters: true,
},
dateTime: {
defaultDatetimeDuration: {
startTime: null,
endTime: null,
relativeTimePeriod: "15m",
Expand Down
12 changes: 6 additions & 6 deletions web/src/components/dashboards/settings/GeneralSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export default defineComponent({
title: "",
description: "",
showDynamicFilters: true,
dateTime: {
defaultDatetimeDuration: {
startTime: null,
endTime: null,
relativeTimePeriod: "15m",
Expand All @@ -140,10 +140,10 @@ export default defineComponent({
data.variables?.showDynamicFilters ?? false;
dateTimeValue.value = {
startTime: data?.dateTime?.startTime,
endTime: data?.dateTime?.endTime,
relativeTimePeriod: data?.dateTime?.relativeTimePeriod,
valueType: data?.dateTime?.type,
startTime: data?.defaultDatetimeDuration?.startTime,
endTime: data?.defaultDatetimeDuration?.endTime,
relativeTimePeriod: data?.defaultDatetimeDuration?.relativeTimePeriod,
valueType: data?.defaultDatetimeDuration?.type,
};
};
onMounted(async () => {
Expand Down Expand Up @@ -176,7 +176,7 @@ export default defineComponent({
data.variables.showDynamicFilters = dashboardData.showDynamicFilters;
}
data.dateTime = {
data.defaultDatetimeDuration = {
startTime: dateTimeValue?.value?.startTime,
endTime: dateTimeValue?.value?.endTime,
relativeTimePeriod: dateTimeValue?.value?.relativeTimePeriod,
Expand Down
8 changes: 4 additions & 4 deletions web/src/views/Dashboards/ViewDashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -400,20 +400,20 @@ export default defineComponent({

// if dashboard has relative time settings
if (
(currentDashboardData.data?.dateTime?.type ?? "relative") ===
(currentDashboardData.data?.defaultDatetimeDuration?.type ?? "relative") ===
"relative"
) {
selectedDate.value = {
valueType: "relative",
relativeTimePeriod:
currentDashboardData.data?.dateTime?.relativeTimePeriod ?? "15m",
currentDashboardData.data?.defaultDatetimeDuration?.relativeTimePeriod ?? "15m",
};
} else {
// else, dashboard will have absolute time settings
selectedDate.value = {
valueType: "absolute",
startTime: currentDashboardData.data?.dateTime?.startTime,
endTime: currentDashboardData.data?.dateTime?.endTime,
startTime: currentDashboardData.data?.defaultDatetimeDuration?.startTime,
endTime: currentDashboardData.data?.defaultDatetimeDuration?.endTime,
};
}
} else {
Expand Down
8 changes: 4 additions & 4 deletions web/src/views/Dashboards/addPanel/AddPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -503,17 +503,17 @@ export default defineComponent({
// get default time for dashboard
// if dashboard has relative time settings
if ((data?.dateTime?.type ?? "relative") === "relative") {
if ((data?.defaultDatetimeDuration?.type ?? "relative") === "relative") {
selectedDate.value = {
valueType: "relative",
relativeTimePeriod: data?.dateTime?.relativeTimePeriod ?? "15m",
relativeTimePeriod: data?.defaultDatetimeDuration?.relativeTimePeriod ?? "15m",
};
} else {
// else, dashboard will have absolute time settings
selectedDate.value = {
valueType: "absolute",
startTime: data?.dateTime?.startTime,
endTime: data?.dateTime?.endTime,
startTime: data?.defaultDatetimeDuration?.startTime,
endTime: data?.defaultDatetimeDuration?.endTime,
};
}
};
Expand Down

0 comments on commit 83aeefd

Please sign in to comment.