Utilities Module
Error Dialog
diff --git a/src/docs-ui/app/demos/demos.component.ts b/src/docs-ui/app/demos/demos.component.ts
index 785e746..3a8a4a7 100644
--- a/src/docs-ui/app/demos/demos.component.ts
+++ b/src/docs-ui/app/demos/demos.component.ts
@@ -5,6 +5,7 @@ import { VantageCredentialsDialogComponent, VantageConnectionService } from '@td
import { VantageErrorService } from '@td-vantage/ui-platform/utilities';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
+import { VantageAssetsService, IHelpAssets } from '@td-vantage/ui-platform/assets';
@Component({
selector: 'app-demos',
@@ -14,11 +15,14 @@ import { takeUntil } from 'rxjs/operators';
export class DemosComponent implements OnInit, OnDestroy {
private unsubscribe: Subject
= new Subject();
+ helpJSON: IHelpAssets;
+
constructor(
public _themeService: VantageThemeService,
private _dialog: MatDialog,
private _errorService: VantageErrorService,
public connectionService: VantageConnectionService,
+ public assetsService: VantageAssetsService,
) {}
ngOnInit(): void {
@@ -62,4 +66,10 @@ export class DemosComponent implements OnInit, OnDestroy {
error,
});
}
+
+ getHelpJSON(): void {
+ this.assetsService.getHelpJSON().subscribe((helpJSON: IHelpAssets) => {
+ this.helpJSON = helpJSON;
+ });
+ }
}
diff --git a/src/lib/app-switcher/app-switcher-menu/app-switcher-menu.component.html b/src/lib/app-switcher/app-switcher-menu/app-switcher-menu.component.html
index cb17c1c..03bcea9 100644
--- a/src/lib/app-switcher/app-switcher-menu/app-switcher-menu.component.html
+++ b/src/lib/app-switcher/app-switcher-menu/app-switcher-menu.component.html
@@ -43,6 +43,7 @@
apps
-
+
>): Observable {
+ return response.pipe(
+ catchError((error: Response) => {
+ return of(error);
+ }),
+ map((res: HttpResponse) => {
+ return res.body;
+ }),
+ );
+ }
+}
+
+export function VANTAGE_ASSETS_PROVIDER_FACTORY(parent: VantageAssetsService): VantageAssetsService {
+ return parent || new VantageAssetsService();
+}
+
+export const VANTAGE_ASSETS_PROVIDER: Provider = {
+ // If there is already a service available, use that. Otherwise, provide a new one.
+ provide: VantageAssetsService,
+ deps: [[new Optional(), new SkipSelf(), VantageAssetsService]],
+ useFactory: VANTAGE_ASSETS_PROVIDER_FACTORY,
+};
diff --git a/src/lib/assets/index.ts b/src/lib/assets/index.ts
new file mode 100644
index 0000000..4aaf8f9
--- /dev/null
+++ b/src/lib/assets/index.ts
@@ -0,0 +1 @@
+export * from './public_api';
diff --git a/src/lib/assets/package.json b/src/lib/assets/package.json
new file mode 100644
index 0000000..5255d3a
--- /dev/null
+++ b/src/lib/assets/package.json
@@ -0,0 +1,10 @@
+{
+ "ngPackage": {
+ "lib": {
+ "entryFile": "index.ts",
+ "umdModuleIds": {
+ "@covalent/http": "covalent.http"
+ }
+ }
+ }
+}
diff --git a/src/lib/assets/public_api.ts b/src/lib/assets/public_api.ts
new file mode 100644
index 0000000..8029ace
--- /dev/null
+++ b/src/lib/assets/public_api.ts
@@ -0,0 +1,2 @@
+export * from './assets.module';
+export * from './assets.service';
diff --git a/src/lib/package-lock.json b/src/lib/package-lock.json
new file mode 100644
index 0000000..93dcfca
--- /dev/null
+++ b/src/lib/package-lock.json
@@ -0,0 +1,5 @@
+{
+ "name": "@td-vantage/ui-platform",
+ "version": "0.0.0-PLATFORM",
+ "lockfileVersion": 1
+}
diff --git a/src/lib/schematics/collection.json b/src/lib/schematics/collection.json
index 5ee1182..272383b 100644
--- a/src/lib/schematics/collection.json
+++ b/src/lib/schematics/collection.json
@@ -1,11 +1,11 @@
{
- "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
- "schematics": {
- "ng-add": {
- "description": "Adds vantage ui platform to the application without affecting any templates",
- "factory": "./ng-add/index#addDependenciesAndFiles",
- "schema": "./ng-add/schema.json",
- "aliases": ["vantage-shell", "install"]
- }
+ "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
+ "schematics": {
+ "ng-add": {
+ "description": "Adds vantage ui platform to the application without affecting any templates",
+ "factory": "./ng-add/index#addDependenciesAndFiles",
+ "schema": "./ng-add/schema.json",
+ "aliases": ["vantage-shell", "install"]
}
- }
\ No newline at end of file
+ }
+}
diff --git a/src/lib/schematics/ng-add/files/proxy.conf.js b/src/lib/schematics/ng-add/files/proxy.conf.js
index 382338f..a33c54c 100644
--- a/src/lib/schematics/ng-add/files/proxy.conf.js
+++ b/src/lib/schematics/ng-add/files/proxy.conf.js
@@ -6,8 +6,9 @@ const vantageLoginProxyConfig = require('./src/lib/auth/config/vantageLoginProxy
/* * * * * * * * * * * */
const serverUrl = 'https://vantage.url.io'; // REPLACE WITH VANTAGE BASE URL
-const localUrl = "localhost:4200";
-const localProto = "http"; // http or https
+
+const localUrl = 'localhost:4200';
+const localProto = 'http'; // http or https
/* * * * * * * * * * * */
/* This section contains the routes proxied through */
diff --git a/src/lib/schematics/ng-add/files/src/app/app.routes.ts b/src/lib/schematics/ng-add/files/src/app/app.routes.ts
index e077bec..26cce39 100644
--- a/src/lib/schematics/ng-add/files/src/app/app.routes.ts
+++ b/src/lib/schematics/ng-add/files/src/app/app.routes.ts
@@ -11,8 +11,6 @@ const routes: Routes = [
{ path: '**', redirectTo: '/' },
];
-export const appRoutingProviders: any[] = [
- VantageAuthenticationGuard,
-];
+export const appRoutingProviders: any[] = [VantageAuthenticationGuard];
export const appRoutes: any = RouterModule.forRoot(routes);
diff --git a/src/lib/schematics/ng-add/index.ts b/src/lib/schematics/ng-add/index.ts
index ef6e491..297b3b0 100644
--- a/src/lib/schematics/ng-add/index.ts
+++ b/src/lib/schematics/ng-add/index.ts
@@ -1,4 +1,17 @@
-import { Rule, chain, Tree, mergeWith, url, apply, branchAndMerge, SchematicsException, template, UpdateRecorder } from '@angular-devkit/schematics';
+
+import {
+ Rule,
+ chain,
+ Tree,
+ mergeWith,
+ url,
+ apply,
+ branchAndMerge,
+ template,
+ UpdateRecorder,
+ FileEntry,
+ SchematicContext,
+} from '@angular-devkit/schematics';
import { addPackageToPackageJson } from '@angular/material/schematics/ng-add/package-config';
import { uiPlatformVersion } from '../version-names';
import { ISchema } from './schema';
@@ -10,21 +23,25 @@ import { InsertChange } from '@schematics/angular/utility/change';
import { getAppModulePath } from '@schematics/angular/utility/ng-ast-utils';
import { getWorkspace } from '@schematics/angular/utility/config';
import { experimental } from '@angular-devkit/core';
-import { getSourceFile, getProjectMainFile } from '@angular/cdk/schematics/utils';
+
+import { getSourceFile, getProjectMainFile, getProjectStyleFile } from '@angular/cdk/schematics/utils';
+
import { SourceFile } from 'typescript';
import { Change } from '@schematics/angular/utility/change';
export function addDependenciesAndFiles(options: ISchema): Rule {
- let addVantagePacakgeRule: Rule = (host: Tree) => {
+ const addVantagePacakgeRule: Rule = (host: Tree) => {
addPackageToPackageJson(host, '@td-vantage/ui-platform', `${uiPlatformVersion}`);
};
- let ruleSet: Rule[] = [addVantagePacakgeRule];
-
- if (options.ssoServerURL && options.ssoServerURL.trim().length) { // enable SSO
+ const ruleSet: Rule[] = [addVantagePacakgeRule];
+
+ if (options.ssoServerURL && options.ssoServerURL.trim().length) {
+ // enable SSO
ruleSet.push(mergeFiles(options));
ruleSet.push(addSSOImports);
- }
+ ruleSet.push(updateStyles);
+ }
return chain(ruleSet);
}
@@ -38,7 +55,26 @@ function mergeFiles(options: ISchema): Rule {
return branchAndMerge(mergeWith(templateSource));
}
-function addSSOImports(): Rule {
+function updateStyles(): Rule {
+ return (host: Tree, context: SchematicContext) => {
+ const workspace: experimental.workspace.WorkspaceSchema = getWorkspace(host);
+ const project: experimental.workspace.WorkspaceProject = getProjectFromWorkspace(workspace);
+ const styleFilePath: string = getProjectStyleFile(project);
+ const file: Buffer = host.read(styleFilePath);
+ const themeFile: FileEntry = host.get('theme.scss');
+ const fileContent: string = file.toString();
+ const content: string = themeFile && themeFile.content.toString();
+
+ if (content) {
+ host.overwrite(styleFilePath, fileContent + '\n' + content);
+ host.delete('theme.scss');
+ }
+
+ return host;
+ };
+}
+
+function addSSOImports(): Rule {
return (host: Tree) => {
const workspace: experimental.workspace.WorkspaceSchema = getWorkspace(host);
const project: experimental.workspace.WorkspaceProject = getProjectFromWorkspace(workspace);
@@ -53,7 +89,6 @@ function addSSOImports(): Rule {
addModuleImportToRootModule(host, `CovalentHttpModule.forRoot()`, '@covalent/http', project);
replaceContentInAppModule(host, `CovalentHttpModule.forRoot()`, replacementString);
addModuleImportToRootModule(host, 'appRoutes', './app.routes', project);
-
addProvider(host, `VantageAuthenticationInterceptor`, '@td-vantage/ui-platform/auth');
addProvider(host, `appRoutingProviders`, './app.routes');
};
diff --git a/src/lib/schematics/ng-add/schema.ts b/src/lib/schematics/ng-add/schema.ts
index e0252a9..2b5a1a0 100644
--- a/src/lib/schematics/ng-add/schema.ts
+++ b/src/lib/schematics/ng-add/schema.ts
@@ -1,5 +1,4 @@
export interface ISchema {
/** Whether SSO should be set up. */
ssoServerURL: string;
-
}
diff --git a/src/lib/schematics/tsconfig.json b/src/lib/schematics/tsconfig.json
index 972d367..41441a0 100644
--- a/src/lib/schematics/tsconfig.json
+++ b/src/lib/schematics/tsconfig.json
@@ -1,24 +1,23 @@
{
- "compileOnSave": false,
- "compilerOptions": {
- "rootDir": "./",
- "baseUrl": "./",
- "declaration": false,
- "emitDecoratorMetadata": true,
- "experimentalDecorators": true,
- "outDir": "../../../../deploy/ui-platform/schematics",
- "lib": ["es2017", "dom"],
- "moduleResolution": "node",
- "sourceMap": true,
- "target": "es5",
- "typeRoots": ["./../../../../node_modules/@types"],
- "noUnusedParameters": false,
- "noUnusedLocals": false,
- "allowUnreachableCode": false,
- "pretty": true,
- "importHelpers": true
- },
- "include": ["**/*"],
- "exclude": ["**/*.spec.ts", "**/files/**/*"]
- }
-
\ No newline at end of file
+ "compileOnSave": false,
+ "compilerOptions": {
+ "rootDir": "./",
+ "baseUrl": "./",
+ "declaration": false,
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "outDir": "../../../../deploy/ui-platform/schematics",
+ "lib": ["es2017", "dom"],
+ "moduleResolution": "node",
+ "sourceMap": true,
+ "target": "es5",
+ "typeRoots": ["./../../../../node_modules/@types"],
+ "noUnusedParameters": false,
+ "noUnusedLocals": false,
+ "allowUnreachableCode": false,
+ "pretty": true,
+ "importHelpers": true
+ },
+ "include": ["**/*"],
+ "exclude": ["**/*.spec.ts", "**/files/**/*"]
+}
diff --git a/src/lib/schematics/tsconfig.spec.json b/src/lib/schematics/tsconfig.spec.json
index b90b028..9775e29 100644
--- a/src/lib/schematics/tsconfig.spec.json
+++ b/src/lib/schematics/tsconfig.spec.json
@@ -1,13 +1,12 @@
{
- "extends": "../../../tsconfig.json",
- "compilerOptions": {
- "baseUrl": ".",
- "outDir": "./",
- "lib": ["es6", "dom"],
- "module": "commonjs",
- "types": ["jasmine", "hammerjs", "node"]
- },
- "include": ["**/*", "**/*.spec.ts"],
- "exclude": ["*/files/**/*", "*/files/**/**/*"]
- }
-
\ No newline at end of file
+ "extends": "../../../tsconfig.json",
+ "compilerOptions": {
+ "baseUrl": ".",
+ "outDir": "./",
+ "lib": ["es6", "dom"],
+ "module": "commonjs",
+ "types": ["jasmine", "hammerjs", "node"]
+ },
+ "include": ["**/*", "**/*.spec.ts"],
+ "exclude": ["*/files/**/*", "*/files/**/**/*"]
+}
diff --git a/src/lib/theme/icons/teradata-icons.svg b/src/lib/theme/icons/teradata-icons.svg
index 3554067..0d5d12f 100644
--- a/src/lib/theme/icons/teradata-icons.svg
+++ b/src/lib/theme/icons/teradata-icons.svg
@@ -130,7 +130,7 @@