inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

AAE-34656 Hide all counters in Workspace which do not provide value (#10896)

Browse Source 
* Hide all counters in Workspace which do not provide value

* Fixed a copy & paste issue
This commit is contained in:
Enrico Hilgendorf
2025-05-30 07:44:00 +02:00
committed by GitHub
parent 1971980216
commit 8cb7a1719f
5 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/process-services-cloud/src/lib/process/process-filters/components/process-filters/process-filters-cloud.component.spec.ts
View File

@@ -531,6 +531,19 @@ describe('ProcessFiltersCloudComponent', () => {
expect(component.updatedFiltersSet.has(filterKeyTest)).toBeFalsy();
});
it('should call fetchProcessFilterCounter only if filter.showCounter is true', () => {
const filterWithCounter = { ...mockProcessFilters[0], showCounter: true };
const filterWithoutCounter = { ...mockProcessFilters[1], showCounter: false };
const fetchSpy = spyOn<any>(component, 'fetchProcessFilterCounter').and.returnValue(of(42));
component.filters = [filterWithCounter, filterWithoutCounter];
component.updateFilterCounters();
expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy).toHaveBeenCalledWith(filterWithCounter);
expect(fetchSpy).not.toHaveBeenCalledWith(filterWithoutCounter);
});
describe('Highlight Selected Filter', () => {
const allProcessesFilterKey = mockProcessFilters[0].key;
const runningProcessesFilterKey = mockProcessFilters[1].key;

4
lib/process-services-cloud/src/lib/process/process-filters/components/process-filters/process-filters-cloud.component.ts
View File

@@ -278,6 +278,10 @@ export class ProcessFiltersCloudComponent implements OnInit, OnChanges {
* @param filter filter
*/
updateFilterCounter(filter: ProcessFilterCloudModel): void {
if (!filter?.showCounter) {
return;
}
this.fetchProcessFilterCounter(filter)
.pipe(
tap((filterCounter) => {

2
lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts
View File

@@ -49,6 +49,7 @@ export class ProcessFilterCloudModel {
suspendedDateType: DateCloudFilterType;
completedDate: Date;
environmentId?: string;
showCounter: boolean;
processDefinitionNames: string[] | null;
processNames: string[] | null;
@@ -74,6 +75,7 @@ export class ProcessFilterCloudModel {
this.name = obj.name || null;
this.key = obj.key || null;
this.environmentId = obj.environmentId;
this.showCounter = obj.showCounter || false;
this.icon = obj.icon || null;
this.index = obj.index || null;
this.appName = obj.appName || obj.appName === '' ? obj.appName : null;

9
lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.ts
View File

@@ -378,7 +378,8 @@ export class ProcessFilterCloudService {
appName,
sort: 'startDate',
status: 'RUNNING',
order: 'DESC'
order: 'DESC',
showCounter: true
}),
new ProcessFilterCloudModel({
name: 'ADF_CLOUD_PROCESS_FILTERS.COMPLETED_PROCESSES',
@@ -387,7 +388,8 @@ export class ProcessFilterCloudService {
appName,
sort: 'startDate',
status: 'COMPLETED',
order: 'DESC'
order: 'DESC',
showCounter: false
}),
new ProcessFilterCloudModel({
name: 'ADF_CLOUD_PROCESS_FILTERS.ALL_PROCESSES',
@@ -396,7 +398,8 @@ export class ProcessFilterCloudService {
appName,
sort: 'startDate',
status: '',
order: 'DESC'
order: 'DESC',
showCounter: false
})
];
}

14
lib/process-services-cloud/src/lib/task/task-filters/components/task-filters/task-filters-cloud.component.spec.ts
View File

@@ -32,6 +32,7 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { TaskFilterCloudAdapter } from '../../../../models/filter-cloud-model';
import { ApolloTestingModule } from 'apollo-angular/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TaskFilterCloudModel } from '../../models/filter-cloud.model';
describe('TaskFiltersCloudComponent', () => {
let loader: HarnessLoader;
@@ -562,6 +563,19 @@ describe('TaskFiltersCloudComponent', () => {
expect(component.updatedCountersSet.has(fakeFilterKey)).toBe(true);
});
it('should call fetchTaskFilterCounter only if filter.showCounter is true', () => {
const filterWithCounter = new TaskFilterCloudModel({ ...defaultTaskFiltersMock[0], showCounter: true });
const filterWithoutCounter = new TaskFilterCloudModel({ ...defaultTaskFiltersMock[1], showCounter: false });
const fetchSpy = spyOn<any>(component, 'fetchTaskFilterCounter').and.returnValue(of(42));
component.filters = [filterWithCounter, filterWithoutCounter];
component.updateFilterCounters();
expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy).toHaveBeenCalledWith(filterWithCounter);
expect(fetchSpy).not.toHaveBeenCalledWith(filterWithoutCounter);
});
describe('Highlight Selected Filter', () => {
const assignedTasksFilterKey = defaultTaskFiltersMock[1].key;
const queuedTasksFilterKey = defaultTaskFiltersMock[0].key;