Merge pull request #483 from hubmapconsortium/develop

Develop

apps/ccf-eui/src/app/modules/filters/filters-popover/filters-popover.component.scss

@@ -24,7 +24,7 @@
   &.visible {
     border-width: 1px;
     padding: 2rem;
-    width: 47.5rem;
+    width: 56.5rem;
     height: 40rem;
     transition: all 0.2s ease-in-out 0s;
 

apps/ccf-eui/src/app/modules/filters/filters-popover/filters-popover.component.ts

@@ -67,7 +67,7 @@ export class FiltersPopoverComponent {
     if (!this.filtersVisible) {
       return '0rem';
     } else {
-      return `${this.spatialSearchFilters.length > 0 ? 43 + this.spatialSearchFilters.length * 3 : 40}rem`;
+      return `${this.spatialSearchFilters.length > 0 ? 44 + this.spatialSearchFilters.length * 3 : 41}rem`;
     }
   }
 

apps/ccf-eui/src/app/shared/components/button-toggle/button-toggle.component.html

@@ -1,4 +1,11 @@
-<mat-button-toggle-group class="toggleGroup" name="menuOptions" aria-label="menuOptions" multiple appearance="standard">
+<mat-button-toggle-group
+  class="toggleGroup"
+  name="menuOptions"
+  aria-label="menuOptions"
+  appearance="standard"
+  multiple
+  hideMultipleSelectionIndicator
+>
   <mat-button-toggle
     [class.button-selected]="isItemSelected(item)"
     *ngFor="let item of menuOptions; let i = index"

apps/ccf-eui/src/app/shared/components/checkbox/checkbox.component.scss

@@ -16,7 +16,7 @@
 
   &.three {
     .option {
-      width: 14.375rem;
+      width: 16.375rem;
     }
   }
 

apps/ccf-eui/src/app/shared/components/dropdown/dropdown.component.html

@@ -13,11 +13,13 @@
       disableRipple="true"
       hideSingleSelectionIndicator="true"
     >
-      <mat-option *ngFor="let option of options" [value]="option">
-        <div class="{{ optionsVisible }}">
-          {{ option }}
-        </div>
-      </mat-option>
+      @for (option of options; track option) {
+        <mat-option [value]="option">
+          <div class="{{ optionsVisible }}">
+            {{ option }}
+          </div>
+        </mat-option>
+      }
     </mat-select>
   </mat-form-field>
 </div>

apps/ccf-eui/src/app/shared/components/dropdown/dropdown.component.spec.ts

@@ -13,7 +13,7 @@ describe('DropdownComponent', () => {
   it('should provide the current value to mat-select', async () => {
     const { findComponent } = await shallow.render({ bind: { selection: 'one' } });
     const matSelect = findComponent(MatSelect);
-    expect(matSelect.value).toBe('one');
+    expect(matSelect.value).toBe('One');
   });
 
   it('should open options if clicked', async () => {

apps/ccf-eui/src/app/shared/components/dropdown/dropdown.component.ts

@@ -1,4 +1,12 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
 import { GoogleAnalyticsService } from 'ngx-google-analytics';
 
 /**
@@ -10,7 +18,7 @@ import { GoogleAnalyticsService } from 'ngx-google-analytics';
   styleUrls: ['./dropdown.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DropdownComponent {
+export class DropdownComponent implements OnChanges {
   /**
    * What the component is selecting for.
    */
@@ -43,6 +51,12 @@ export class DropdownComponent {
    */
   constructor(private readonly ga: GoogleAnalyticsService) {}
 
+  ngOnChanges(changes: SimpleChanges) {
+    if ('selection' in changes) {
+      this.selectionChanged(this.selection.replace(/^./, this.selection[0].toUpperCase()));
+    }
+  }
+
   /**
    * Controls fade-in effect after dropdown menu opens
    */

apps/cde-visualization-wc-e2e/.eslintrc.json

@@ -0,0 +1,10 @@
+{
+  "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

apps/cde-visualization-wc-e2e/cypress.config.ts

@@ -0,0 +1,7 @@
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
+
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  e2e: { ...nxE2EPreset(__filename, { cypressDir: 'src' }), baseUrl: 'http://localhost:4200' },
+});

apps/cde-visualization-wc-e2e/project.json

@@ -0,0 +1,29 @@
+{
+  "name": "cde-visualization-wc-e2e",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "sourceRoot": "apps/cde-visualization-wc-e2e/src",
+  "tags": [],
+  "implicitDependencies": ["cde-visualization-wc"],
+  "targets": {
+    "e2e": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/cde-visualization-wc-e2e/cypress.config.ts",
+        "testingType": "e2e",
+        "devServerTarget": "cde-visualization-wc:serve:development"
+      },
+      "configurations": {
+        "production": {
+          "devServerTarget": "cde-visualization-wc:serve:production"
+        },
+        "ci": {
+          "devServerTarget": "cde-visualization-wc:serve-static"
+        }
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    }
+  }
+}

apps/cde-visualization-wc-e2e/src/e2e/app.cy.ts

@@ -0,0 +1,13 @@
+import { getGreeting } from '../support/app.po';
+
+describe('cde-visualization-wc-e2e', () => {
+  beforeEach(() => cy.visit('/'));
+
+  it('should display welcome message', () => {
+    // Custom command example, see `../support/commands.ts` file
+    cy.login('my-email@something.com', 'myPassword');
+
+    // Function helper example, see `../support/app.po.ts` file
+    getGreeting().contains(/Welcome/);
+  });
+});

apps/cde-visualization-wc-e2e/src/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

apps/cde-visualization-wc-e2e/src/support/app.po.ts

@@ -0,0 +1 @@
+export const getGreeting = () => cy.get('h1');

apps/cde-visualization-wc-e2e/src/support/commands.ts

@@ -0,0 +1,35 @@
+/// <reference types="cypress" />
+
+// ***********************************************
+// This example commands.ts shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+declare namespace Cypress {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  interface Chainable<Subject> {
+    login(email: string, password: string): void;
+  }
+}
+
+// -- This is a parent command --
+Cypress.Commands.add('login', (email, password) => {
+  console.log('Custom command example: Login', email, password);
+});
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

apps/cde-visualization-wc-e2e/src/support/e2e.ts

@@ -0,0 +1,17 @@
+// ***********************************************************
+// This example support/e2e.ts is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.ts using ES2015 syntax:
+import './commands';

apps/cde-visualization-wc-e2e/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["cypress", "node"],
+    "sourceMap": false,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["**/*.ts", "**/*.js", "cypress.config.ts", "**/*.cy.ts", "**/*.cy.js", "**/*.d.ts"]
+}

apps/cde-visualization-wc/.eslintrc.json

@@ -0,0 +1,33 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
+      "rules": {
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "cde",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "cde",
+            "style": "kebab-case"
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.html"],
+      "extends": ["plugin:@nx/angular-template"],
+      "rules": {}
+    }
+  ]
+}

apps/cde-visualization-wc/jest.config.ts

@@ -0,0 +1,22 @@
+/* eslint-disable */
+export default {
+  displayName: 'cde-visualization-wc',
+  preset: '../../jest.preset.cjs',
+  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
+  coverageDirectory: '../../coverage/apps/cde-visualization-wc',
+  transform: {
+    '^.+\\.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
+  snapshotSerializers: [
+    'jest-preset-angular/build/serializers/no-ng-attributes',
+    'jest-preset-angular/build/serializers/ng-snapshot',
+    'jest-preset-angular/build/serializers/html-comment',
+  ],
+};