diff --git a/src/qqq/components/forms/EntityForm.tsx b/src/qqq/components/forms/EntityForm.tsx index 7f5cbe9..de8ee63 100644 --- a/src/qqq/components/forms/EntityForm.tsx +++ b/src/qqq/components/forms/EntityForm.tsx @@ -44,9 +44,9 @@ import MDTypography from "qqq/components/legacy/MDTypography"; import HelpContent from "qqq/components/misc/HelpContent"; import QRecordSidebar from "qqq/components/misc/RecordSidebar"; import DynamicFormWidget from "qqq/components/widgets/misc/DynamicFormWidget"; +import FilterAndColumnsSetupWidget from "qqq/components/widgets/misc/FilterAndColumnsSetupWidget"; import PivotTableSetupWidget from "qqq/components/widgets/misc/PivotTableSetupWidget"; import RecordGridWidget, {ChildRecordListData} from "qqq/components/widgets/misc/RecordGridWidget"; -import ReportSetupWidget from "qqq/components/widgets/misc/ReportSetupWidget"; import {FieldRule, FieldRuleAction, FieldRuleTrigger} from "qqq/models/fields/FieldRules"; import HtmlUtils from "qqq/utils/HtmlUtils"; import Client from "qqq/utils/qqq/Client"; @@ -390,7 +390,7 @@ function EntityForm(props: Props): JSX.Element />; } - if (widgetMetaData.type == "reportSetup") + if (widgetMetaData.type == "filterAndColumnsSetup") { ///////////////////////////////////////////////////////////////////////////////////////////////////////// // if the widget metadata specifies a table name, set form values to that so widget knows which to use // @@ -401,7 +401,7 @@ function EntityForm(props: Props): JSX.Element formValues["tableName"] = widgetMetaData?.defaultValues.get("tableName"); } - return - but that component has different usages - // - // e.g., the full-fledged query screen, but also, within other screens (e.g., a modal // - // under the ReportSetupWidget). So, there are some behaviors we only want when we're // - // on the full-fledged query screen, such as changing the URL with saved view ids. // - ///////////////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////////////////////////////////// + // this component is used by - but that component has different usages - // + // e.g., the full-fledged query screen, but also, within other screens (e.g., a modal // + // under the FilterAndColumnsSetupWidget). So, there are some behaviors we only want when // + // we're on the full-fledged query screen, such as changing the URL with saved view ids. // + ///////////////////////////////////////////////////////////////////////////////////////////// const isQueryScreen = queryScreenUsage == "queryScreen"; const openSavedViewsMenu = (event: any) => setSavedViewsMenu(event.currentTarget); diff --git a/src/qqq/components/widgets/DashboardWidgets.tsx b/src/qqq/components/widgets/DashboardWidgets.tsx index ee57e83..edcf070 100644 --- a/src/qqq/components/widgets/DashboardWidgets.tsx +++ b/src/qqq/components/widgets/DashboardWidgets.tsx @@ -40,10 +40,10 @@ import DataBagViewer from "qqq/components/widgets/misc/DataBagViewer"; import DividerWidget from "qqq/components/widgets/misc/Divider"; import DynamicFormWidget from "qqq/components/widgets/misc/DynamicFormWidget"; import FieldValueListWidget from "qqq/components/widgets/misc/FieldValueListWidget"; +import FilterAndColumnsSetupWidget from "qqq/components/widgets/misc/FilterAndColumnsSetupWidget"; import PivotTableSetupWidget from "qqq/components/widgets/misc/PivotTableSetupWidget"; import QuickSightChart from "qqq/components/widgets/misc/QuickSightChart"; import RecordGridWidget from "qqq/components/widgets/misc/RecordGridWidget"; -import ReportSetupWidget from "qqq/components/widgets/misc/ReportSetupWidget"; import ScriptViewer from "qqq/components/widgets/misc/ScriptViewer"; import StepperCard from "qqq/components/widgets/misc/StepperCard"; import USMapWidget from "qqq/components/widgets/misc/USMapWidget"; @@ -598,9 +598,9 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, reco ) } { - widgetMetaData.type === "reportSetup" && ( + widgetMetaData.type === "filterAndColumnsSetup" && ( widgetData && widgetData[i] && widgetData[i].queryParams && - + { }} /> ) diff --git a/src/qqq/components/widgets/misc/ReportSetupWidget.tsx b/src/qqq/components/widgets/misc/FilterAndColumnsSetupWidget.tsx similarity index 98% rename from src/qqq/components/widgets/misc/ReportSetupWidget.tsx rename to src/qqq/components/widgets/misc/FilterAndColumnsSetupWidget.tsx index 2baa811..eb15c5e 100644 --- a/src/qqq/components/widgets/misc/ReportSetupWidget.tsx +++ b/src/qqq/components/widgets/misc/FilterAndColumnsSetupWidget.tsx @@ -45,7 +45,7 @@ import Client from "qqq/utils/qqq/Client"; import FilterUtils from "qqq/utils/qqq/FilterUtils"; import React, {useContext, useEffect, useRef, useState} from "react"; -interface ReportSetupWidgetProps +interface FilterAndColumnsSetupWidgetProps { isEditable: boolean; widgetMetaData: QWidgetMetaData; @@ -53,7 +53,7 @@ interface ReportSetupWidgetProps onSaveCallback?: (values: { [name: string]: any }) => void; } -ReportSetupWidget.defaultProps = { +FilterAndColumnsSetupWidget.defaultProps = { onSaveCallback: null }; @@ -83,7 +83,7 @@ const qController = Client.getInstance(); /******************************************************************************* ** Component for editing the main setup of a report - that is: filter & columns *******************************************************************************/ -export default function ReportSetupWidget({isEditable, widgetMetaData, recordValues, onSaveCallback}: ReportSetupWidgetProps): JSX.Element +export default function FilterAndColumnsSetupWidget({isEditable, widgetMetaData, recordValues, onSaveCallback}: FilterAndColumnsSetupWidgetProps): JSX.Element { const [modalOpen, setModalOpen] = useState(false); const [hideColumns, setHideColumns] = useState(widgetMetaData?.defaultValues?.has("hideColumns") && widgetMetaData?.defaultValues?.get("hideColumns")); diff --git a/src/qqq/components/widgets/misc/PivotTableSetupWidget.tsx b/src/qqq/components/widgets/misc/PivotTableSetupWidget.tsx index 9c22a98..ebfc4bb 100644 --- a/src/qqq/components/widgets/misc/PivotTableSetupWidget.tsx +++ b/src/qqq/components/widgets/misc/PivotTableSetupWidget.tsx @@ -39,9 +39,9 @@ import colors from "qqq/assets/theme/base/colors"; import {QCancelButton, QSaveButton} from "qqq/components/buttons/DefaultButtons"; import FieldAutoComplete from "qqq/components/misc/FieldAutoComplete"; import HelpContent, {hasHelpContent} from "qqq/components/misc/HelpContent"; +import {buttonSX, unborderedButtonSX} from "qqq/components/widgets/misc/FilterAndColumnsSetupWidget"; import {PivotTableGroupByElement} from "qqq/components/widgets/misc/PivotTableGroupByElement"; import {PivotTableValueElement} from "qqq/components/widgets/misc/PivotTableValueElement"; -import {buttonSX, unborderedButtonSX} from "qqq/components/widgets/misc/ReportSetupWidget"; import Widget, {HeaderToggleComponent} from "qqq/components/widgets/Widget"; import {PivotObjectKey, PivotTableDefinition, PivotTableFunction, pivotTableFunctionLabels, PivotTableGroupBy, PivotTableValue} from "qqq/models/misc/PivotTableDefinitionModels"; import QQueryColumns from "qqq/models/query/QQueryColumns"; diff --git a/src/test/resources/fixtures/metaData/index.json b/src/test/resources/fixtures/metaData/index.json index 401fcda..54cd334 100644 --- a/src/test/resources/fixtures/metaData/index.json +++ b/src/test/resources/fixtures/metaData/index.json @@ -822,7 +822,7 @@ "reportSetupWidget": { "name": "reportSetupWidget", "label": "Filters and Columns", - "type": "reportSetup", + "type": "filterAndColumnsSetup", "isCard": true, "storeDropdownSelections": false, "showReloadButton": true,