Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ui): add Storybook #16

Merged
merged 7 commits into from
Jan 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .storybook/addons.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import '@storybook/addon-knobs/register';
5 changes: 5 additions & 0 deletions .storybook/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"extends": "../tsconfig.json",
"exclude": ["../**/test.ts", "../**/*.spec.ts"],
"include": ["../**/*"]
}
11 changes: 11 additions & 0 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Export a function. Accept the base config as the only param.
module.exports = async ({ config, mode }) => {
// `mode` has a value of 'DEVELOPMENT' or 'PRODUCTION'
// You can change the configuration based on that.
// 'PRODUCTION' is used when building the static version of storybook.

// Make whatever fine-grained changes you need

// Return the altered config
return config;
};
57 changes: 57 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,36 @@
"tsConfig": "libs/ui/tsconfig.spec.json",
"setupFile": "libs/ui/src/test-setup.ts"
}
},
"storybook": {
"builder": "@nrwl/storybook:storybook",
"options": {
"uiFramework": "@storybook/angular",
"port": 4400,
"config": {
"configFolder": "libs/ui/.storybook"
}
},
"configurations": {
"ci": {
"quiet": true
}
}
},
"build-storybook": {
"builder": "@nrwl/storybook:build",
"options": {
"uiFramework": "@storybook/angular",
"outputPath": "dist/storybook/ui",
"config": {
"configFolder": "libs/ui/.storybook"
}
},
"configurations": {
"ci": {
"quiet": true
}
}
}
},
"schematics": {
Expand Down Expand Up @@ -208,6 +238,33 @@
}
}
}
},
"ui-e2e": {
"root": "apps/ui-e2e",
"sourceRoot": "apps/ui-e2e/src",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@nrwl/cypress:cypress",
"options": {
"cypressConfig": "apps/ui-e2e/cypress.json",
"tsConfig": "apps/ui-e2e/tsconfig.e2e.json",
"devServerTarget": "ui:storybook"
},
"configurations": {
"production": {
"devServerTarget": "ui:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/ui-e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**", "!apps/ui-e2e/**"]
}
}
}
}
},
"cli": {
Expand Down
13 changes: 13 additions & 0 deletions apps/ui-e2e/cypress.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"baseUrl": "http://localhost:4400",
"chromeWebSecurity": false,
"fileServerFolder": ".",
"fixturesFolder": "./src/fixtures",
"integrationFolder": "./src/integration",
"modifyObstructiveCode": false,
"pluginsFile": "./src/plugins/index",
"screenshotsFolder": "../../dist/cypress/apps/ui-e2e/screenshots",
"supportFile": "./src/support/index.ts",
"video": true,
"videosFolder": "../../dist/cypress/apps/ui-e2e/videos"
}
4 changes: 4 additions & 0 deletions apps/ui-e2e/src/fixtures/example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "Using fixtures to represent data",
"email": "hello@cypress.io"
}
40 changes: 40 additions & 0 deletions apps/ui-e2e/src/integration/menu-bar/menu-bar.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { UiMenuBarConfig } from '@talus/ui';

const menuConfig: UiMenuBarConfig<string> = {
menus: [
{
label: 'Edit',
menuItems: [
{
icon: 'undo',
label: 'Undo',
value: 'undo()',
},
{
icon: 'redo',
label: 'Redo',
value: 'redo()',
},
],
},
],
};

describe('ui', () => {
beforeEach(() =>
cy.visit(
`/iframe.html?id=uimenubarcomponent--primary&knob-menuConfig=${JSON.stringify(menuConfig)}`,
),
);

it('should render all menus/menu-items & and open/close menu', () => {
cy.get('ui-menu-bar').should('exist');

cy.get('.mat-menu-trigger').click();
cy.get('.mat-menu-content').should('have.length', menuConfig.menus.length);
cy.get('.mat-menu-item').should('have.length', menuConfig.menus[0].menuItems.length);

cy.get('.cdk-overlay-backdrop').click();
cy.get('.mat-menu-content').should('not.exist');
});
});
22 changes: 22 additions & 0 deletions apps/ui-e2e/src/plugins/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// ***********************************************************
// This example plugins/index.js can be used to load plugins
//
// You can change the location of this file or turn off loading
// the plugins file with the 'pluginsFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/plugins-guide
// ***********************************************************

// This function is called when a project is opened or re-opened (e.g. due to
// the project's config changing)

const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');

module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config

// Preprocess Typescript
on('file:preprocessor', preprocessTypescript(config));
};
31 changes: 31 additions & 0 deletions apps/ui-e2e/src/support/commands.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// ***********************************************
// This example commands.js 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 {
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) => { ... })
17 changes: 17 additions & 0 deletions apps/ui-e2e/src/support/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// ***********************************************************
// This example support/index.js 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.js using ES2015 syntax:
import './commands';
8 changes: 8 additions & 0 deletions apps/ui-e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"sourceMap": false,
"outDir": "../../dist/out-tsc"
},
"include": ["src/**/*.ts", "src/**/*.js"]
}
7 changes: 7 additions & 0 deletions apps/ui-e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"types": ["cypress", "node"]
},
"include": ["**/*.ts", "**/*.js"]
}
1 change: 1 addition & 0 deletions apps/ui-e2e/tslint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "extends": "../../tslint.json", "rules": {} }
1 change: 1 addition & 0 deletions libs/ui/.storybook/addons.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import '../../../.storybook/addons';
5 changes: 5 additions & 0 deletions libs/ui/.storybook/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { addDecorator, configure } from '@storybook/angular';
import { withKnobs } from '@storybook/addon-knobs';

addDecorator(withKnobs);
configure(require.context('../src/lib', true, /\.stories\.tsx?$/), module);
1 change: 1 addition & 0 deletions libs/ui/.storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
8 changes: 8 additions & 0 deletions libs/ui/.storybook/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"emitDecoratorMetadata": true
},
"exclude": ["../src/test.ts", "../**/*.spec.ts"],
"include": ["../src/**/*"]
}
7 changes: 7 additions & 0 deletions libs/ui/.storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const rootWebpackConfig = require('../../../.storybook/webpack.config');
// Export a function. Accept the base config as the only param.
module.exports = async ({ config, mode }) => {
config = await rootWebpackConfig({ config, mode });

return config;
};
11 changes: 11 additions & 0 deletions libs/ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,14 @@ This library was generated with [Nx](https://nx.dev).
## Running unit tests

Run `ng test ui` to execute the unit tests.

## Storybook

- The [Storybook](https://storybook.js.org/) was generated with
`nx g @nrwl/angular:storybook-configuration ui`.

- Run it with `nx run ui:storybook`

- Run E2E it with `nx run ui-e2e:e2e`

- Watch E2E it with `nx run ui-e2e:e2e --watch`
1 change: 0 additions & 1 deletion libs/ui/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ export * from './lib/menu-bar';
export * from './lib/scene-viewer';
export * from './lib/sidenav-shell';
export * from './lib/toolbar';
export * from './lib/ui.module';
3 changes: 1 addition & 2 deletions libs/ui/src/lib/menu-bar/menu-bar.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { UiMenuBarModule } from '@talus/ui';
import { UiMenuBarComponent } from './menu-bar.component';

Expand Down Expand Up @@ -38,7 +37,7 @@ describe('UiMenuBarComponent', () => {

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [UiMenuBarModule, BrowserAnimationsModule],
imports: [UiMenuBarModule],
}).compileComponents();
}));

Expand Down
35 changes: 35 additions & 0 deletions libs/ui/src/lib/menu-bar/menu-bar.component.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { object } from '@storybook/addon-knobs';
import { UiMenuBarComponent, UiMenuBarConfig } from './menu-bar.component';
import { UiMenuBarModule } from './menu-bar.module';

export default {
title: 'UiMenuBarComponent',
};

export const primary = () => ({
moduleMetadata: {
imports: [UiMenuBarModule],
},
component: UiMenuBarComponent,
props: {
menuConfig: object<UiMenuBarConfig<string>>('menuConfig', {
menus: [
{
label: 'Edit',
menuItems: [
{
icon: 'undo',
label: 'Undo',
value: 'Test undo value',
},
{
icon: 'redo',
label: 'Redo',
value: 'Test redo value',
},
],
},
],
}),
},
});
10 changes: 9 additions & 1 deletion libs/ui/src/lib/menu-bar/menu-bar.module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule, MatIconModule, MatMenuModule, MatToolbarModule } from '@angular/material';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { UiMenuBarComponent } from './menu-bar.component';

@NgModule({
declarations: [UiMenuBarComponent],
imports: [CommonModule, MatButtonModule, MatIconModule, MatMenuModule, MatToolbarModule],
imports: [
BrowserAnimationsModule,
CommonModule,
MatButtonModule,
MatIconModule,
MatMenuModule,
MatToolbarModule,
],
exports: [UiMenuBarComponent],
})
export class UiMenuBarModule {}
14 changes: 0 additions & 14 deletions libs/ui/src/lib/ui.module.spec.ts

This file was deleted.

7 changes: 0 additions & 7 deletions libs/ui/src/lib/ui.module.ts

This file was deleted.

2 changes: 1 addition & 1 deletion libs/ui/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"]
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.stories.ts"]
}
Loading