8000 fix(ui): don't fetch /timeline/filter if you are not connected (#3764) · ovh/cds@8e8adaa · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 8e8adaa

Browse files
bnjjjbnjjj
authored
fix(ui): don't fetch /timeline/filter if you are not connected (#3764)
Signed-off-by: Benjamin Coenen <benjamin.coenen@corp.ovh.com> Linked to a report from [Gitter](https://gitter.im/ovh-cds/Lobby) @ovh/cds
1 parent 7670bba commit 8e8adaa

File tree

4 files changed

+44
-33
lines changed
  • service/timeline
  • views/home

    • 4 files changed

    +44
    -33
    lines changed

    ‎ui/src/app/app.service.ts

    Lines changed: 4 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -36,9 +36,10 @@ export class AppService {
    3636
    private _wfStore: WorkflowStore, private _broadcastStore: BroadcastStore, private _timelineStore: TimelineStore,
    3737
    private _toast: ToastService, private _workflowRunService: WorkflowRunService) {
    3838
    this.routeParams = this._routerService.getRouteParams({}, this._routeActivated);
    39-
    this.filterSub = this._timelineStore.getFilter().subscribe(f => {
    40-
    this.filter = f;
    41-
    });
    39+
    }
    40+
    41+
    initFilter(filter: TimelineFilter) {
    42+
    this.filter = cloneDeep(filter);
    4243
    }
    4344

    4445
    updateRoute(params: {}) {

    ‎ui/src/app/service/timeline/timeline.store.ts

    Lines changed: 7 additions & 7 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,10 +1,10 @@
    1-
    import {Injectable} from '@angular/core';
    2-
    import {List} from 'immutable';
    3-
    import {BehaviorSubject, Observable} from 'rxjs/index';
    4-
    import {map} from 'rxjs/operators';
    5-
    import {Event} from '../../model/event.model';
    6-
    import {TimelineFilter} from '../../model/timeline.model';
    7-
    import {TimelineService} from './timeline.service';
    1+
    import { Injectable } from '@angular/core';
    2+
    import { List } from 'immutable';
    3+
    import { BehaviorSubject, Observable } from 'rxjs/index';
    4+
    import { map } from 'rxjs/operators';
    5+
    import { Event } from '../../model/event.model';
    6+
    import { TimelineFilter } from '../../model/timeline.model';
    7+
    import { TimelineService } from './timeline.service';
    88

    99
    @Injectable()
    1010
    export class TimelineStore {

    ‎ui/src/app/views/home/home.component.ts

    Lines changed: 11 additions & 11 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,12 +1,12 @@
    1-
    import {Component} from '@angular/core';
    2-
    import {Broadcast} from 'app/model/broadcast.model';
    3-
    import {NavbarProjectData} from 'app/model/navbar.model';
    4-
    import {Subscription} from 'rxjs';
    5-
    import {User} from '../../model/user.model';
    6-
    import {AuthentificationStore} from '../../service/auth/authentification.store';
    7-
    import {BroadcastStore} from '../../service/broadcast/broadcast.store';
    8-
    import {NavbarService} from '../../service/navbar/navbar.service';
    9-
    import {AutoUnsubscribe} from '../../shared/decorator/autoUnsubscribe';
    1+
    import { Component } from '@angular/core';
    2+
    import { Broadcast } from 'app/model/broadcast.model';
    3+
    import { NavbarProjectData } from 'app/model/navbar.model';
    4+
    import { Subscription } from 'rxjs';
    5+
    import { User } from '../../model/user.model';
    6+
    import { AuthentificationStore } from '../../service/auth/authentification.store';
    7+
    import { BroadcastStore } from '../../service/broadcast/broadcast.store';
    8+
    import { NavbarService } from '../../service/navbar/navbar.service';
    9+
    import { AutoUnsubscribe } from '../../shared/decorator/autoUnsubscribe';
    1010

    1111
    @Component({
    1212
    selector: 'app-home',
    @@ -26,8 +26,8 @@ export class HomeComponent {
    2626
    _broadcastSub: Subscription;
    2727

    2828
    constructor(
    29-
    private _navbarService: NavbarService,
    30-
    private _broadcastService: BroadcastStore,
    29+
    private _navbarService: NavbarService,
    30+
    private _broadcastService: BroadcastStore,
    3131
    private _authStore: AuthentificationStore
    3232
    ) {
    3333
    this.user = this._authStore.getUser();

    ‎ui/src/app/views/home/timeline/home.timeline.component.ts

    Lines changed: 22 additions & 12 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,12 +1,14 @@
    1-
    import {Component, OnInit} from '@angular/core';
    2-
    import {TranslateService} from '@ngx-translate/core';
    3-
    import {Subscription} from 'rxjs/Subscription';
    4-
    import {Event} from '../../../model/event.model';
    5-
    import {PipelineStatus} from '../../../model/pipeline.model';
    6-
    import {ProjectFilter, TimelineFilter} from '../../../model/timeline.model';
    7-
    import {TimelineStore} from '../../../service/timeline/timeline.store';
    8-
    import {AutoUnsubscribe} from '../../../shared/decorator/autoUnsubscribe'< 6D40 /span>;
    9-
    import {ToastService} from '../../../shared/toast/ToastService';
    1+
    import { Component, OnInit } from '@angular/core';
    2+
    import { TranslateService } from '@ngx-translate/core';
    3+
    import { AppService } from 'app/app.service';
    4+
    import { AuthentificationStore } from 'app/service/services.module';
    5+
    import { Subscription } from 'rxjs/Subscription';
    6+
    import { Event } from '../../../model/event.model';
    7+
    import { PipelineStatus } from '../../../model/pipeline.model';
    8+
    import { ProjectFilter, TimelineFilter } from '../../../model/timeline.model';
    9+
    import { TimelineStore } from '../../../service/timeline/timeline.store';
    10+
    import { AutoUnsubscribe } from '../../../shared/decorator/autoUnsubscribe';
    11+
    import { ToastService } from '../../../shared/toast/ToastService';
    1012

    1113
    @Component({
    1214
    selector: 'app-home-timeline',
    @@ -28,15 +30,23 @@ export class HomeTimelineComponent implements OnInit {
    2830
    filter: TimelineFilter;
    2931
    filterSub: Subscription;
    3032

    31-
    constructor(private _timelineStore: TimelineStore, private _translate: TranslateService,
    32-
    private _toast: ToastService) {
    33+
    constructor(
    34+
    private _authStore: AuthentificationStore,
    35+
    private _appService: AppService,
    36+
    private _timelineStore: TimelineStore,
    37+
    private _translate: TranslateService,
    38+
    private _toast: ToastService
    39+
    ) {
    3340
    this.filter = new TimelineFilter();
    3441
    }
    3542

    3643
    ngOnInit(): void {
    44+
    if (!this._authStore.isConnected) {
    45+
    return;
    46+
    }
    3747
    this.filterSub = this._timelineStore.getFilter().subscribe(f => {
    3848
    this.filter = f;
    39-
    49+
    this._appService.initFilter(this.filter);
    4050
    if (this.timelineSub) {
    4151
    this.timelineSub.unsubscribe();
    4252
    }

    0 commit comments

    Comments
     (0)
    0