-
Notifications
You must be signed in to change notification settings - Fork 148
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 #2449 from Azure/ehamai-master
Merging sprint payload dev -> master
- Loading branch information
Showing
50 changed files
with
4,004 additions
and
823 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
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
2 changes: 2 additions & 0 deletions
2
...Client/src/app/ibiza-feature/deployment-slots-shell/deployment-slots-shell.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,2 @@ | ||
| <busy-state name="site-tabs" cssClass="ibiza-feature"></busy-state> | ||
| <deployment-slots *ngIf="viewInfo" [viewInfoInput]='viewInfo' [swapMode]='swapMode'></deployment-slots> |
Empty file.
25 changes: 25 additions & 0 deletions
25
...ent/src/app/ibiza-feature/deployment-slots-shell/deployment-slots-shell.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,25 @@ | ||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { DeploymentSlotsShellComponent } from './deployment-slots-shell.component'; | ||
|
|
||
| describe('DeploymentSlotsShellComponent', () => { | ||
| let component: DeploymentSlotsShellComponent; | ||
| let fixture: ComponentFixture<DeploymentSlotsShellComponent>; | ||
|
|
||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [DeploymentSlotsShellComponent] | ||
| }) | ||
| .compileComponents(); | ||
| })); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(DeploymentSlotsShellComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should be created', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
42 changes: 42 additions & 0 deletions
42
...arClient/src/app/ibiza-feature/deployment-slots-shell/deployment-slots-shell.component.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,42 @@ | ||
| import { DashboardType } from 'app/tree-view/models/dashboard-type'; | ||
| import { TreeViewInfo, SiteData } from './../../tree-view/models/tree-view-info'; | ||
| import { Component, OnDestroy } from '@angular/core'; | ||
| import { TranslateService } from '@ngx-translate/core'; | ||
| import { ActivatedRoute } from '@angular/router'; | ||
| import { Subject } from 'rxjs/Subject'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-deployment-slots-shell', | ||
| templateUrl: './deployment-slots-shell.component.html', | ||
| styleUrls: ['./deployment-slots-shell.component.scss'] | ||
| }) | ||
| export class DeploymentSlotsShellComponent implements OnDestroy { | ||
| viewInfo: TreeViewInfo<SiteData>; | ||
| swapMode: boolean; | ||
| ngUnsubscribe: Subject<void>; | ||
|
|
||
| constructor(translateService: TranslateService, route: ActivatedRoute) { | ||
| this.ngUnsubscribe = new Subject<void>(); | ||
|
|
||
| route.params | ||
| .takeUntil(this.ngUnsubscribe) | ||
| .subscribe(x => { | ||
| this.viewInfo = { | ||
| resourceId: `/subscriptions/${x['subscriptionId']}/resourceGroups/${x[ | ||
| 'resourceGroup' | ||
| ]}/providers/Microsoft.Web/sites/${x['site']}` + (x['slot'] ? `/slots/${x['slot']}` : ``), | ||
| dashboardType: DashboardType.none, | ||
| node: null, | ||
| data: null | ||
| }; | ||
|
|
||
| if (x['action'] && x['action'] === 'swap') { | ||
| this.swapMode = true; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| ngOnDestroy(): void { | ||
| this.ngUnsubscribe.next(); | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
...gularClient/src/app/ibiza-feature/deployment-slots-shell/deployment-slots-shell.module.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,19 @@ | ||
| import { NgModule, ModuleWithProviders } from '@angular/core'; | ||
| import { DeploymentSlotsShellComponent } from './deployment-slots-shell.component'; | ||
| import { RouterModule } from '@angular/router'; | ||
| import { DeploymentSlotsComponent } from 'app/site/deployment-slots/deployment-slots.component'; | ||
| import { SharedFunctionsModule } from 'app/shared/shared-functions.module'; | ||
| import { SharedModule } from 'app/shared/shared.module'; | ||
| import { TranslateModule } from '@ngx-translate/core'; | ||
| import { DeploymentSlotsModule } from 'app/site/deployment-slots/deployment-slots.module'; | ||
| import 'rxjs/add/operator/takeUntil'; | ||
|
|
||
| const routing: ModuleWithProviders = RouterModule.forChild([{ path: '', component: DeploymentSlotsShellComponent }]); | ||
|
|
||
| @NgModule({ | ||
| entryComponents: [DeploymentSlotsComponent], | ||
| imports: [TranslateModule.forChild(), SharedModule, SharedFunctionsModule, DeploymentSlotsModule, routing], | ||
| declarations: [], | ||
| providers: [] | ||
| }) | ||
| export class DeploymentSlotsShellModule { } |
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
Oops, something went wrong.