From e7357a5b6489cb62b64c956b2b5e3581cd49e11f Mon Sep 17 00:00:00 2001
From: Sean Engelhardt <sean.f.t.engelhardt@gmail.com>
Date: Mon, 19 Aug 2019 16:25:35 +0200
Subject: [PATCH] Add option to hide amendments

Enables to hide amendments from the motion list
Allows to search through amendment paragraphs in the list view of amendments
---
 .../list-view-table.component.ts              | 34 +++++++++++--------
 .../amendment-list.component.ts               |  2 +-
 .../services/motion-filter-list.service.ts    | 25 ++++++++++++++
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.ts b/client/src/app/shared/components/list-view-table/list-view-table.component.ts
index 86ec9d863..8b0107ab1 100644
--- a/client/src/app/shared/components/list-view-table/list-view-table.component.ts
+++ b/client/src/app/shared/components/list-view-table/list-view-table.component.ts
@@ -338,23 +338,27 @@ export class ListViewTableComponent<V extends BaseViewModel, M extends BaseModel
                 // custom filter predicates
                 if (this.filterProps && this.filterProps.length) {
                     for (const prop of this.filterProps) {
-                        let propertyAsString = '';
-                        // If the property is a function, call it.
-                        if (typeof item[prop] === 'function') {
-                            propertyAsString = '' + item[prop]();
-                        } else {
-                            propertyAsString = '' + item[prop];
-                        }
+                        if (item[prop]) {
+                            let propertyAsString = '';
+                            // If the property is a function, call it.
+                            if (typeof item[prop] === 'function') {
+                                propertyAsString = '' + item[prop]();
+                            } else if (item[prop].constructor === Array) {
+                                propertyAsString = item[prop].join('');
+                            } else {
+                                propertyAsString = '' + item[prop];
+                            }
 
-                        if (!!propertyAsString) {
-                            const foundProp =
-                                propertyAsString
-                                    .trim()
-                                    .toLowerCase()
-                                    .indexOf(trimmedInput) !== -1;
+                            if (!!propertyAsString) {
+                                const foundProp =
+                                    propertyAsString
+                                        .trim()
+                                        .toLowerCase()
+                                        .indexOf(trimmedInput) !== -1;
 
-                            if (foundProp) {
-                                return true;
+                                if (foundProp) {
+                                    return true;
+                                }
                             }
                         }
                     }
diff --git a/client/src/app/site/motions/modules/amendment-list/amendment-list.component.ts b/client/src/app/site/motions/modules/amendment-list/amendment-list.component.ts
index 1845c66e8..68095cf8d 100644
--- a/client/src/app/site/motions/modules/amendment-list/amendment-list.component.ts
+++ b/client/src/app/site/motions/modules/amendment-list/amendment-list.component.ts
@@ -62,7 +62,7 @@ export class AmendmentListComponent extends BaseListViewComponent<ViewMotion> im
     /**
      * To filter stuff
      */
-    public filterProps = ['submitters', 'title', 'identifier'];
+    public filterProps = ['submitters', 'title', 'identifier', 'amendment_paragraphs'];
 
     /**
      *
diff --git a/client/src/app/site/motions/services/motion-filter-list.service.ts b/client/src/app/site/motions/services/motion-filter-list.service.ts
index 3245c9363..254883fbf 100644
--- a/client/src/app/site/motions/services/motion-filter-list.service.ts
+++ b/client/src/app/site/motions/services/motion-filter-list.service.ts
@@ -39,6 +39,11 @@ export class MotionFilterListService extends BaseFilterListService<ViewMotion> {
      */
     private enabledWorkflows = { statuteEnabled: false, statute: null, motion: null };
 
+    /**
+     * Determine to show amendments in the motion list
+     */
+    private showAmendmentsInMainTable: boolean;
+
     /**
      * Filter definitions for the workflow filter. Options will be generated by
      * getFilterOptions (as the workflows available may change)
@@ -136,6 +141,7 @@ export class MotionFilterListService extends BaseFilterListService<ViewMotion> {
     ) {
         super(store, OSStatus);
         this.getWorkflowConfig();
+        this.getShowAmendmentConfig();
 
         this.updateFilterForRepo(categoryRepo, this.categoryFilterOptions, this.translate.instant('No category set'));
 
@@ -155,6 +161,25 @@ export class MotionFilterListService extends BaseFilterListService<ViewMotion> {
         });
     }
 
+    /**
+     * @override
+     * @param motions The motions without amendments, if the according config was set
+     */
+    protected preFilter(motions: ViewMotion[]): ViewMotion[] {
+        if (!this.showAmendmentsInMainTable) {
+            return motions.filter(motion => !motion.parent_id);
+        }
+    }
+
+    /**
+     * Listen to changes for the 'motions_amendments_main_table' config value
+     */
+    private getShowAmendmentConfig(): void {
+        this.config.get<boolean>('motions_amendments_main_table').subscribe(show => {
+            this.showAmendmentsInMainTable = show;
+        });
+    }
+
     private getWorkflowConfig(): void {
         this.config.get<string>('motions_statute_amendments_workflow').subscribe(id => {
             this.enabledWorkflows.statute = +id;