Merge pull request #669 from luomus/allow-excel-generation-567

Implement MHL.allowExcelGeneration
luomus · Nov 25, 2024 · 1706127 · 1706127
2 parents 20a4899 + 1552bb0
commit 1706127
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 17 deletions.
diff --git a/projects/laji/src/app/+project-form/generate-spreadsheet/generate-spreadsheet.component.ts b/projects/laji/src/app/+project-form/generate-spreadsheet/generate-spreadsheet.component.ts
@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
 import { ProjectFormService } from '../../shared/service/project-form.service';
-import { map } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs/operators';
+import { FormPermissionService } from '../../shared/service/form-permission.service';
 
 @Component({
   selector: 'laji-generate-spreadsheet',
@@ -11,16 +11,19 @@ import { map } from 'rxjs/operators';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class GenerateSpreadsheetComponent {
-  readonly excelForm$: Observable<string[]>;
+
+  readonly excelForm$ = this.projectFormService.getProjectFormFromRoute$(this.route).pipe(
+    switchMap(projectForm => this.formPermissionService.getRights(projectForm.form).pipe(
+      map(rights => ({ projectForm, rights })
+    ))),
+    map(({ projectForm, rights }) => this.projectFormService.getExcelFormOptions(projectForm, rights.admin)),
+    map(form => Array.isArray(form) ? form : [form]),
+    map(forms => forms.filter(f => f.allowGenerate).map(f => f.formID))
+  );
 
   constructor(
     private route: ActivatedRoute,
-    public projectFormService: ProjectFormService
-) {
-    this.excelForm$ = projectFormService.getProjectFormFromRoute$(this.route).pipe(
-      map(form => projectFormService.getExcelFormIDs(form)),
-      map(form => Array.isArray(form) ? form : [form])
-    );
-  }
-
+    public projectFormService: ProjectFormService,
+    private formPermissionService: FormPermissionService
+  ) {}
 }
diff --git a/projects/laji/src/app/+project-form/project-form.component.ts b/projects/laji/src/app/+project-form/project-form.component.ts
@@ -231,8 +231,10 @@ export class ProjectFormComponent implements OnInit, OnDestroy {
   }
 
   private getNavLinks(projectForm: ProjectForm, rights: Rights, queryParams: Params): NavLink[] {
-    const allowExcel = this.projectFormService.getExcelFormIDs(projectForm).length;
-    const {form, subForms} = projectForm;
+    const excelFormOptions = this.projectFormService.getExcelFormOptions(projectForm, rights.admin);
+    const allowExcel = excelFormOptions.length;
+    const allowExcelGeneration = excelFormOptions.some(options => options.allowGenerate);
+    const { form, subForms } = projectForm;
     return [
       {
         link: ['about'],
@@ -255,7 +257,7 @@ export class ProjectFormComponent implements OnInit, OnDestroy {
         label: 'excel.import',
         lajiFormOption: 'options.allowExcel'
       },
-      rights.edit && allowExcel && {
+      rights.edit && allowExcelGeneration && {
         link: ['generate'],
         label: 'excel.generate',
         lajiFormOption: 'options.allowExcel'

diff --git a/projects/laji/src/app/shared/model/Form.ts b/projects/laji/src/app/shared/model/Form.ts
@@ -64,6 +64,7 @@ export namespace Form {
     prepopulateWithTaxonSets?: string[];
     emptyOnNoCount?: boolean;
     allowExcel?: boolean;
+    allowExcelGeneration?: boolean;
     excludeFromGlobalExcel?: boolean;
     allowTemplate?: boolean;
     forms?: string[];

diff --git a/projects/laji/src/app/shared/service/project-form.service.ts b/projects/laji/src/app/shared/service/project-form.service.ts
@@ -31,6 +31,11 @@ export interface NamedPlacesRouteData extends NamedPlacesQueryModel {
   namedPlace?: NamedPlace;
 }
 
+export interface ExcelFormOptions {
+  formID: string;
+  allowGenerate: boolean;
+}
+
 @Injectable({providedIn: 'root'})
 export class ProjectFormService {
   constructor(
@@ -111,9 +116,15 @@ export class ProjectFormService {
     return this.getProjectRootRoute$(route).pipe(map(_route => _route.snapshot.params['projectID']));
   }
 
-  getExcelFormIDs(projectForm: ProjectForm): string[] {
-    const allowsExcel = (form: Form.SchemaForm | Form.List) => form.options?.allowExcel && form.id;
-    return [allowsExcel(projectForm.form), ...projectForm.subForms.map(allowsExcel)].filter(f => f) as string[];
+  getExcelFormOptions(projectForm: ProjectForm, isAdmin: boolean): ExcelFormOptions[] {
+    const getExcelOptions = (form: Form.SchemaForm | Form.List) => form.options?.allowExcel
+      ? { formID: form.id, allowGenerate: isAdmin || form.options.allowExcelGeneration !== false }
+      : undefined;
+    return [getExcelOptions(projectForm.form), ...projectForm.subForms.map(getExcelOptions)].filter(f => f);
+  }
+
+  getExcelFormIDs(projectForm: ProjectForm, isAdmin: boolean): string[] {
+    return this.getExcelFormOptions(projectForm, isAdmin).map(f => f.formID);
   }
 
   getSubmissionsPageTitle(form: Form.SchemaForm, isAdmin: boolean) {