summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/ng2
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-08-20 13:45:55 +0300
committerMichael Lando <ml636r@att.com>2018-08-20 13:45:55 +0300
commit2411466fbb0ae49cc0f4de11ccff20f31d5a646e (patch)
tree974aaeec65955ad3a02a8f2f76225e6fb5bd9ef4 /catalog-ui/src/app/ng2
parentb751c9656c62ec4aa79e7af605dd24cfaeb4d8ad (diff)
fix issue in ui load
in case the plugin response is not valid json. Change-Id: Ib58158def846c14e85325c521b9b210f61e03ba3 Issue-ID: SDC-1666 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-ui/src/app/ng2')
-rw-r--r--catalog-ui/src/app/ng2/services/config.service.ts22
1 files changed, 7 insertions, 15 deletions
diff --git a/catalog-ui/src/app/ng2/services/config.service.ts b/catalog-ui/src/app/ng2/services/config.service.ts
index 1774a663e2..326f0694c1 100644
--- a/catalog-ui/src/app/ng2/services/config.service.ts
+++ b/catalog-ui/src/app/ng2/services/config.service.ts
@@ -1,9 +1,6 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright (c) 2018 AT&T Intellectual Property.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -15,11 +12,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Created by ob0695 on 4/9/2017.
+ *
+ *
*/
import { Injectable, Inject } from '@angular/core';
@@ -75,16 +69,14 @@ export class ConfigService {
return new Promise<PluginsConfiguration>((resolve) => {
promise.then((pluginsData: Plugins) => {
PluginsConfiguration.plugins = pluginsData;
- console.log('RESOLVED PLUGINS!!!');
resolve();
}).catch((ex) => {
- console.error("Error loading plugins configuration from BE", ex);
+ console.warn("Error loading plugins configuration from FE", ex);
PluginsConfiguration.plugins = [] as Plugins;
+ resolve();
});
});
-
- // return promise;
}
}