Skip to content

fix(dashboard-bug): solve dashboard widget field and data table issues #5824

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

Merged
piggggggggy merged 1 commit into from
Apr 29, 2025
Merged

fix(dashboard-bug): solve dashboard widget field and data table issues #5824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 10 additions & 15 deletions apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,26 +99,21 @@ const {
widgetId: computed(() => widgetGenerateState.widgetId),
});

let fieldManager: WidgetFieldValueManager;

const state = reactive({
isPrivate: computed<boolean>(() => !!widgetGenerateState.widgetId?.startsWith('private')),
selectedDataTable: computed<DataTableModel|undefined>(() => dataTableList.value.find((d) => d.data_table_id === widgetGenerateState.selectedDataTableId)),
mounted: false,
fieldManager: computed<WidgetFieldValueManager|undefined>(() => {
const _widgetConfig = getWidgetConfig(widgetGenerateState.selectedWidgetName);

if (
!widgetGenerateState.selectedWidgetName
|| widgetLoading.value
|| !widget.value
|| !state.selectedDataTable
|| !_widgetConfig
) return undefined;

return new WidgetFieldValueManager(
_widgetConfig,
state.selectedDataTable,
cloneDeep(widget.value?.options) || {},
);
if (!fieldManager && widget.value) {
fieldManager = new WidgetFieldValueManager(
state.widgetConfig,
state.selectedDataTable,
cloneDeep(widget.value?.options) || {},
);
}
return fieldManager;
}),
value: computed(() => state.fieldManager?.data?.granularity),
widgetConfig: computed(() => getWidgetConfig(widgetGenerateState.selectedWidgetName)),
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2WidgetForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const state = reactive({
label: d.name,
icon: d.data_type === DATA_TABLE_TYPE.TRANSFORMED ? 'ic_transform-data' : 'ic_service_data-sources',
}))),
selectedDataTableId: computed<string>(() => widgetGenerateState.selectedDataTableId),
selectedDataTableId: computed<string|undefined>(() => widgetGenerateState.selectedDataTableId),
errorModalCurrentType: undefined as 'default'|'geoMap'|undefined,
});

Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/common/modules/widgets/_composables/use-data-table-cascade-update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ export const useDataTableCascadeUpdate = ({ widgetId }: UseDataTableCascadeUpdat
};

const cascadeUpdateDataTable = async (dataTableId: string) => {
const children = _state.dataTableReferenceMap[dataTableId].children;
return children.reduce((chain, childId) => chain.then(async () => {
const children = _state.dataTableReferenceMap[dataTableId]?.children;
return children?.reduce((chain, childId) => chain.then(async () => {
try {
widgetGenerateStore.setDataTableCasCadeUpdateLoadingMap({
...widgetGenerateState.dataTableCasCadeUpdateLoadingMap,
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/common/modules/widgets/_composables/use-widget-data-table-list-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ export const useWidgetDataTableListQuery = ({

/* Query Keys */
const { key: publicDataTableListQueryKey, params: publicDataTableListParams } = useServiceQueryKey('dashboard', 'public-data-table', 'list', {
contextKey: widgetId.value,
contextKey: computed(() => widgetId.value),
params: computed<DataTableListParameters>(() => ({
widget_id: widgetId.value as string,
})),
});
const { key: privateDataTableListQueryKey, params: privateDataTableListParams } = useServiceQueryKey('dashboard', 'private-data-table', 'list', {
contextKey: widgetId.value,
contextKey: computed(() => widgetId.value),
params: computed<DataTableListParameters>(() => ({
widget_id: widgetId.value as string,
})),
Expand Down
Loading