Add settings section to configure dataSet by eperedo · Pull Request #5 · EyeSeeTea/data-approval-dev

eperedo · 2025-12-08T20:19:12Z

📌 References

Issue: Closes https://app.clickup.com/t/869bd706j

📝 Implementation

Add new DataSet configuration page (list, create, edit and delete dataSet Configurations)
Only show dataSets configured according current user (super admin has access to everything)
Restrict actions to users and userGroups configured per dataSet
Apply custom logic to submit and complete/revoke and incomplete a dataSet
Update org. unit selector to avoid showing org. units that are not assigned to the dataSet selected.

📹 Screenshots/Screen capture

List dataSet configurations

Create/Edit dataSet configuration Form

Delete a dataSet configuration

🔥 Notes to the tester

I've created the configuration for NHWA dataSet (attached metadata and dataStore files on issue)
Configuration will be saved in dataStore under the key dataset-approval

#869bd706j

…feature/generic-config-CU-869bd706j

…aSets

Copilot

Pull request overview

This pull request adds a comprehensive DataSet configuration system that allows administrators to manage dataset approval workflows through a UI. The implementation replaces hardcoded configuration files with a dynamic dataStore-based solution.

Key changes:

Introduces DataSet configuration management (CRUD operations) accessible only to super admins
Implements granular permission system for dataset actions (read, complete, incomplete, revoke, submit, approve) based on users and user groups
Adds custom workflow logic for submit/complete and revoke/incomplete actions
Migrates from static configuration files to dynamic dataStore-based configuration

Reviewed changes

Copilot reviewed 71 out of 73 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
yarn.lock, package.json	Updates react-router-dom to 6.30.2, adds real-cancellable-promise and typed-immutable-map dependencies
src/domain/entities/DataSetConfiguration.ts	New entity representing dataset configuration with validation and permission checking logic
src/domain/usecases/GetApprovalConfigurationsUseCase.ts	Use case to retrieve dataset configurations with permissions for current user
src/data/DataSetConfigurationD2Repository.ts	Repository implementation for storing/retrieving configurations from dataStore
src/webapp/pages/*.tsx	New pages for managing dataset configurations (list, add, edit)
src/webapp/components/dataset-config/*.tsx	UI components for dataset configuration table and form
src/data/common/Dhis2ConfigRepository.ts	Removes hardcoded approval settings, simplifies configuration loading
src/domain/reports/mal-data-approval/usecases/*.ts	Updates use cases to use dynamic configurations instead of static settings
src/data/reports/mal-data-approval/MalDataApprovalDefaultRepository.ts	Refactors to use dataSet configurations for approval operations
src/webapp/reports/Reports.tsx	Adds routing for dataset settings pages with loader pattern

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-12-18T01:43:51Z

src/data/UserD2Repository.ts

+        return new User({
+            id: d2User.id,
+            name: d2User.displayName,
+            userGroups: d2User.userGroups,
+            ...d2User.userCredentials,
+            isSuperAdmin: true,


The hard-coded value 'true' should be replaced with a proper check for whether the user is a super admin. Currently, all users will be marked as super admin.

Suggested change

return new User({

id: d2User.id,

name: d2User.displayName,

userGroups: d2User.userGroups,

...d2User.userCredentials,

isSuperAdmin: true,

const isSuperAdmin =

!!d2User.userCredentials &&

Array.isArray(d2User.userCredentials.userRoles) &&

d2User.userCredentials.userRoles.some(

role => Array.isArray(role.authorities) && role.authorities.includes("ALL")

);

return new User({

id: d2User.id,

name: d2User.displayName,

userGroups: d2User.userGroups,

...d2User.userCredentials,

isSuperAdmin,

Copilot · 2025-12-18T01:43:52Z

src/data/common/Dhis2ConfigRepository.ts

                    organisationUnits: { id: true },
                },
-                filter: { code: { in: dataSetCodes } },
+                filter: { code: { in: [] } },


The filter with an empty array filter: { code: { in: [] } } will always return no results. This appears to be a placeholder that should either use the malDataSetCodes or be removed if dataSets are now configured differently.

Suggested change

filter: { code: { in: [] } },

filter: { code: { in: malDataSetCodes } },

Copilot · 2025-12-18T01:43:52Z

src/data/reports/mal-data-approval/MalDataApprovalDefaultRepository.ts

+        // const settings = await this.getSettingByDataSet([originalDataSetId]);
+        // const dataSetSettings = settings.find(setting => setting.dataSetId === originalDataSetId);
+        // if (!dataSetSettings) throw new Error(`Data set settings not found: ${originalDataSetId}`);


The commented-out code should be removed rather than left in the codebase. If this logic is no longer needed, it should be deleted to improve code cleanliness.

Suggested change

// const settings = await this.getSettingByDataSet([originalDataSetId]);

// const dataSetSettings = settings.find(setting => setting.dataSetId === originalDataSetId);

// if (!dataSetSettings) throw new Error(`Data set settings not found: ${originalDataSetId}`);

Copilot · 2025-12-18T01:43:52Z

src/data/reports/mal-data-approval/MalDataApprovalDefaultRepository.ts

+    ): Promise<boolean> {
        try {
-            const { approvalDataSetId, dataSetId } = await this.getApprovalDataSetId(dataValues);
+            // const { approvalDataSetId } = await this.getApprovalDataSetId(dataValues);


The commented-out code should be removed rather than left in the codebase. This appears to be old logic that has been replaced.

Suggested change

// const { approvalDataSetId } = await this.getApprovalDataSetId(dataValues);

Copilot · 2025-12-18T01:43:53Z

src/scripts/check-data-differences.ts

 import { promiseMap } from "../utils/promises";
-import { WmrDiffReport } from "../domain/reports/WmrDiffReport";
-import { AppSettingsD2Repository } from "../data/AppSettingsD2Repository";
+import { dataSetApprovalName, WmrDiffReport } from "../domain/reports/WmrDiffReport";


Unused import dataSetApprovalName.

…ions

eperedo added 5 commits December 7, 2025 23:53

add page for dataSet settings configuration

14c14d9

show dataset configuration for current user and apply action permissions

aae40ef

apply logic to complete/incomplete dataSets according their settings

559019a

add action to delete a existing dataSet config

7ecacae

remove monitoring action

3af2868

eperedo requested a review from Ramon-Jimenez December 8, 2025 20:19

eperedo added 3 commits December 8, 2025 15:58

update locales

dc55d62

Merge branch 'master' of github.com:EyeSeeTea/data-approval-dev into …

62d7a9a

…feature/generic-config-CU-869bd706j

remove hardcode level for org. units. Load org. units assigned to dat…

c28dc4e

…aSets

eperedo marked this pull request as ready for review December 18, 2025 01:40

Copilot AI review requested due to automatic review settings December 18, 2025 01:40

Copilot started reviewing on behalf of eperedo December 18, 2025 01:41 View session

Copilot AI reviewed Dec 18, 2025

View reviewed changes

eperedo added 12 commits December 17, 2025 21:47

show error message if user does not have access to dataSet configurat…

77df800

…ions

add support for dataSets with different period types

2f6dd44

remove unnecessary files not related to approval report

dde6575

remove hardcode reference to default category combination

8a90ce4

add script to generate sqlviews

d1379cf

add ability to generate sqlviews and save configuration into dataStore

a5312bc

reorder permissions

1ae0f16

add script to generate dataSet approvals

ccd5871

generate metadata and response errors to disk

f240dbe

trucante shortName and code for dataElements

94159ef

update original dataElements if name length is greater than 225

4014d08

update name to Data Approval Extended

27707ba

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add settings section to configure dataSet#5

Add settings section to configure dataSet#5
eperedo wants to merge 20 commits intomasterfrom
feature/generic-config-CU-869bd706j

eperedo commented Dec 8, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Dec 18, 2025

Uh oh!

Copilot AI Dec 18, 2025

Uh oh!

Copilot AI Dec 18, 2025

Uh oh!

Copilot AI Dec 18, 2025

Uh oh!

Copilot AI Dec 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	filter: { code: { in: [] } },
	filter: { code: { in: malDataSetCodes } },

	// const settings = await this.getSettingByDataSet([originalDataSetId]);
	// const dataSetSettings = settings.find(setting => setting.dataSetId === originalDataSetId);
	// if (!dataSetSettings) throw new Error(`Data set settings not found: ${originalDataSetId}`);

Conversation

eperedo commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📌 References

📝 Implementation

📹 Screenshots/Screen capture

🔥 Notes to the tester

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

eperedo commented Dec 8, 2025 •

edited

Loading