Fixes for build --prod complaints

Author: arildm

src/app/app.component.ts

@@ -17,8 +17,8 @@ import { OPENDOCUMENT, CLOSEDOCUMENT, CHANGELANG, INITIATE, AppState, SearchRedu
 export class AppComponent {
 
   private searchRedux: Observable<SearchRedux>;
-  private openDocument = false;
-  private loggedIn = false;
+  public openDocument = false;
+  public loggedIn = false;
 
   public languages: string[];
   public selectedLanguage: string;

src/app/docselection/docselection.component.ts

@@ -23,7 +23,7 @@ export class DocselectionComponent implements OnInit {
 
   private hasSearched = false;
   private disablePaginatorEvent = false;
-  
+
   private currentPaginatorPage: number = 1; // Needs to be 1-based because of the paginator widget
 
   private documentsWithHits: StrixDocument[] = [];//StrixDocHit[] = [];
@@ -34,7 +34,7 @@ export class DocselectionComponent implements OnInit {
   private availableCorpora: { [key: string] : StrixCorpusConfig} = {};
   private checkedCorpora: any = {};
 
-  private show = true;
+  public show = true;
 
   private searchResultSubscription: Subscription;
   private metadataSubscription: Subscription;
@@ -75,7 +75,7 @@ export class DocselectionComponent implements OnInit {
         this.totalNumberOfDocuments = answer.count;
         this.hasSearched = true;
 
-        
+
       },
       error => null//this.errorMessage = <any>error
     );

src/app/indocsearch/indocsearch.component.ts

@@ -9,14 +9,14 @@ import { AppState, SEARCHINDOCUMENT } from '../searchreducer';
   styleUrls: ['./indocsearch.component.css']
 })
 export class IndocsearchComponent implements OnInit {
-  private asyncSelected: string = "";
+  public asyncSelected: string = "";
 
   constructor(private store: Store<AppState>) { }
 
   ngOnInit() {
   }
 
-  private simpleSearch() {
+  public simpleSearch() {
     this.store.dispatch({ type: SEARCHINDOCUMENT, payload : this.asyncSelected});
   }
 

src/app/leftcolumn/leftcolumn.component.ts

@@ -23,8 +23,8 @@ import { Bucket, Aggregations, Agg, AggregationsResult } from "../strixresult.mo
   styleUrls: ['./leftcolumn.component.css']
 })
 export class LeftcolumnComponent implements OnInit {
-  
-  private gotMetadata = false;
+
+  public gotMetadata = false;
 
   private metadataSubscription: Subscription;
   private aggregatedResultSubscription: Subscription;
@@ -34,13 +34,13 @@ export class LeftcolumnComponent implements OnInit {
   //private currentFilters: any[] = []; // TODO: Make some interface
   private unusedFacets : string[] = [];
 
-  private openDocument = false;
+  public openDocument = false;
 
   private searchRedux: Observable<any>;
   private include_facets : string[] = []
   private availableCorpora : { [key: string] : StrixCorpusConfig};
   private mem_guessConfFromAttributeName : Function;
-  
+
 
   constructor(private metadataService: MetadataService,
               private queryService: QueryService,
@@ -69,7 +69,7 @@ export class LeftcolumnComponent implements OnInit {
 
     this.aggregatedResultSubscription = queryService.aggregationResult$.pipe(skip(1)).subscribe(
       (result : AggregationsResult) => {
-        this.parseAggResults(result) 
+        this.parseAggResults(result)
       },
       error => null//this.errorMessage = <any>error
     );
@@ -92,7 +92,7 @@ export class LeftcolumnComponent implements OnInit {
       } else {
         return "list"
       }
-      
+
     } else {
       return ret
     }
@@ -130,7 +130,7 @@ export class LeftcolumnComponent implements OnInit {
       }
       return item.to
     }).to
-    
+
     agg.min = _.minBy(agg.buckets, "from").from
     agg.max = max
     agg.value = {range: {lte: agg.max, gte: agg.min}}
@@ -176,7 +176,7 @@ export class LeftcolumnComponent implements OnInit {
           if(target && target.length) {
             target[0].selected = true
           } else {
-            // make sure selected filters don't disappear by adding them 
+            // make sure selected filters don't disappear by adding them
             // to incoming aggs array
             newValue.push(target)
           }
@@ -194,7 +194,7 @@ export class LeftcolumnComponent implements OnInit {
                             .value()
     this.unusedFacets = _.difference(result.unused_facets, ["datefrom", "dateto"]);
   }
-  
+
   private chooseBucket(aggregationKey: string, bucket: Bucket) {
     bucket.selected = true
 
@@ -246,7 +246,7 @@ export class LeftcolumnComponent implements OnInit {
     this.store.dispatch({ type: SEARCH, payload : null});
   }
 
-  private reloadStrix() {
+  public reloadStrix() {
     window.location.href = window.location.pathname;
   }
 
@@ -267,10 +267,10 @@ export class LeftcolumnComponent implements OnInit {
       this.metadataService.loadedMetadata$
 
     ).subscribe(([result, {filters}, info] : [AggregationsResult, any, any]) => {
-      //this.zone.run(() => {  
+      //this.zone.run(() => {
         console.log("Leftcolumn init", result, filters)
         this.parseAggResults(result)
-        
+
         let filterData = filters || [];
         // Clear all filters first (could probably be optimized)
         for (let agg in this.aggregations) {

src/app/leftcolumn/multicomplete/multicomplete.component.ts

@@ -21,11 +21,11 @@ export class MultiCompleteComponent implements OnInit, OnChanges {
     @Output() onSelect = new EventEmitter<Bucket>();
     @Output() onRemove = new EventEmitter<Bucket>();
 
-    private typeaheadSelected : string = "";
+    public typeaheadSelected : string = "";
 
-    private selected : Bucket[] = [];
-    private remaining : Bucket[] = [];
-    private head : Bucket[] = [];
+    public selected : Bucket[] = [];
+    public remaining : Bucket[] = [];
+    public head : Bucket[] = [];
 
     constructor() {
 
@@ -56,17 +56,17 @@ export class MultiCompleteComponent implements OnInit, OnChanges {
         return key
       }
     }
-    private getRemaining() {
+    public getRemaining() {
         return this.remaining;
     }
 
-    private onInputClick(event) {
+    public onInputClick(event) {
       if(window.outerHeight - event.target.getBoundingClientRect().bottom < 300) {
           event.target.scrollIntoView()
       }
     }
     private onDeselect(bucket : Bucket) {
-        this.remaining.push(bucket) 
+        this.remaining.push(bucket)
         this.remaining = _.orderBy(this.remaining, "doc_count", "desc")
         this.selected.splice(this.selected.indexOf(bucket), 1)
         this.onRemove.emit(bucket)
@@ -75,7 +75,7 @@ export class MultiCompleteComponent implements OnInit, OnChanges {
       bucket.selected = true
       this.onSelect.emit(bucket)
     }
-    private dropdownSelected(match) {
+    public dropdownSelected(match) {
       let selectedItem : Bucket = match.item;
       console.log("dropdownSelected", selectedItem)
       // let bucket : Bucket = _.find(this.aggregations[aggKey].buckets, (item) => item.key == selectedItem.item.key)
@@ -86,4 +86,4 @@ export class MultiCompleteComponent implements OnInit, OnChanges {
       this.typeaheadSelected = "";
     }
 
-}
+}

src/app/reader/reader.component.ts

@@ -26,20 +26,20 @@ export class ReaderComponent implements AfterViewInit, OnDestroy {
   subscription : Subscription;
 
   private docLoadStatusSubscription: Subscription;
-  private isLoading = false;
+  public isLoading = false;
   private openness = {'HITS' : false, 'TEXTATTRIBUTES' : true, 'STRUCTURALATTRIBUTES' : false, 'TOKENATTRIBUTES' : false};
 
   private mainDocument: StrixDocument;
 
   /* Metadata */
-  private gotMetadata = false;
+  public gotMetadata = false;
   private metadataSubscription: Subscription;
   private availableCorpora: { [key: string] : StrixCorpusConfig} = {};
   //private availableCorporaKeys: string[] = [];
 
   // Each item in cmViews is an index number of the DocumentsService documents.
   // They need not be in order!!
-  private cmViews = [];
+  public cmViews = [];
 
   private titles = [""];
   private selectedMirrorIndex = 0;

src/app/search/search.component.html

@@ -22,7 +22,7 @@
           (keydown.Enter)="simpleSearch()"/>
 
           <label for="keyword_search">{{'keyword_search' | loc}}</label>
-          <input type="checkbox" class="" id="keyword_search" 
+          <input type="checkbox" class="" id="keyword_search"
             [(ngModel)]="isPhraseSearch"
             (change)="searchTypeChange(isPhraseSearch)"
           >
@@ -40,7 +40,7 @@
           [typeaheadItemTemplate]="lemgramItemTemplate"
           (typeaheadOnSelect)="typeaheadOnSelect($event)"/>
         </div>
-        <button (click)="simpleSearch(false)" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>&nbsp;{{'search' | loc}}</button>
+        <button (click)="simpleSearch()" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>&nbsp;{{'search' | loc}}</button>
     </div>
   <div class="clear"></div>
   <!--<div class="histogram_box">

src/app/search/search.component.ts

@@ -19,15 +19,15 @@ import { Filter, QueryType } from '../strixquery.model';
 export class SearchComponent implements OnInit {
 
   private searchRedux: Observable<SearchRedux>;
-  
+
   private searchableAnnotations: string[] = ["lemgram", "betydelse"];
-  private searchType = QueryType.Normal;
+  public searchType = QueryType.Normal;
 
   private asyncSelected: string = "";
   private dataSource: Observable<any>;
   private errorMessage: string;
 
-  private currentFilters: Filter[] = [];
+  public currentFilters: Filter[] = [];
 
   private histogramData: any;
   private histogramSelection: any;
@@ -65,7 +65,7 @@ export class SearchComponent implements OnInit {
   */
 
   private searchStatusSubscription: Subscription;
-  private isSearching = false;
+  public isSearching = false;
   private isPhraseSearch : boolean = true;
 
   constructor(private callsService: CallsService,
@@ -97,7 +97,7 @@ export class SearchComponent implements OnInit {
 
     // this.searchRedux.filter((d) => d.latestAction === CHANGEFILTERS).subscribe(({ filters }) => {
     //   console.log("picked up filters change", filters);
-      
+
     //   this.currentFilters = filters; // Not sure we really should overwrite the whole tree.
     //   let didFilter = false;
     //   for (let filter of this.currentFilters) {
@@ -126,7 +126,7 @@ export class SearchComponent implements OnInit {
       if(data.query) {
         this.asyncSelected = data.query
       }
-    }); 
+    });
 
     /* this.searchRedux.filter((d) => d.latestAction === CHANGECORPORA).subscribe((data) => {
       console.log("acting upon", data.latestAction);
@@ -147,7 +147,7 @@ export class SearchComponent implements OnInit {
     });
   }
 
-  private simpleSearch() {
+  public simpleSearch() {
     this.store.dispatch({ type: CHANGEQUERY, payload : this.asyncSelected});
     this.store.dispatch({ type: SEARCH, payload : null});
   }

src/app/start-panel/start-panel.component.ts

@@ -11,7 +11,7 @@ import { SEARCH, OPENDOCUMENT, AppState } from '../searchreducer';
 })
 export class StartPanelComponent implements OnInit {
 
-  private show = true;
+  public show = true;
 
   private searchRedux: Observable<any>;
 

src/app/strixquery.model.ts

@@ -16,5 +16,6 @@ export class Filter {
 }
 
 export enum QueryType {
-    Normal = 'normal'
-}
+    Normal = 'normal',
+    Lemgram = 'lemgram',
+}