-
-
Notifications
You must be signed in to change notification settings - Fork 310
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1740 from altair-graphql/staging
Final Staging
- Loading branch information
Showing
75 changed files
with
1,277 additions
and
752 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| name: Staging | ||
| name: Master | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - staging | ||
| - master | ||
|
|
||
| jobs: | ||
| translate: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
...ges/altair-app/src/app/modules/altair/components/flex-resizer/flex-resizer.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +0,0 @@ | ||
| <app-icon name="more-vertical"></app-icon> | ||
104 changes: 104 additions & 0 deletions
104
...-app/src/app/modules/altair/components/header/__snapshots__/header.component.spec.ts.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`HeaderComponent should render correctly 1`] = ` | ||
| <app-header> | ||
| <div | ||
| class="header__logo-wrapper" | ||
| > | ||
| <img | ||
| alt="logo" | ||
| class="header__logo" | ||
| src="assets/img/logo.svg" | ||
| /> | ||
| </div> | ||
| <app-window-switcher /> | ||
| <div | ||
| class="header__actions" | ||
| > | ||
| <ul | ||
| class="header__menu" | ||
| > | ||
| <li | ||
| class="header__menu-item" | ||
| nz-dropdown="" | ||
| nztrigger="click" | ||
| > | ||
| <span> | ||
| <app-icon | ||
| name="eye-off" | ||
| /> | ||
| <span> | ||
| </span> | ||
| </span> | ||
| </li> | ||
| <nz-dropdown-menu> | ||
| <ul | ||
| class="environments-dropdown__list" | ||
| nz-menu="" | ||
| > | ||
| <li | ||
| nz-menu-item="" | ||
| > | ||
| ... | ||
| </li> | ||
| </ul> | ||
| </nz-dropdown-menu> | ||
| <li | ||
| class="header__menu-item" | ||
| nz-dropdown="" | ||
| nztrigger="click" | ||
| > | ||
| <app-icon | ||
| name="settings" | ||
| /> | ||
| </li> | ||
| <nz-dropdown-menu> | ||
| <ul | ||
| nz-menu="" | ||
| > | ||
| <li | ||
| nz-menu-item="" | ||
| > | ||
| </li> | ||
| <li | ||
| nz-menu-item="" | ||
| > | ||
| </li> | ||
| <li | ||
| nz-menu-item="" | ||
| > | ||
| </li> | ||
| <li | ||
| nz-menu-item="" | ||
| > | ||
| </li> | ||
| <li | ||
| nz-menu-item="" | ||
| > | ||
| </li> | ||
| <li | ||
| nz-menu-item="" | ||
| > | ||
| </li> | ||
| <li | ||
| nz-menu-item="" | ||
| > | ||
| </li> | ||
| </ul> | ||
| </nz-dropdown-menu> | ||
| </ul> | ||
| </div> | ||
| </app-header> | ||
| `; |
122 changes: 122 additions & 0 deletions
122
packages/altair-app/src/app/modules/altair/components/header/header.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| <div | ||
| class="header__logo-wrapper" | ||
| [ngClass]="{ 'header__logo-wrapper--experimental': experimentalEnabled }" | ||
| > | ||
| <img | ||
| src="assets/img/logo.svg" | ||
| alt="logo" | ||
| class="header__logo" | ||
| > | ||
| </div> | ||
|
|
||
| <app-window-switcher | ||
| [windows]="windows" | ||
| [windowIds] = "windowIds" | ||
| [activeWindowId]="activeWindowId" | ||
| [closedWindows]="closedWindows" | ||
| [isElectron]="isElectron" | ||
| (newWindowChange)="newWindowChange.emit($event)" | ||
| (activeWindowChange)="activeWindowChange.emit($event)" | ||
| (removeWindowChange)="removeWindowChange.emit($event)" | ||
| (duplicateWindowChange)="duplicateWindowChange.emit($event)" | ||
| (windowNameChange)="windowNameChange.emit($event)" | ||
| (repositionWindowChange)="repositionWindowChange.emit($event)" | ||
| (reopenClosedWindowChange)="reopenClosedWindowChange.emit($event)" | ||
| ></app-window-switcher> | ||
|
|
||
| <div class="header__actions"> | ||
| <ul class="header__menu"> | ||
| <li | ||
| *ngFor="let panel of headerPanels trackBy:trackById" | ||
| (click)="togglePanelActiveChange.emit(panel)" | ||
| [popper]="panel.title" | ||
| [popperPlacement]="'bottom'" | ||
| class="header__menu-item" | ||
| [ngClass]="{ 'header__menu-item--active': panel.isActive }" | ||
| > | ||
| <app-icon name="cpu"></app-icon> | ||
| <nz-modal | ||
| [nzVisible]="panel.isActive" | ||
| (nzVisibleChange)="togglePanelActiveChange.emit(panel)" | ||
| [nzTitle]="modalTitle" | ||
| [nzContent]="modalContent" | ||
| [nzFooter]="null" | ||
| (nzOnCancel)="togglePanelActiveChange.emit(panel)" | ||
| > | ||
| <ng-template #modalTitle> | ||
| <div class="app-dialog-header"> | ||
| <div class="app-dialog-title">{{ panel.title }}</div> | ||
| </div> | ||
| </ng-template> | ||
|
|
||
| <ng-template #modalContent> | ||
| <app-element-wrapper | ||
| [element]="panel.element" | ||
| ></app-element-wrapper> | ||
| </ng-template> | ||
| </nz-modal> | ||
| </li> | ||
|
|
||
| <li | ||
| nz-dropdown | ||
| nzTrigger="click" | ||
| [nzDropdownMenu]="environmentsMenu" | ||
| class="header__menu-item" | ||
| > | ||
| <span *ngIf="activeEnvironment"> | ||
| <app-icon name="eye"></app-icon> | ||
| <span>{{ activeEnvironment?.title }}</span> | ||
| </span> | ||
| <span *ngIf="activeEnvironment === undefined"> | ||
| <app-icon name="eye-off"></app-icon> | ||
| <span>{{ 'NO_ENVIRONMENT_TEXT' | translate }}</span> | ||
| </span> | ||
| </li> | ||
| <nz-dropdown-menu #environmentsMenu="nzDropdownMenu"> | ||
| <ul nz-menu class="environments-dropdown__list"> | ||
| <ng-container *ngIf="environments?.subEnvironments.length"> | ||
| <li | ||
| nz-menu-item | ||
| (click)="selectActiveEnvironmentChange.emit(environment.id)" | ||
| *ngFor="let environment of environments.subEnvironments; trackBy:trackById;" | ||
| [ngClass]="{ 'active': environment.id === activeEnvironment }" | ||
| > | ||
| {{ environment.title }} | ||
| </li> | ||
| <li | ||
| nz-menu-item | ||
| (click)="selectActiveEnvironmentChange.emit(undefined)" | ||
| > | ||
| {{ 'NO_ENVIRONMENT_TEXT' | translate }} | ||
| </li> | ||
| <li nz-menu-divider></li> | ||
| </ng-container> | ||
| <li | ||
| nz-menu-item | ||
| (click)="toggleEnvironmentManagerChange.emit(true)" | ||
| > | ||
| {{ 'ENVIRONMENTS_BUTTON' | translate }}... | ||
| </li> | ||
| </ul> | ||
| </nz-dropdown-menu> | ||
| <li | ||
| nz-dropdown | ||
| nzTrigger="click" | ||
| [nzDropdownMenu]="settingsMenu" | ||
| class="header__menu-item" | ||
| > | ||
| <app-icon name="settings"></app-icon> | ||
| </li> | ||
| <nz-dropdown-menu #settingsMenu="nzDropdownMenu"> | ||
| <ul nz-menu> | ||
| <li nz-menu-item (click)="importWindowChange.emit()">{{ 'IMPORT_WINDOW_TEXT' | translate }}</li> | ||
| <li nz-menu-item (click)="showImportCurlDialogChange.emit(true)">{{ 'IMPORT_WINDOW_FROM_CURL_TEXT' | translate }}</li> | ||
| <li nz-menu-item (click)="showSettingsDialogChange.emit()">{{ 'SETTINGS_TEXT' | translate }}</li> | ||
| <li nz-menu-item (click)="openLink($event, 'https://github.com/altair-graphql/altair')">{{ 'STAR_ON_GITHUB_TEXT' | translate }}</li> | ||
| <li nz-menu-item (click)="openLink($event, 'https://github.com/altair-graphql/altair/issues/new?template=Bug_report.md')">{{ 'REPORT_BUG_TEXT' | translate }}</li> | ||
| <li nz-menu-item (click)="exportBackupDataChange.emit()">{{ 'EXPORT_BACKUP_DATA_TEXT' | translate }}</li> | ||
| <li nz-menu-item (click)="importBackupDataChange.emit()">{{ 'IMPORT_BACKUP_DATA_TEXT' | translate }}</li> | ||
| </ul> | ||
| </nz-dropdown-menu> | ||
| </ul> | ||
| </div> |
30 changes: 30 additions & 0 deletions
30
packages/altair-app/src/app/modules/altair/components/header/header.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import { NO_ERRORS_SCHEMA } from '@angular/core'; | ||
| import { expect, describe, it } from '@jest/globals'; | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
| import { MockModule } from 'ng-mocks'; | ||
| import { mount, NgxTestWrapper } from '../../../../../testing'; | ||
| import { SharedModule } from '../../modules/shared/shared.module'; | ||
|
|
||
| import { HeaderComponent } from './header.component'; | ||
|
|
||
| describe('HeaderComponent', () => { | ||
| let wrapper: NgxTestWrapper<HeaderComponent>; | ||
|
|
||
| beforeEach(async() => { | ||
| wrapper = await mount({ | ||
| component: HeaderComponent, | ||
| imports: [ | ||
| MockModule(SharedModule), | ||
| ], | ||
| schemas: [ NO_ERRORS_SCHEMA ], | ||
| }); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(wrapper.componentInstance).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should render correctly', () => { | ||
| expect(wrapper.element).toMatchSnapshot(); | ||
| }); | ||
| }); |
Oops, something went wrong.