Merge branch 'main' into fix+value+angle

Author: skjindal93

.github/workflows/publish.yml

@@ -66,3 +66,13 @@ jobs:
         with:
           helm-gcs-repository: ${{ secrets.HELM_GCS_REPOSITORY }}
           helm-gcs-credentials: ${{ secrets.HELM_GCS_CREDENTIALS }}
+
+  publish-release-notes:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+      - uses: hypertrace/github-actions/release-notes@main
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

package-lock.json

@@ -67,7 +67,7 @@
   },
   "devDependencies": {
     "@angular-builders/jest": "^11.0.0",
-    "@angular-devkit/build-angular": "~0.1100.5",
+    "@angular-devkit/build-angular": "~0.1100.7",
     "@angular/cli": "11.0.6",
     "@angular/compiler-cli": "~11.0.2",
     "@angular/language-service": "~11.0.5",
@@ -86,15 +86,15 @@
     "@types/d3-selection": "^1.4.2",
     "@types/d3-shape": "^1.3.1",
     "@types/d3-zoom": "^1.7.5",
-    "@types/jest": "^26.0.19",
+    "@types/jest": "^26.0.20",
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^14.14.14",
     "@types/uuid": "^8.3.0",
     "@types/webpack-env": "^1.14.0",
     "codelyzer": "^6.0.1",
-    "commitizen": "^4.2.1",
+    "commitizen": "^4.2.3",
     "cz-conventional-changelog": "^3.3.0",
-    "husky": "^4.3.7",
+    "husky": "^4.3.8",
     "jest": "^26.6.3",
     "jest-config": "^26.6.3",
     "jest-html-reporter": "^3.2.0",
@@ -108,7 +108,7 @@
     "tslint": "~6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "typescript": "~4.0.5",
-    "typescript-tslint-plugin": "^0.5.5"
+    "typescript-tslint-plugin": "^1.0.1"
   },
   "config": {
     "commitizen": {

package.json

@@ -100,6 +100,7 @@ $font-family: 'Work Sans', sans-serif;
 @mixin link {
   color: $blue-5;
   cursor: pointer;
+  text-decoration-line: none;
 }
 
 @mixin link-hover($isSvg: false) {

projects/assets-library/assets/icons/go.svg

@@ -46,6 +46,7 @@ const iconsRootPath = 'assets/icons';
         { key: IconType.Eye, url: `${iconsRootPath}/eye.svg` },
         { key: IconType.FileCode, url: `${iconsRootPath}/file-code.svg` },
         { key: IconType.Filter, url: `${iconsRootPath}/filter.svg` },
+        { key: IconType.Go, url: `${iconsRootPath}/go.svg` },
         { key: IconType.Helm, url: `${iconsRootPath}/helm.svg` },
         { key: IconType.Hypertrace, url: `${iconsRootPath}/hypertrace.svg` },
         { key: IconType.IpAddress, url: `${iconsRootPath}/ip-address.svg` },

projects/assets-library/assets/styles/_font.scss

@@ -48,6 +48,7 @@ export const enum IconType {
   FileCode = 'svg:file-code',
   Filter = 'svg:filter',
   First = 'first_page',
+  Go = 'svg:go',
   Helm = 'svg:helm',
   Home = 'home',
   Hypertrace = 'svg:hypertrace',

projects/assets-library/src/icons/icon-library.module.ts

@@ -7,6 +7,7 @@ export const enum Color {
   BlueGray4 = '#4b5f77',
   Gray1 = '#f4f5f5',
   Gray2 = '#e1e4e5',
+  Gray4 = '#889499',
   Gray5 = '#657277',
   Gray7 = '#272c2e',
   Gray9 = '#080909',

projects/assets-library/src/icons/icon-type.ts

@@ -1,4 +1,4 @@
-import { TimeDuration } from './time-duration';
+import { TimeDuration, UnitStringType } from './time-duration';
 import { TimeUnit } from './time-unit.type';
 
 describe('Time duration', () => {
@@ -13,6 +13,13 @@ describe('Time duration', () => {
         TimeUnit.Minute
       )
     ).toBe('4h3m');
+    expect(
+      new TimeDuration(4 * 60 * 60 * 1000 + 3 * 60 * 1000 + 5 * 1000 + 689, TimeUnit.Millisecond).toMultiUnitString(
+        TimeUnit.Minute,
+        false,
+        UnitStringType.Long
+      )
+    ).toBe('4 hours 3 minutes');
     expect(
       new TimeDuration(4 * 60 * 60 * 1000 + 5 * 1000 + 689, TimeUnit.Millisecond).toMultiUnitString(TimeUnit.Second)
     ).toBe('4h5s');

projects/common/src/color/color.ts

@@ -16,20 +16,30 @@ export class TimeDuration {
     return this.toMillis() / this.unitInMillis(unit);
   }
 
-  public toMultiUnitString(smallestUnit: ConvertibleTimeUnit = TimeUnit.Second, displayZero: boolean = true): string {
+  public toMultiUnitString(
+    smallestUnit: ConvertibleTimeUnit = TimeUnit.Second,
+    displayZero: boolean = true,
+    unitStringType: UnitStringType = UnitStringType.Short
+  ): string {
     const mostSignificantPortion = this.getMostSignificantUnitOnly();
     const remainingMillis = this.millis - mostSignificantPortion.toMillis();
     if (mostSignificantPortion.getAmountForUnit(smallestUnit) < 1) {
-      return displayZero ? new TimeDuration(0, smallestUnit).toString() : '';
+      return displayZero ? new TimeDuration(0, smallestUnit).toFormattedString(unitStringType) : '';
     }
     if (mostSignificantPortion.unit === smallestUnit || remainingMillis === 0) {
-      return mostSignificantPortion.toString();
+      return mostSignificantPortion.toFormattedString(unitStringType);
     }
 
-    return `${mostSignificantPortion.toString()}${new TimeDuration(
-      remainingMillis,
-      TimeUnit.Millisecond
-    ).toMultiUnitString(smallestUnit, false)}`;
+    const joiningStr = unitStringType === UnitStringType.Long ? ' ' : '';
+
+    return [
+      mostSignificantPortion.toFormattedString(unitStringType),
+      new TimeDuration(remainingMillis, TimeUnit.Millisecond).toMultiUnitString(smallestUnit, false, unitStringType)
+    ].join(joiningStr);
+  }
+
+  private toFormattedString(unitStringType: UnitStringType = UnitStringType.Short): string {
+    return unitStringType === UnitStringType.Short ? this.toString() : this.toLongString();
   }
 
   public getMostSignificantUnitOnly(): TimeDuration {
@@ -141,3 +151,8 @@ type ConvertibleTimeUnit =
   | TimeUnit.Minute
   | TimeUnit.Second
   | TimeUnit.Millisecond;
+
+export enum UnitStringType {
+  Long = 'long',
+  Short = 'short'
+}