Fix/schematics ng add scss

.github/PULL_REQUEST_TEMPATE.md

@@ -0,0 +1,31 @@
+## Description
+
+<!-- Talk about the great work you've done! -->
+
+### What's included?
+
+<!-- List features included in this PR -->
+
+- One
+- Two
+- Three
+
+#### Test Steps
+
+<!-- Add instructions on how to test your changes -->
+
+- [ ] `npm ci`
+- [ ] In `proxy.conf.js` file, change serverUrl to `https://appcenter.ux.ac.uda.io`
+- [ ] `npm run serve`
+- [ ] then this
+- [ ] finally this
+
+#### General Tests for Every PR
+
+- [ ] `npm run serve:prod` still works.
+- [ ] `npm run tslint` passes.
+- [ ] `npm run stylelint` passes.
+- [ ] `npm test` passes and code coverage is not lower.
+- [ ] `npm run build:lib` still works.
+
+##### Screenshots or link to StackBlitz/Plunker

angular.json

@@ -69,11 +69,13 @@
         "serve": {
           "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
-            "browserTarget": "docs-ui:build"
+            "browserTarget": "docs-ui:build",
+            "proxyConfig": "./proxy.conf.js"
           },
           "configurations": {
             "production": {
-              "browserTarget": "docs-ui:build:production"
+              "browserTarget": "docs-ui:build:production",
+              "proxyConfig": "./proxy.conf.js"
             }
           }
         },

docs/CHANGELOG.md

@@ -1,3 +1,36 @@
+<a name="1.0.0-beta.5"></a>
+
+# [1.0.0-beta.5](https://github.com/Teradata/vantage-ui-platform/compare/v1.0.0-beta.4...v1.0.0-beta.5) (2020-09-03)
+
+### Bug Fixes
+
+- firefox bfCache caching ([#113](https://github.com/Teradata/vantage-ui-platform/issues/113)) ([7b10c04](https://github.com/Teradata/vantage-ui-platform/commit/7b10c04))
+- **app-switcher-close:** close exp panel on menu close, detect changes ([dec8642](https://github.com/Teradata/vantage-ui-platform/commit/dec8642))
+- **app-switcher-close:** more change detection ([ae53957](https://github.com/Teradata/vantage-ui-platform/commit/ae53957))
+- **app-switcher-close:** reverted menu component change detection ([171645c](https://github.com/Teradata/vantage-ui-platform/commit/171645c))
+- **app-switcher-close:** updated demo links ([e09d5a4](https://github.com/Teradata/vantage-ui-platform/commit/e09d5a4))
+- **build:** missing directory ([#118](https://github.com/Teradata/vantage-ui-platform/issues/118)) ([6b437a7](https://github.com/Teradata/vantage-ui-platform/commit/6b437a7))
+- **color:** set body color based on mode ([3409f1f](https://github.com/Teradata/vantage-ui-platform/commit/3409f1f))
+- **query:** update data iinterface ([#111](https://github.com/Teradata/vantage-ui-platform/issues/111)) ([c9e55f7](https://github.com/Teradata/vantage-ui-platform/commit/c9e55f7))
+
+### Features
+
+- **app-switcher:** Allow for open in new tab ([#108](https://github.com/Teradata/vantage-ui-platform/issues/108)) ([20bced8](https://github.com/Teradata/vantage-ui-platform/commit/20bced8))
+- **assets-url-change:** relocated assets service url ([#121](https://github.com/Teradata/vantage-ui-platform/issues/121)) ([01227c8](https://github.com/Teradata/vantage-ui-platform/commit/01227c8))
+- **num-vals-as-str:** result set numeric values as strings ([#106](https://github.com/Teradata/vantage-ui-platform/issues/106)) ([778bddf](https://github.com/Teradata/vantage-ui-platform/commit/778bddf))
+- **nums-as-strings:** define interface for column metadata ([#109](https://github.com/Teradata/vantage-ui-platform/issues/109)) ([89bbca7](https://github.com/Teradata/vantage-ui-platform/commit/89bbca7))
+- **query:** add column types ([#112](https://github.com/Teradata/vantage-ui-platform/issues/112)) ([68ec52e](https://github.com/Teradata/vantage-ui-platform/commit/68ec52e))
+- **vui-user-profile:** add component ([#104](https://github.com/Teradata/vantage-ui-platform/issues/104)) ([8cc090c](https://github.com/Teradata/vantage-ui-platform/commit/8cc090c))
+- add notification node icon ([#119](https://github.com/Teradata/vantage-ui-platform/issues/119)) ([df9aa62](https://github.com/Teradata/vantage-ui-platform/commit/df9aa62))
+- assets service ([#120](https://github.com/Teradata/vantage-ui-platform/issues/120)) ([2740953](https://github.com/Teradata/vantage-ui-platform/commit/2740953))
+- long form small scale styles and markdown update ([#117](https://github.com/Teradata/vantage-ui-platform/issues/117)) ([2e3c114](https://github.com/Teradata/vantage-ui-platform/commit/2e3c114))
+- new icons and icon view ([#116](https://github.com/Teradata/vantage-ui-platform/issues/116)) ([3b608d5](https://github.com/Teradata/vantage-ui-platform/commit/3b608d5))
+- update createsession method with default payload param ([#107](https://github.com/Teradata/vantage-ui-platform/issues/107)) ([36a5b8f](https://github.com/Teradata/vantage-ui-platform/commit/36a5b8f))
+
+### Reverts
+
+- **account-profile:** depracting account-profile for covalent version ([#103](https://github.com/Teradata/vantage-ui-platform/issues/103)) ([f66cf1d](https://github.com/Teradata/vantage-ui-platform/commit/f66cf1d))
+
 <a name="1.0.0-beta.4"></a>
 
 # [1.0.0-beta.4](https://github.com/Teradata/vantage-ui-platform/compare/v1.0.0-beta.3...v1.0.0-beta.4) (2020-06-02)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@td-vantage/ui-platform",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "Teradata Vantage Angular Platform for easy integration and usage",
   "keywords": [
     "teradata",
@@ -111,4 +111,4 @@
     "tsickle": "0.35.0",
     "typescript": "~3.7.5"
   }
-}
+}

proxy.conf.js

@@ -21,6 +21,11 @@ const PROXY_CONFIG = {
     secure: false,
     changeOrigin: true,
   },
+  '/ui-assets': {
+    target: serverUrl,
+    secure: false,
+    changeOrigin: true,
+  },
 };
 
 module.exports = PROXY_CONFIG;

scripts/test-schematics.sh

@@ -10,6 +10,9 @@ npm link
 cd /tmp
 rm -rf testxyz
 ng new testxyz
+cd testxyz
+ng add @angular/material
+ng add @covalent/core 
 
 # Run covalent schematics
 cd testxyz

src/docs-ui/app/app.component.ts

@@ -13,29 +13,29 @@ export class AppComponent {
   products: IVantageAppSwitcherItem[] = [
     {
       text: 'Vantage Launcher',
-      href: 'http://teradata.com',
+      href: 'https://www.teradata.com',
       svgIcon: 'td-logo:logo-mark',
       divider: true,
     },
     {
       text: 'Editor',
-      href: 'http://teradata.com',
+      href: 'https://www.teradata.com',
       icon: 'settings',
     },
     {
       text: 'Analyst',
-      href: 'http://teradata.com',
+      href: 'https://www.teradata.com',
       icon: 'settings',
     },
     {
       text: 'App Center',
-      href: 'http://teradata.com',
+      href: 'https://www.teradata.com',
       newTab: false,
     },
 
     {
       text: 'Console',
-      href: 'http://teradata.com',
+      href: 'https://www.teradata.com',
       icon: 'settings',
       newTab: true,
     },
@@ -44,24 +44,24 @@ export class AppComponent {
   otherProducts: IVantageAppSwitcherItem[] = [
     {
       text: 'Jupyter',
-      href: 'http://teradata.com',
+      href: 'https://www.teradata.com',
       icon: 'settings',
       newTab: true,
     },
     {
       text: 'Something else',
-      href: 'http://teradata.com',
+      href: 'https://www.teradata.com',
       icon: 'settings',
     },
     {
       text: 'Another thing',
-      href: 'http://teradata.com',
+      href: 'https://www.teradata.com',
       icon: 'settings',
       newTab: false,
     },
   ];
 
-  exploreMoreLink: string = 'http://teradata.com/products';
+  exploreMoreLink: string = 'https://www.teradata.com/products';
 
   constructor(
     private _iconRegistry: MatIconRegistry,

src/docs-ui/app/app.module.ts

@@ -38,12 +38,14 @@ import { MatSortModule } from '@angular/material/sort';
 import { MatPaginatorModule } from '@angular/material/paginator';
 
 import { CovalentCommonModule } from '@covalent/core/common';
+import { CovalentDynamicMenuModule } from '@covalent/core/dynamic-menu';
 import { CovalentLayoutModule } from '@covalent/core/layout';
 import { CovalentMessageModule } from '@covalent/core/message';
 import { CovalentLoadingModule } from '@covalent/core/loading';
 import { CovalentDialogsModule } from '@covalent/core/dialogs';
 import { CovalentMediaModule } from '@covalent/core/media';
 import { CovalentBreadcrumbsModule } from '@covalent/core/breadcrumbs';
+import { CovalentJsonFormatterModule } from '@covalent/core/json-formatter';
 
 import { CovalentMarkdownNavigatorModule } from '@covalent/markdown-navigator';
 
@@ -53,6 +55,7 @@ import { VantageUserFeedbackModule } from '@td-vantage/ui-platform/utilities';
 import { VantageUserModule } from '@td-vantage/ui-platform/user';
 import { VantageAuthenticationModule } from '@td-vantage/ui-platform/auth';
 import { VantageAccessModule } from '@td-vantage/ui-platform/access';
+import { VantageAssetsModule } from '@td-vantage/ui-platform/assets';
 import { VantageThemeModule } from '@td-vantage/ui-platform/theme';
 import { VantageSQLEModule } from '@td-vantage/ui-platform/sqle';
 import { VantageAppSwitcherModule } from '@td-vantage/ui-platform/app-switcher';
@@ -123,20 +126,23 @@ import { IconsDemoComponent } from './icons-demo/icons-demo.component';
     MatPaginatorModule,
     /** Covalent Modules */
     CovalentCommonModule,
+    CovalentDynamicMenuModule,
     CovalentLayoutModule,
     CovalentBreadcrumbsModule,
     CovalentMediaModule,
     CovalentDialogsModule,
     CovalentLoadingModule,
     CovalentMessageModule,
     CovalentMarkdownNavigatorModule,
+    CovalentJsonFormatterModule,
     TranslateModule.forRoot(),
     CovalentHttpModule.forRoot(),
 
     VantageUserFeedbackModule,
     VantageUserModule,
     VantageAuthenticationModule,
     VantageAccessModule,
+    VantageAssetsModule,
     VantageThemeModule,
     VantageAppSwitcherModule,
     VantageSQLEModule,

src/docs-ui/app/demos/demos.component.html

@@ -33,6 +33,16 @@ <h4>Connections:</h4>
   </button>
 </div>
 
+<div class="pad">
+  <h2>Assets Module</h2>
+  <h4>Help JSON</h4>
+  <button mat-raised-button (click)="getHelpJSON()">
+    Get
+  </button>
+  <h4 *ngIf="helpJSON">Help Contents:</h4>
+  <td-json-formatter *ngIf="helpJSON" [data]="helpJSON" [levelsOpen]="6"></td-json-formatter>
+</div>
+
 <div class="pad">
   <h2>Utilities Module</h2>
   <h4>Error Dialog</h4>

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<void> = 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;
+    });
+  }
 }

src/lib/app-switcher/app-switcher-menu/app-switcher-menu.component.html

@@ -43,6 +43,7 @@
   </mat-action-list>
   <mat-divider class="push-top-sm"></mat-divider>
   <mat-expansion-panel
+    #expansionPanel
     *ngIf="otherProducts?.length; else explorerMore"
     class="other-products"
     (afterExpand)="scrollToBottom()"

src/lib/app-switcher/app-switcher-menu/app-switcher-menu.component.ts

@@ -1,4 +1,6 @@
-import { ChangeDetectionStrategy, Component, Input, ElementRef } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, ElementRef, ViewChild } from '@angular/core';
+
+import { MatExpansionPanel } from '@angular/material/expansion';
 
 import { IVantageAppSwitcherItem } from '../services/products.service';
 
@@ -13,6 +15,8 @@ export class VantageAppSwitcherMenuComponent {
   @Input() otherProducts: IVantageAppSwitcherItem[];
   @Input() exploreMoreLink: string;
 
+  @ViewChild('expansionPanel') expansionPanel: MatExpansionPanel;
+
   constructor(private elRef: ElementRef) {}
 
   _blockEvent(event: Event): void {

src/lib/app-switcher/app-switcher.component.html

@@ -1,8 +1,9 @@
 <button mat-icon-button [matMenuTriggerFor]="applicationMenu">
   <mat-icon>apps</mat-icon>
 </button>
-<mat-menu #applicationMenu="matMenu" [overlapTrigger]="false">
+<mat-menu #applicationMenu="matMenu" [overlapTrigger]="false" (closed)="menuClosed()">
   <vui-app-switcher-menu
+    #appSwitcherMenu
     [products]="products"
     [otherProducts]="otherProducts"
     [exploreMoreLink]="exploreMoreLink"

src/lib/app-switcher/app-switcher.component.ts

@@ -1,6 +1,7 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, ViewChild, ChangeDetectorRef } from '@angular/core';
 
 import { IVantageAppSwitcherItem } from './services/products.service';
+import { VantageAppSwitcherMenuComponent } from './app-switcher-menu/app-switcher-menu.component';
 
 @Component({
   selector: 'vui-app-switcher',
@@ -12,4 +13,12 @@ export class VantageAppSwitcherComponent {
   @Input() products: IVantageAppSwitcherItem[];
   @Input() otherProducts: IVantageAppSwitcherItem[];
   @Input() exploreMoreLink: string;
+  @ViewChild('appSwitcherMenu', { static: true }) appSwitcherMenu: VantageAppSwitcherMenuComponent;
+
+  constructor(private _changeDetectorRef: ChangeDetectorRef) {}
+
+  menuClosed(): void {
+    this.appSwitcherMenu.expansionPanel.close();
+    this._changeDetectorRef.detectChanges();
+  }
 }

src/lib/assets/assets.module.ts

@@ -0,0 +1,9 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { VANTAGE_ASSETS_PROVIDER } from './assets.service';
+
+@NgModule({
+  imports: [CommonModule],
+  providers: [VANTAGE_ASSETS_PROVIDER],
+})
+export class VantageAssetsModule {}