From 1cc302df0ad02ddf0dfafff88e1bf79ce01f1de0 Mon Sep 17 00:00:00 2001 From: Ludek <13610612+ludeknovy@users.noreply.github.com> Date: Sat, 20 Feb 2021 20:29:03 +0100 Subject: [PATCH] share test run (#95) --- src/app/_interceptors/error-interceptor.ts | 7 +- src/app/app.module.ts | 8 ++- src/app/auth.guard.ts | 5 ++ .../item-detail/item-detail.component.html | 9 +-- src/app/item-detail/item-detail.component.ts | 17 ++++- .../create-new-share-link.component.css | 3 + .../create-new-share-link.component.html | 33 +++++++++ .../create-new-share-link.component.spec.ts | 32 +++++++++ .../create-new-share-link.component.ts | 67 +++++++++++++++++ .../delete-share-link.component.css | 3 + .../delete-share-link.component.html | 35 +++++++++ .../delete-share-link.component.spec.ts | 32 +++++++++ .../delete-share-link.component.ts | 72 +++++++++++++++++++ src/app/item-detail/share/share.component.css | 10 +++ .../item-detail/share/share.component.html | 63 ++++++++++++++++ .../item-detail/share/share.component.spec.ts | 40 +++++++++++ src/app/item-detail/share/share.component.ts | 50 +++++++++++++ src/app/items-api.service.ts | 22 +++++- src/app/items.service.ts | 7 ++ src/app/notification/notification-messages.ts | 8 +++ .../external-notification.component.ts | 6 +- 21 files changed, 513 insertions(+), 16 deletions(-) create mode 100644 src/app/item-detail/share/create-new-share-link/create-new-share-link.component.css create mode 100644 src/app/item-detail/share/create-new-share-link/create-new-share-link.component.html create mode 100644 src/app/item-detail/share/create-new-share-link/create-new-share-link.component.spec.ts create mode 100644 src/app/item-detail/share/create-new-share-link/create-new-share-link.component.ts create mode 100644 src/app/item-detail/share/delete-share-link/delete-share-link.component.css create mode 100644 src/app/item-detail/share/delete-share-link/delete-share-link.component.html create mode 100644 src/app/item-detail/share/delete-share-link/delete-share-link.component.spec.ts create mode 100644 src/app/item-detail/share/delete-share-link/delete-share-link.component.ts create mode 100644 src/app/item-detail/share/share.component.css create mode 100644 src/app/item-detail/share/share.component.html create mode 100644 src/app/item-detail/share/share.component.spec.ts create mode 100644 src/app/item-detail/share/share.component.ts diff --git a/src/app/_interceptors/error-interceptor.ts b/src/app/_interceptors/error-interceptor.ts index f0f00f0d..8564e701 100644 --- a/src/app/_interceptors/error-interceptor.ts +++ b/src/app/_interceptors/error-interceptor.ts @@ -3,18 +3,21 @@ import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/c import { Observable, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { AuthenticationService } from '../_services/authentication.service'; +import {Router} from '@angular/router'; @Injectable() export class ErrorInterceptor implements HttpInterceptor { - constructor(private authenticationService: AuthenticationService) { } + constructor( + private authenticationService: AuthenticationService, + private router: Router) { } intercept(request: HttpRequest, next: HttpHandler): Observable> { return next.handle(request).pipe(catchError(err => { if (err.status === 401) { // auto logout if 401 response returned from api this.authenticationService.logout(); - // location.reload(true); + this.router.navigate(['login']); } const error = err.error.message || err.statusText; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 526106ec..7f98ea7b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -56,6 +56,9 @@ import { AddNewExternalNotificationComponent } from './scenario/external-notific // tslint:disable-next-line:max-line-length import { DeleteExternalNotificationComponent } from './scenario/external-notification/delete-external-notification/delete-external-notification.component'; import { ItemControlsComponent } from './scenario/item-controls/item-controls.component'; +import { ShareComponent } from './item-detail/share/share.component'; +import { CreateNewShareLinkComponent } from './item-detail/share/create-new-share-link/create-new-share-link.component'; +import { DeleteShareLinkComponent } from './item-detail/share/delete-share-link/delete-share-link.component'; const appRoutes: Routes = [ { path: 'dashboard', component: DashboardComponent, canActivate: [AuthGuard] }, @@ -78,7 +81,7 @@ const appRoutes: Routes = [ }, { path: 'project/:projectName/scenario/:scenarioName/item/:id', component: ItemDetailComponent, - runGuardsAndResolvers: 'always', canActivate: [AuthGuard] + runGuardsAndResolvers: 'always', canActivate: [AuthGuard], }, { path: 'project/:projectName/scenarios', component: ScenariosComponent, @@ -132,6 +135,9 @@ const appRoutes: Routes = [ AddNewExternalNotificationComponent, DeleteExternalNotificationComponent, ItemControlsComponent, + ShareComponent, + CreateNewShareLinkComponent, + DeleteShareLinkComponent, ], imports: [ RouterModule.forRoot( diff --git a/src/app/auth.guard.ts b/src/app/auth.guard.ts index af54acc6..efa7873a 100644 --- a/src/app/auth.guard.ts +++ b/src/app/auth.guard.ts @@ -11,6 +11,11 @@ export class AuthGuard implements CanActivate { ) { } canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { + + const { token } = route.queryParams; + if (token) { + return true; + } if (localStorage.getItem('currentUser')) { // logged in so return true this.authService.setLogin(true); diff --git a/src/app/item-detail/item-detail.component.html b/src/app/item-detail/item-detail.component.html index 94a0da51..8bac28cb 100644 --- a/src/app/item-detail/item-detail.component.html +++ b/src/app/item-detail/item-detail.component.html @@ -1,4 +1,4 @@ - +
  • @@ -15,6 +15,7 @@ [itemDetailData]="{note: itemData.note, environment: itemData.environment, hostname: itemData.hostname, isBase: itemData.isBase, params: itemParams}" (itemDetailChange)="itemDetailChanged($event)"> + @@ -266,7 +267,7 @@
    Request Statistics (click)="resetStatsData()">Remove -
    +
    +
    +
    +
    + +

    +
    +
    + Note +
    + +
    + +
    + +
    + +
    +
    + + + + diff --git a/src/app/item-detail/share/create-new-share-link/create-new-share-link.component.spec.ts b/src/app/item-detail/share/create-new-share-link/create-new-share-link.component.spec.ts new file mode 100644 index 00000000..4f014015 --- /dev/null +++ b/src/app/item-detail/share/create-new-share-link/create-new-share-link.component.spec.ts @@ -0,0 +1,32 @@ +import { HttpClientModule } from '@angular/common/http'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; + +import { CreateNewShareLinkComponent } from './create-new-share-link.component'; + +describe('CreateNewShareLinkComponent', () => { + let component: CreateNewShareLinkComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreateNewShareLinkComponent ], + imports: [ + ReactiveFormsModule, + FormsModule, + HttpClientModule, + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreateNewShareLinkComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/item-detail/share/create-new-share-link/create-new-share-link.component.ts b/src/app/item-detail/share/create-new-share-link/create-new-share-link.component.ts new file mode 100644 index 00000000..adbf4647 --- /dev/null +++ b/src/app/item-detail/share/create-new-share-link/create-new-share-link.component.ts @@ -0,0 +1,67 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { FormControl, Validators, FormGroup } from '@angular/forms'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { of } from 'rxjs'; +import { catchError } from 'rxjs/internal/operators/catchError'; +import { ItemsApiService } from 'src/app/items-api.service'; +import { ItemsService } from 'src/app/items.service'; +import { NotificationMessage } from 'src/app/notification/notification-messages'; +import { ItemParams } from 'src/app/scenario/item-controls/item-controls.model'; + + +@Component({ + selector: 'app-create-new-share-link', + templateUrl: './create-new-share-link.component.html', + styleUrls: ['./create-new-share-link.component.css'] +}) +export class CreateNewShareLinkComponent implements OnInit { + + private note: FormControl; + private newShareLinkForm: FormGroup; + modal: NgbActiveModal; + @Input() params: ItemParams; + + constructor( + private modalService: NgbModal, + private notification: NotificationMessage, + private itemApiService: ItemsApiService, + private itemService: ItemsService + ) { } + + ngOnInit() { + this.createFormControls(); + this.createForm(); + } + + open(content) { + this.modal = this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title' }); + } + + createFormControls() { + this.note = new FormControl('', [ + Validators.maxLength(100), + Validators.required + ]); + } + + createForm() { + this.newShareLinkForm = new FormGroup({ + note: this.note + }); + } + + onSubmit() { + const { note } = this.newShareLinkForm.value; + const { projectName, scenarioName, id } = this.params; + + this.itemApiService.createItemShareToken(projectName, scenarioName, id, { note }) + .pipe(catchError(r => of(r))) + .subscribe(_ => { + const message = this.notification.createItemShareLinkNotification(_); + this.itemApiService.setData(message); + this.itemService.fetchItemShareTokens(projectName, scenarioName, id); + }); + this.newShareLinkForm.reset(); + this.modal.close(); + } +} diff --git a/src/app/item-detail/share/delete-share-link/delete-share-link.component.css b/src/app/item-detail/share/delete-share-link/delete-share-link.component.css new file mode 100644 index 00000000..fa8d599d --- /dev/null +++ b/src/app/item-detail/share/delete-share-link/delete-share-link.component.css @@ -0,0 +1,3 @@ +.revoke { + margin-left: 10px; +} diff --git a/src/app/item-detail/share/delete-share-link/delete-share-link.component.html b/src/app/item-detail/share/delete-share-link/delete-share-link.component.html new file mode 100644 index 00000000..3b5b9006 --- /dev/null +++ b/src/app/item-detail/share/delete-share-link/delete-share-link.component.html @@ -0,0 +1,35 @@ + +
    + + +
    +
    +
    + +

    Please enter 5 random characters to confirm this action:

    +
    +
    + Delete check +
    + +
    + +
    +
    + +
    +
    + +     + + diff --git a/src/app/item-detail/share/delete-share-link/delete-share-link.component.spec.ts b/src/app/item-detail/share/delete-share-link/delete-share-link.component.spec.ts new file mode 100644 index 00000000..33a30555 --- /dev/null +++ b/src/app/item-detail/share/delete-share-link/delete-share-link.component.spec.ts @@ -0,0 +1,32 @@ +import { HttpClientModule } from '@angular/common/http'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; + +import { DeleteShareLinkComponent } from './delete-share-link.component'; + +describe('DeleteShareLinkComponent', () => { + let component: DeleteShareLinkComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DeleteShareLinkComponent ], + imports: [ + ReactiveFormsModule, + FormsModule, + HttpClientModule + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DeleteShareLinkComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/item-detail/share/delete-share-link/delete-share-link.component.ts b/src/app/item-detail/share/delete-share-link/delete-share-link.component.ts new file mode 100644 index 00000000..65646433 --- /dev/null +++ b/src/app/item-detail/share/delete-share-link/delete-share-link.component.ts @@ -0,0 +1,72 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { FormControl, Validators, FormGroup } from '@angular/forms'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { of } from 'rxjs'; +import { catchError } from 'rxjs/operators'; +import { ItemsApiService } from 'src/app/items-api.service'; +import { ItemsService } from 'src/app/items.service'; +import { NotificationMessage } from 'src/app/notification/notification-messages'; +import { ItemParams } from 'src/app/scenario/item-controls/item-controls.model'; + +@Component({ + selector: 'app-delete-share-link', + templateUrl: './delete-share-link.component.html', + styleUrls: ['./delete-share-link.component.css'] +}) +export class DeleteShareLinkComponent implements OnInit { + deleteCheck: FormControl; + deleteShareLinkForm: FormGroup; + modal: NgbModalRef; + + @Input() params: ItemParams; + @Input() tokenId: string; + + constructor( + private modalService: NgbModal, + private itemsApiService: ItemsApiService, + private itemsService: ItemsService, + private notification: NotificationMessage, + ) { } + + ngOnInit(): void { + this.createFormControls(); + this.createForm(); + } + + createFormControls() { + this.deleteCheck = new FormControl('', [ + Validators.required, + Validators.minLength(5) + ]); + } + + createForm() { + this.deleteShareLinkForm = new FormGroup({ + deleteCheck: this.deleteCheck, + }); + } + + open(content) { + this.modal = this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title' }); + } + + onSubmit() { + if (this.deleteShareLinkForm.valid) { + this.itemsApiService.deleteItemShareToken( + this.params.projectName, + this.params.scenarioName, + this.params.id, + this.tokenId + ).subscribe((_) => { + this.itemsService.fetchItemShareTokens(this.params.projectName, this.params.scenarioName, this.params.id); + const message = this.notification.deleteItemShareTokenNotification(_); + this.itemsApiService.setData(message); + }); + + this.deleteShareLinkForm.reset(); + this.modal.close(); + + } + } + +} diff --git a/src/app/item-detail/share/share.component.css b/src/app/item-detail/share/share.component.css new file mode 100644 index 00000000..31667a71 --- /dev/null +++ b/src/app/item-detail/share/share.component.css @@ -0,0 +1,10 @@ +.ellipses { + max-width: 30rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.link { + border: none; +} diff --git a/src/app/item-detail/share/share.component.html b/src/app/item-detail/share/share.component.html new file mode 100644 index 00000000..a6f555b7 --- /dev/null +++ b/src/app/item-detail/share/share.component.html @@ -0,0 +1,63 @@ + +
    + + +
    +
    +
    +

    +
    +
    + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + +
    + Note + Link
    +
    No links created yet.
    +
    + {{_.name}} + + + + + +
    + +
    +
    +
    +
    +
    +
    + +     + + diff --git a/src/app/item-detail/share/share.component.spec.ts b/src/app/item-detail/share/share.component.spec.ts new file mode 100644 index 00000000..e55f5d11 --- /dev/null +++ b/src/app/item-detail/share/share.component.spec.ts @@ -0,0 +1,40 @@ +import { HttpClientModule } from '@angular/common/http'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { DataTableModule } from '@rushvora/ng-datatable'; +import { CreateNewShareLinkComponent } from './create-new-share-link/create-new-share-link.component'; +import { DeleteShareLinkComponent } from './delete-share-link/delete-share-link.component'; + +import { ShareComponent } from './share.component'; + +describe('ShareComponent', () => { + let component: ShareComponent; + let fixture: ComponentFixture; + + + + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ShareComponent, CreateNewShareLinkComponent, DeleteShareLinkComponent ], + imports: [ + ReactiveFormsModule, + FormsModule, + HttpClientModule, + DataTableModule + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ShareComponent); + component = fixture.componentInstance; + component.params = { projectName: 'project', scenarioName: 'scenario', 'id': 'id'}; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/item-detail/share/share.component.ts b/src/app/item-detail/share/share.component.ts new file mode 100644 index 00000000..29fe7391 --- /dev/null +++ b/src/app/item-detail/share/share.component.ts @@ -0,0 +1,50 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { FormGroup } from '@angular/forms'; +import { Router } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Observable } from 'rxjs'; +import { ItemsService } from 'src/app/items.service'; +import { ItemParams } from 'src/app/scenario/item-controls/item-controls.model'; + +@Component({ + selector: 'app-share', + templateUrl: './share.component.html', + styleUrls: ['./share.component.css'] +}) +export class ShareComponent implements OnInit { + + shareForm: FormGroup; + shareTokens$: Observable<[]>; + selfUrl: string; + + @Input() params: ItemParams; + + constructor( + private modalService: NgbModal, + private itemService: ItemsService, + ) { + this.shareTokens$ = itemService.shareTokens$; + + } + + ngOnInit() { + this.selfUrl = window.location.href; + this.createForm(); + this.itemService.fetchItemShareTokens(this.params.projectName, this.params.scenarioName, this.params.id); + } + + createForm() { + this.shareForm = new FormGroup({}); + } + + open(content) { + this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title', size: 'xl' as any }); + } + + copyInputMessage(inputElement) { + inputElement.select(); + document.execCommand('copy'); + inputElement.setSelectionRange(0, 0); + } + +} diff --git a/src/app/items-api.service.ts b/src/app/items-api.service.ts index a194c35b..dfc36ff7 100644 --- a/src/app/items-api.service.ts +++ b/src/app/items-api.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; import { Observable, BehaviorSubject } from 'rxjs'; import { ItemDetail, Items } from './items.service.model'; @@ -15,9 +15,10 @@ export class ItemsApiService { constructor(private http: HttpClient) { } - fetchItemDetail(projectName: string, scenarioName: string, itemId: string): Observable { + fetchItemDetail(projectName: string, scenarioName: string, itemId: string, params?): Observable { return this.http.get( - `projects/${projectName}/scenarios/${scenarioName}/items/${itemId}`); + `projects/${projectName}/scenarios/${scenarioName}/items/${itemId}`, + { params }); } updateItemInfo(itemId, projectName, scenarioName, body): Observable<{}> { @@ -78,4 +79,19 @@ export class ItemsApiService { fetchProcessingItems(projectName, scenarioName): Observable<[]> { return this.http.get<[]>(`projects/${projectName}/scenarios/${scenarioName}/processing-items`); } + + fetchItemShareTokens(projectName, scenarioName, itemId): Observable<[]> { + return this.http.get<[]>(`projects/${projectName}/scenarios/${scenarioName}/items/${itemId}/share-tokens`); + } + + createItemShareToken(projectName, scenarioName, itemId, body: { note?: string }): Observable> { + return this.http.post<{ token: string }>(`projects/${projectName}/scenarios/${scenarioName}/items/${itemId}/share-tokens`, body, { + observe: 'response' + }); + } + + deleteItemShareToken(projectName, scenarioName, itemId, id): Observable> { + return this.http.delete<{}>(`projects/${projectName}/scenarios/${scenarioName}/items/${itemId}/share-tokens/${id}`, + { observe: 'response' }); + } } diff --git a/src/app/items.service.ts b/src/app/items.service.ts index d33e0a3b..88bf6051 100644 --- a/src/app/items.service.ts +++ b/src/app/items.service.ts @@ -16,6 +16,9 @@ export class ItemsService { private items = new BehaviorSubject({ name, data: [], total: 0 }); public items$ = this.items.asObservable(); + private shareTokens = new BehaviorSubject<[]>([]); + public shareTokens$ = this.shareTokens.asObservable(); + constructor( private itemsApiService: ItemsApiService ) { } @@ -36,4 +39,8 @@ export class ItemsService { }); } + fetchItemShareTokens(projectName, scenarioName, itemId) { + this.itemsApiService.fetchItemShareTokens(projectName, scenarioName, itemId).subscribe((_) => this.shareTokens.next(_)); + } + } diff --git a/src/app/notification/notification-messages.ts b/src/app/notification/notification-messages.ts index 821c7090..73a4f632 100644 --- a/src/app/notification/notification-messages.ts +++ b/src/app/notification/notification-messages.ts @@ -70,6 +70,14 @@ export class NotificationMessage { return this.statusCodeMessage(response, 'Notification has been created'); } + createItemShareLinkNotification(response) { + return this.statusCodeMessage(response, 'Link was created'); + } + + deleteItemShareTokenNotification(response) { + return this.statusCodeMessage(response, 'Link was deleted'); + } + private statusCodeMessage(response, succesMessgae) { let message = { success: false, message: `Something went wrong` }; if (response.status >= 200 && response.status < 300) { diff --git a/src/app/scenario/external-notification/external-notification.component.ts b/src/app/scenario/external-notification/external-notification.component.ts index 99fbaf2b..da049320 100644 --- a/src/app/scenario/external-notification/external-notification.component.ts +++ b/src/app/scenario/external-notification/external-notification.component.ts @@ -1,8 +1,7 @@ -import {Component, Input, OnInit} from '@angular/core'; -import {FormControl, FormGroup, Validators} from '@angular/forms'; +import {Component, OnInit} from '@angular/core'; +import { FormGroup } from '@angular/forms'; import {ActivatedRoute} from '@angular/router'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; -import {ScenarioApiService} from '../../scenario-api.service'; import {ScenarioNotifications} from '../../items.service.model'; import { ScenarioService } from 'src/app/scenario.service'; import { Observable } from 'rxjs'; @@ -23,7 +22,6 @@ export class ExternalNotificationComponent implements OnInit { constructor( private route: ActivatedRoute, private modalService: NgbModal, - private scenarioApiService: ScenarioApiService, private scenarioService: ScenarioService ) { this.notifications$ = this.scenarioService.notifications$;