Fix 'xxx' is not a function err

Because new version of rxjs you need import function manually, update code to avoid related errors.
Issues #4923 #4904 are caused by this problem.
This commit is contained in:
Deng, Qian 2018-05-15 17:56:33 +08:00
parent 1f7a4f18e5
commit a8025d2b32
9 changed files with 29 additions and 21 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "harbor-ui", "name": "harbor-ui",
"version": "0.7.18-dev.8", "version": "0.7.19-dev.3",
"description": "Harbor shared UI components based on Clarity and Angular4", "description": "Harbor shared UI components based on Clarity and Angular4",
"author": "VMware", "author": "VMware",
"module": "index.js", "module": "index.js",

View File

@ -19,11 +19,15 @@ import {
ChangeDetectionStrategy, ChangeDetectionStrategy,
ChangeDetectorRef ChangeDetectorRef
} from "@angular/core"; } from "@angular/core";
import { Subscription } from "rxjs/Subscription";
import { Observable } from "rxjs/Observable";
import "rxjs/add/observable/forkJoin";
import { TranslateService } from "@ngx-translate/core";
import { Comparator } from "clarity-angular";
import { Endpoint } from "../service/interface"; import { Endpoint } from "../service/interface";
import { EndpointService } from "../service/endpoint.service"; import { EndpointService } from "../service/endpoint.service";
import { TranslateService } from "@ngx-translate/core";
import { ErrorHandler } from "../error-handler/index"; import { ErrorHandler } from "../error-handler/index";
import { ConfirmationMessage } from "../confirmation-dialog/confirmation-message"; import { ConfirmationMessage } from "../confirmation-dialog/confirmation-message";
@ -36,18 +40,14 @@ import {
ConfirmationButtons ConfirmationButtons
} from "../shared/shared.const"; } from "../shared/shared.const";
import { Subscription } from "rxjs/Subscription";
import { CreateEditEndpointComponent } from "../create-edit-endpoint/create-edit-endpoint.component"; import { CreateEditEndpointComponent } from "../create-edit-endpoint/create-edit-endpoint.component";
import { toPromise, CustomComparator } from "../utils"; import { toPromise, CustomComparator } from "../utils";
import { Comparator } from "clarity-angular";
import { import {
BatchInfo, BatchInfo,
BathInfoChanges BathInfoChanges
} from "../confirmation-dialog/confirmation-batch-message"; } from "../confirmation-dialog/confirmation-batch-message";
import { Observable } from "rxjs/Observable";
@Component({ @Component({
selector: "hbr-endpoint", selector: "hbr-endpoint",

View File

@ -25,6 +25,7 @@ import {
SimpleChanges SimpleChanges
} from "@angular/core"; } from "@angular/core";
import { Observable } from "rxjs/Observable"; import { Observable } from "rxjs/Observable";
import "rxjs/add/observable/forkJoin";
import { Comparator } from "clarity-angular"; import { Comparator } from "clarity-angular";
import { TranslateService } from "@ngx-translate/core"; import { TranslateService } from "@ngx-translate/core";

View File

@ -20,7 +20,11 @@ import {
OnDestroy, OnDestroy,
EventEmitter EventEmitter
} from "@angular/core"; } from "@angular/core";
import { Comparator, State } from "clarity-angular";
import { Observable } from "rxjs/Observable";
import { Subscription } from "rxjs/Subscription";
import 'rxjs/add/observable/forkJoin';
import 'rxjs/add/observable/timer';
import { TranslateService } from "@ngx-translate/core"; import { TranslateService } from "@ngx-translate/core";
import { ListReplicationRuleComponent } from "../list-replication-rule/list-replication-rule.component"; import { ListReplicationRuleComponent } from "../list-replication-rule/list-replication-rule.component";
@ -44,12 +48,8 @@ import {
calculatePage calculatePage
} from "../utils"; } from "../utils";
import { Comparator } from "clarity-angular";
import { JobLogViewerComponent } from "../job-log-viewer/index"; import { JobLogViewerComponent } from "../job-log-viewer/index";
import { State } from "clarity-angular";
import { Observable } from "rxjs/Observable";
import { Subscription } from "rxjs/Subscription";
import { import {
ConfirmationTargets, ConfirmationTargets,
ConfirmationButtons, ConfirmationButtons,

View File

@ -12,6 +12,7 @@ import {
} from "@angular/core"; } from "@angular/core";
import { Router } from "@angular/router"; import { Router } from "@angular/router";
import { Observable } from "rxjs/Observable"; import { Observable } from "rxjs/Observable";
import "rxjs/add/observable/forkJoin";
import { TranslateService } from "@ngx-translate/core"; import { TranslateService } from "@ngx-translate/core";
import { Comparator, State } from "clarity-angular"; import { Comparator, State } from "clarity-angular";

View File

@ -2,7 +2,9 @@ import { Observable } from "rxjs/Observable";
import { Injectable, Inject } from "@angular/core"; import { Injectable, Inject } from "@angular/core";
import { Http } from "@angular/http"; import { Http } from "@angular/http";
import "rxjs/add/observable/of"; import "rxjs/add/observable/of";
import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/map';
import 'rxjs/add/observable/throw';
import { SERVICE_CONFIG, IServiceConfig } from "../service.config"; import { SERVICE_CONFIG, IServiceConfig } from "../service.config";
import { Project } from "../project-policy-config/project"; import { Project } from "../project-policy-config/project";
import { ProjectPolicy } from "../project-policy-config/project-policy-config.component"; import { ProjectPolicy } from "../project-policy-config/project-policy-config.component";

View File

@ -21,6 +21,11 @@ import {
ChangeDetectorRef, ChangeDetectorRef,
ElementRef, AfterViewInit ElementRef, AfterViewInit
} from "@angular/core"; } from "@angular/core";
import {Subject} from "rxjs/Subject";
import {Observable} from "rxjs/Observable";
import "rxjs/add/observable/forkJoin";
import { TranslateService } from "@ngx-translate/core";
import { State, Comparator } from "clarity-angular";
import { TagService, VulnerabilitySeverity, RequestQueryParams } from "../service/index"; import { TagService, VulnerabilitySeverity, RequestQueryParams } from "../service/index";
import { ErrorHandler } from "../error-handler/error-handler"; import { ErrorHandler } from "../error-handler/error-handler";
@ -48,14 +53,12 @@ import {
clone, clone,
} from "../utils"; } from "../utils";
import { TranslateService } from "@ngx-translate/core";
import { State, Comparator } from "clarity-angular";
import {CopyInputComponent} from "../push-image/copy-input.component"; import {CopyInputComponent} from "../push-image/copy-input.component";
import {BatchInfo, BathInfoChanges} from "../confirmation-dialog/confirmation-batch-message"; import {BatchInfo, BathInfoChanges} from "../confirmation-dialog/confirmation-batch-message";
import {Observable} from "rxjs/Observable";
import {LabelService} from "../service/label.service"; import {LabelService} from "../service/label.service";
import {Subject} from "rxjs/Subject";
export interface LabelState { export interface LabelState {
iconsShow: boolean; iconsShow: boolean;
label: Label; label: Label;

View File

@ -6,6 +6,8 @@ import {
ChangeDetectorRef, ChangeDetectorRef,
ViewChild ViewChild
} from '@angular/core'; } from '@angular/core';
import { Observable, Subscription } from 'rxjs/Rx';
import "rxjs/add/observable/timer";
import { VULNERABILITY_SCAN_STATUS } from '../utils'; import { VULNERABILITY_SCAN_STATUS } from '../utils';
import { import {
@ -16,7 +18,6 @@ import {
} from '../service/index'; } from '../service/index';
import { ErrorHandler } from '../error-handler/index'; import { ErrorHandler } from '../error-handler/index';
import { toPromise } from '../utils'; import { toPromise } from '../utils';
import { Observable, Subscription } from 'rxjs/Rx';
import { ChannelService } from '../channel/index'; import { ChannelService } from '../channel/index';
import { JobLogViewerComponent } from '../job-log-viewer/index'; import { JobLogViewerComponent } from '../job-log-viewer/index';

View File

@ -32,7 +32,7 @@
"clarity-icons": "^0.10.27", "clarity-icons": "^0.10.27",
"clarity-ui": "^0.10.27", "clarity-ui": "^0.10.27",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"harbor-ui": "0.7.18-dev.8", "harbor-ui": "0.7.19-dev.3",
"intl": "^1.2.5", "intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2", "mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0", "ngx-cookie": "^1.0.0",