Skip to content
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

added a filter to monitor or unmonitor deppending of the actual status #69

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

added a filter to monitor or unmonitor deppending of the actual status #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55c5244
added a filter to monitor or unmonitor deppending of the actual status
idelcano Nov 18, 2022
833ef18
add undefined if workflowid is empty and fix notification button
idelcano Nov 23, 2022
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
21 changes: 16 additions & 5 deletions src/data/reports/mal-data-approval/MalDataApprovalDefaultRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ type SqlField =
| "lastupdatedvalue"
| "lastdateofsubmission"
| "lastdateofapproval"
| "diff";
| "diff"
| "notificationActive";

const fieldMapping: Record<keyof MalDataApprovalItem, SqlField> = {
dataSetUid: "datasetuid",
Expand All @@ -153,6 +154,7 @@ const fieldMapping: Record<keyof MalDataApprovalItem, SqlField> = {
lastDateOfSubmission: "lastdateofsubmission",
lastDateOfApproval: "lastdateofapproval",
modificationCount: "diff",
notificationActive: "notificationActive",
};

export class MalDataApprovalDefaultRepository implements MalDataApprovalRepository {
Expand Down Expand Up @@ -231,7 +233,11 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
paging_to_download
)
.getData();

const monitoring:Monitoring[]|void =
await this.getMonitoring(Namespaces.MONITORING)

const monitoringlist = monitoring?? []
const { rows } = await sqlViews
.query<Variables, SqlField>(
getSqlViewId(config, SQL_VIEW_DATA_DUPLICATION_NAME),
Expand All @@ -248,8 +254,7 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
paging_to_download
)
.getData();

return mergeHeadersAndData(options, periods, headerRows, rows);
return mergeHeadersAndData(options, periods, headerRows, rows, monitoringlist);
// A data value is not associated to a specific data set, but we can still map it
// through the data element (1 data value -> 1 data element -> N data sets).
}
Expand Down Expand Up @@ -741,7 +746,8 @@ function mergeHeadersAndData(
options: MalDataApprovalOptions,
selectablePeriods: string[],
headers: SqlViewGetData<SqlFieldHeaders>["rows"],
data: SqlViewGetData<SqlField>["rows"]
data: SqlViewGetData<SqlField>["rows"],
monitoring: Monitoring[]
) {
const { sorting, paging, orgUnitIds, periods, approvalStatus, completionStatus } = options; // ?
const activePeriods = periods.length > 0 ? periods : selectablePeriods;
Expand All @@ -756,7 +762,11 @@ function mergeHeadersAndData(
const filterOrgUnitIds = orgUnitIds.length > 0 ? orgUnitIds : undefined;

for (const period of activePeriods) {
for (const header of headers) {
for (const header of headers) {
const hasMonitoring = monitoring.filter((monitor) => {
return monitor.orgUnit === header.orgunituid && monitor.period === period;
})[0];

if (filterOrgUnitIds !== undefined && filterOrgUnitIds.indexOf(header.orgunituid) === -1) {
continue;
}
Expand All @@ -777,6 +787,7 @@ function mergeHeadersAndData(
lastDateOfSubmission: datavalue?.lastdateofsubmission,
lastDateOfApproval: datavalue?.lastdateofapproval,
modificationCount: datavalue?.diff,
notificationActive: hasMonitoring?hasMonitoring.monitoring:false,
};
rows.push(row);
}
Expand Down
5 changes: 3 additions & 2 deletions src/domain/reports/mal-data-approval/entities/MalDataApprovalItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ export interface MalDataApprovalItem {
lastDateOfSubmission: string | undefined;
lastDateOfApproval: string | undefined;
modificationCount: string | undefined;
notificationActive: boolean;
}

export interface MalDataApprovalItemIdentifier {
dataSet: string;
orgUnit: string;
period: string;
workflow: string;
workflow: string | undefined;
}

export interface Monitoring {
Expand All @@ -29,7 +30,7 @@ export interface Monitoring {
}

export function getDataDuplicationItemId(dataSet: MalDataApprovalItem): string {
return [dataSet.dataSetUid, dataSet.approvalWorkflowUid, dataSet.period, dataSet.orgUnitUid].join("-");
return [dataSet.dataSetUid, dataSet.approvalWorkflowUid ?? "undefined", dataSet.period, dataSet.orgUnitUid].join("-");
}

export function parseDataDuplicationItemId(string: string): MalDataApprovalItemIdentifier | undefined {
Expand Down
2 changes: 2 additions & 0 deletions src/webapp/reports/mal-data-approval/DataApprovalViewModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export interface DataApprovalViewModel {
lastDateOfSubmission: Date | undefined;
lastDateOfApproval: Date | undefined;
modificationCount: string | undefined;
notificationActive: boolean;
}

export function getDataApprovalViews(_config: Config, items: MalDataApprovalItem[]): DataApprovalViewModel[] {
Expand All @@ -45,6 +46,7 @@ export function getDataApprovalViews(_config: Config, items: MalDataApprovalItem
? toDate(item.lastDateOfApproval, { timeZone: "UTC" })
: undefined,
modificationCount: item.modificationCount,
notificationActive: item.notificationActive
};
});
}
4 changes: 2 additions & 2 deletions src/webapp/reports/mal-data-approval/data-approval-list/DataApprovalList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ export const DataApprovalList: React.FC = React.memo(() => {

reload();
},
isActive: rows => _.every(rows, row => row.lastUpdatedValue) && isMalAdmin,
isActive: rows => _.every(rows, row => !row.notificationActive) && isMalAdmin,
},
{
name: "deactivate",
Expand All @@ -280,7 +280,7 @@ export const DataApprovalList: React.FC = React.memo(() => {

reload();
},
isActive: rows => _.every(rows, row => row.lastUpdatedValue) && isMalAdmin,
isActive: rows => _.every(rows, row => row.notificationActive) && isMalAdmin,
},
{
name: "getDiff",
Expand Down