Refactor itemtype loading

projects/common/src/fm/common-service.module.ts

@@ -65,10 +65,11 @@ export class AppCommonServiceModule {
       ngModule: AppCommonServiceModule,
       providers: [
         AppConfig,
+        ItemTypeService,
         {
           provide: APP_INITIALIZER,
           useFactory: appConfigFactory,
-          deps: [Injector, AppConfig, OAuthService, AuthConfigFactory, OAuthStorage],
+          deps: [Injector, AppConfig, OAuthService, AuthConfigFactory, OAuthStorage,ItemTypeService],
           multi: true
         },
         {

projects/common/src/fm/models/item.type.ts

@@ -4,4 +4,5 @@ export interface IItemType {
   editor?: string;
   isFolder?: boolean;
   iconColor?: string;
+  extraAttributes?: string;
 }

projects/common/src/fm/services/item.service.ts

@@ -6,12 +6,13 @@ import { IItem } from '../models/item';
 import { IItemTask } from '../models/itemTask';
 import { HttpClient, HttpParams } from "@angular/common/http";
 import { AppConfig } from "../shared/app.config";
+import {ItemTypeService} from './itemtype.service';
 
 @Injectable({
   providedIn: 'root',
 })
 export class ItemService {
-  constructor(public httpClient: HttpClient, public appConfig: AppConfig) {
+  constructor(public httpClient: HttpClient, public appConfig: AppConfig,private itemTypeService:ItemTypeService) {
   }
 
   ApiEndpoint() {
@@ -37,7 +38,13 @@ export class ItemService {
     if (searchTags) params = params.append("t", searchTags);
     if (startDate) params = params.append("sd", startDate.toISOString());
     if (endDate) params = params.append("ed", endDate.toISOString());
-    if (itemType) params = params.append("it", itemType);
+    if (itemType) {
+      params = params.append("it", itemType);
+      let extraAttributes = this.itemTypeService.getExtraAttributes(itemType);
+      if(extraAttributes) {
+        params = params.append("da", extraAttributes);
+      }
+    }
     if (parentCode) params = params.append("pc", parentCode);
     if (dataFilter) params = params.append("df", dataFilter);
     if (level) params = params.append("lvl", dataFilter);

projects/common/src/fm/services/itemtype.service.ts

@@ -1,20 +1,24 @@
 import { Injectable } from '@angular/core';
 import {IItemTypes} from '../models/item.types'
 import {IItem} from '../models/item'
-import {ItemService} from '../services/item.service';
+import {AppConfig} from '../shared/app.config';
+import {HttpClient, HttpXhrBackend} from '@angular/common/http';
 
 @Injectable({
   providedIn: 'root',
 })
 export class ItemTypeService {
     public itemTypes: IItemTypes;
+    private httpClient: HttpClient;
 
-    constructor(itemService:ItemService) {          
+    constructor(xhrBackend: HttpXhrBackend) {          
-      itemService.getItemTypes().subscribe((itemTypes) => {
+      this.httpClient = new HttpClient(xhrBackend);
-        this.itemTypes = itemTypes;
-     });
     } 
 
+  //   itemService.getItemTypes().subscribe((itemTypes) => {
+  //     this.itemTypes = itemTypes;
+  //  });
+
      getIcon(itemType: string) {
        var icon = "fa fa-file-o";
        if (this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon;
@@ -27,6 +31,12 @@ export class ItemTypeService {
        return color;
      }
 
+     getExtraAttributes(itemType: string) {
+      var extraAttributes = null;
+      if (this.itemTypes[itemType]) extraAttributes = this.itemTypes[itemType].extraAttributes;
+      return extraAttributes;
+    }
+
      hasViewer(item: IItem) {
         let itemType: string = item.itemType;
         if (this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined;
@@ -43,4 +53,16 @@ export class ItemTypeService {
         let itemType: string = item.itemType;
         return itemType == "vnd.farmmaps.itemtype.geotiff.processed" || itemType == "vnd.farmmaps.itemtype.layer" || itemType == "vnd.farmmaps.itemtype.shape.processed";
       }
+
+      public load(config:AppConfig): Promise<any> {
+        
+        var url = `${ config.getConfig("apiEndPoint")}/api/v1/itemtypes/`
+        return this.httpClient.get(url)
+          .toPromise()
+          .then((itemTypes:IItemTypes) => {
+            this.itemTypes = itemTypes;
+            //return data;
+          })
+          .catch(error => this.itemTypes = null);
+      };
 }

projects/common/src/fm/shared/app.config.factory.ts

@@ -3,44 +3,49 @@ import { Location} from '@angular/common';
 import { Router,UrlSerializer } from '@angular/router';
 import { AuthConfig, OAuthService, JwksValidationHandler, OAuthErrorEvent, OAuthStorage  } from 'angular-oauth2-oidc';
 import { AppConfig } from "./app.config";
+import {ItemTypeService} from '../services/itemtype.service';
 import { IAuthconfigFactory } from './authconfigFactory';
 
 
 
-export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthService: OAuthService, authconfigFactory:IAuthconfigFactory,authStorage:OAuthStorage): () => Promise<any> {
+export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthService: OAuthService, authconfigFactory:IAuthconfigFactory,authStorage:OAuthStorage,itemtypeService:ItemTypeService): () => Promise<any> {
   return (): Promise<any> => {
-    return appConfig.load().then(() => {     
+    return new Promise((resolve,reject) => {
-      oauthService.events.subscribe((event) => {
+      appConfig.load().then(() => {     
-        console.debug(event.type);
+        oauthService.events.subscribe((event) => {
-        if (event.type == 'token_error' || event.type == 'silent_refresh_timeout') {
+          console.debug(event.type);
-          let e = event as OAuthErrorEvent;
+          if (event.type == 'token_error' || event.type == 'silent_refresh_timeout') {
-          let p = e.params as any;
+            let e = event as OAuthErrorEvent;
-          if (event.type == 'silent_refresh_timeout' || (p.error && p.error == 'login_required')) {
+            let p = e.params as any;
-            let router = injector.get(Router);
+            if (event.type == 'silent_refresh_timeout' || (p.error && p.error == 'login_required')) {
-            console.debug("Session expired");
+              let router = injector.get(Router);
-            router.navigate(['loggedout'], { queryParams: { redirectTo: router.url } });
+              console.debug("Session expired");
+              router.navigate(['loggedout'], { queryParams: { redirectTo: router.url } });
+            }          
           }
-        }
-      });
-      oauthService.configure(authconfigFactory.getAuthConfig(appConfig));
-      oauthService.setStorage(authStorage);
-      oauthService.tokenValidationHandler = new JwksValidationHandler();
-      oauthService.tokenValidationHandler.validateAtHash = function () {
-        return new Promise<boolean>((res) => { res(true); })
-      };
-      oauthService.setupAutomaticSilentRefresh();
-      let location = injector.get(Location);
-      let router = injector.get(Router);
-      let urlPath = location.path();
-      oauthService.loadDiscoveryDocument().then(() => {
-        oauthService.tryLogin({
-          onTokenReceived: (info) => {
-            urlPath = info.state;
-          }
-        }).then(() => {
-          router.navigateByUrl(urlPath);
         });
-      })
+        oauthService.configure(authconfigFactory.getAuthConfig(appConfig));
+        oauthService.setStorage(authStorage);
+        oauthService.tokenValidationHandler = new JwksValidationHandler();
+        oauthService.tokenValidationHandler.validateAtHash = function () {
+          return new Promise<boolean>((res) => { res(true); })
+        };
+        oauthService.setupAutomaticSilentRefresh();
+        let location = injector.get(Location);
+        let router = injector.get(Router);
+        let urlPath = location.path();
+        oauthService.loadDiscoveryDocument().then(() => {
+          oauthService.tryLogin({
+            onTokenReceived: (info) => {
+              urlPath = info.state;
+            }
+          }).then(() => {
+            router.navigateByUrl(urlPath);
+          });    
+        })
+      }).then(() => {
+        itemtypeService.load(appConfig).then(() => resolve()).catch(() => reject());
+      });
     });
   }
 }