RN-613: Export Selected Dashboard Only #4130

chris-pollard · 2022-08-30T12:13:41Z

Issue RN-613:

Changes:

Preview and export content only for selected dashboard.
Display alert for dashboards that are not exportable.

biaoli0

Thanks for some clean up and making the changes to export one dashboard only! It makes everything easier.

Just one request on whether we could remove passing in previewDashboards, previewDashboardValue.

biaoli0 · 2022-08-31T08:10:41Z

packages/lesmis/src/views/ExportView.js

+  const exportableDashboards =
+    viewType === DASHBOARD_EXPORT_PREVIEW
+      ? previewDashboards
+      : getExportableDashboardsForDownloadView(exportViewProps.exportOptions.dashboard);


Can we get dashboardValue directly from URL, then no need to pass in previewDashboards and previewDashboardValue? If so it helps code reading.

previewDashboards should be the same as exportableDashboards? It can be retrieved by getExportableDashboardsForDownloadView().

Yes, great idea. Have reduced the props now.

biaoli0 · 2022-08-31T08:11:25Z

packages/lesmis/src/views/DashboardView.js

@@ -38,8 +38,7 @@ export const DashboardView = React.memo(({ isOpen, setIsOpen }) => {
  const [selectedYear, setSelectedYear] = useUrlSearchParam('year', DEFAULT_DATA_YEAR);

  const { dropdownOptions, selectedOption } = useDashboardDropdownOptions();
-  const profileDropDownOptions = dropdownOptions.filter(({ exportToPDF }) => exportToPDF);
-  const { exportableDashboards, totalPage } = getExportableDashboards(profileDropDownOptions);
+  const { exportableDashboards, totalPage } = getExportableDashboards([selectedOption]);


Thanks for the clean up 🙏

Can we have a small change on getExportableDashboards([selectedOption]) -> getExportableDashboards(selectedOption)?

We do not need to export from multiple dashboards anymore, it would be worth it to clean up here.

@billli0 I've refactored this code.

biaoli0 · 2022-08-31T08:11:42Z

packages/lesmis/src/utils/export/useDashboardItemsExportToPDF.js

@@ -10,7 +10,7 @@ import { stringifyQuery } from '@tupaia/utils';
 import { post } from '../../api';

 export const useDashboardItemsExportToPDF = options => {
-  const { locale, entityCode, ...restOfoptions } = options;
+  const { locale, entityCode, ...restOfOptions } = options;


biaoli0 · 2022-09-02T02:52:33Z

packages/lesmis/src/utils/getIsExportable.js

+  const dropdownOptions = [
+    {
+      value: 'profile',
+      exportToPDF: true,
+    },
+    {
+      value: 'indicators',
+      exportToPDF: true,
+    },
+    {
+      value: 'ESSDP_Plan',
+    },
+    ...SUB_DASHBOARD_OPTIONS.map(dashboard => ({
+      value: dashboard.code,
+
+      exportToPDF: dashboard.exportToPDF,
+    })),
+  ];
+
+  const selectedOption =
+    selectedDashboard && dropdownOptions.find(option => option.value === selectedDashboard);


We can directly get selectedOption from useDashboardDropdownOptions().

biaoli0 · 2022-09-02T03:00:51Z

packages/lesmis/src/views/ExportView.js

@@ -90,15 +93,18 @@ const getChildren = ({
 export const ExportView = ({ viewProps, viewType, className }) => {
  const { getExtraExportViewProps, PageContainer, PageContent } = EXPORT_VIEWS[viewType];
  const exportViewProps = { ...viewProps, ...getExtraExportViewProps() };
-
+  const { selectedDashboard } = exportViewProps;
  const { dropdownOptions } = useDashboardDropdownOptions();


Suggested change

const { dropdownOptions } = useDashboardDropdownOptions();

const { selectedOption } = useDashboardDropdownOptions();

We can get the selectedOption here, no need to find the selected dashboard below.

biaoli0 · 2022-09-02T03:08:05Z

packages/lesmis/src/utils/getExportableSubDashboards.js

+    includeDrillDowns: false,
+  });
+
+  if (dropdownOption.exportToPDF === undefined || !dropdownOption.exportToPDF) {


Suggested change

if (dropdownOption.exportToPDF === undefined || !dropdownOption.exportToPDF) {

if (!dropdownOption.exportToPDF) {

biaoli0 · 2022-09-02T03:24:43Z

packages/lesmis/src/views/ExportView.js

+          viewType === DASHBOARD_EXPORT_PREVIEW
+            ? selectedDashboard === 'profile' && index === 0


Suggested change

viewType === DASHBOARD_EXPORT_PREVIEW

? selectedDashboard === 'profile' && index === 0

selectedDashboard === 'profile' && index === 0

We should show the entity profile in preview and export view?

biaoli0

Thanks @chris-pollard for doing some clean up. I have a few more requests on refactoring the code 🙏, but overall looks good!

biaoli0 · 2022-09-05T04:46:16Z

packages/lesmis/src/utils/useDashboardDropdownOptions.js

+    if (value === 'indicators') {
+      return () => false;
+    }
+    const filter =
+      value === 'profile'
+        ? ({ dashboardCode }) =>
+            !Object.values(SUB_DASHBOARD_OPTIONS).some(({ code }) =>
+              dashboardCode.startsWith(`LESMIS_${code}`),
+            )
+        : ({ dashboardCode }) => dashboardCode.startsWith(`LESMIS_${value}`);
+    return filter;


Can we use a switch here?

biaoli0

Looks great! Thanks for refactoring SUB_DASHBOARD_OPTIONS along the PR, super helpful. Just a minor request, can approve in advance.

chris-pollard added 2 commits August 29, 2022 08:20

Fix camel case

eb1eb99

Export current dashboard only

f092a52

biaoli0 suggested changes Aug 31, 2022

View reviewed changes

chris-pollard added 2 commits August 31, 2022 11:54

Disable export button, add tooltip, clean up

6a9abc0

Refactor getExportableDashboards

37b8e14

chris-pollard requested a review from biaoli0 August 31, 2022 13:09

biaoli0 reviewed Sep 2, 2022

View reviewed changes

biaoli0 suggested changes Sep 2, 2022

View reviewed changes

chris-pollard added 2 commits September 4, 2022 22:36

Refactor useDashboardDropdownOptions

9149ced

Merge branch 'dev' into rn-613-pdf-current-db-group-only

fd6dad5

chris-pollard requested a review from biaoli0 September 4, 2022 20:37

biaoli0 reviewed Sep 5, 2022

View reviewed changes

biaoli0 approved these changes Sep 5, 2022

View reviewed changes

chris-pollard added 4 commits September 5, 2022 13:25

Merge branch 'dev' into rn-613-pdf-current-db-group-only

0dcdbd6

update with switch statement

ed39e57

Merge branch 'dev' into rn-613-pdf-current-db-group-only

0de2d18

Fix undefined filename, clean up

da02e75

biaoli0 mentioned this pull request Sep 7, 2022

RN-506 part 2 #4150

Merged

chris-pollard merged commit fac0f48 into dev Sep 8, 2022

chris-pollard deleted the rn-613-pdf-current-db-group-only branch September 8, 2022 06:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RN-613: Export Selected Dashboard Only #4130

RN-613: Export Selected Dashboard Only #4130

chris-pollard commented Aug 30, 2022

biaoli0 left a comment

biaoli0 Aug 31, 2022

chris-pollard Aug 31, 2022

biaoli0 Aug 31, 2022 •

edited

Loading

chris-pollard Aug 31, 2022

biaoli0 Aug 31, 2022

biaoli0 Sep 2, 2022

biaoli0 Sep 2, 2022

biaoli0 Sep 2, 2022

biaoli0 Sep 2, 2022

biaoli0 left a comment

biaoli0 Sep 5, 2022

biaoli0 left a comment

	const { dropdownOptions } = useDashboardDropdownOptions();
	const { selectedOption } = useDashboardDropdownOptions();

	if (dropdownOption.exportToPDF === undefined \|\| !dropdownOption.exportToPDF) {
	if (!dropdownOption.exportToPDF) {

		viewType === DASHBOARD_EXPORT_PREVIEW
		? selectedDashboard === 'profile' && index === 0

	viewType === DASHBOARD_EXPORT_PREVIEW
	? selectedDashboard === 'profile' && index === 0
	selectedDashboard === 'profile' && index === 0

RN-613: Export Selected Dashboard Only #4130

RN-613: Export Selected Dashboard Only #4130

Conversation

chris-pollard commented Aug 30, 2022

Issue RN-613:

Changes:

biaoli0 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

biaoli0 Aug 31, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

biaoli0 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

biaoli0 left a comment

Choose a reason for hiding this comment

biaoli0 Aug 31, 2022 •

edited

Loading