Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 'xxx' is not a function err #4977

Merged
merged 1 commit into from
May 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
  • Loading branch information
ninjadq committed May 16, 2018
commit a8025d2b328fcc780f1518d1eb3ccd98d56fc287
2 changes: 1 addition & 1 deletion src/ui_ng/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"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",
"author": "VMware",
"module": "index.js",
Expand Down
14 changes: 7 additions & 7 deletions src/ui_ng/lib/src/endpoint/endpoint.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ import {
ChangeDetectionStrategy,
ChangeDetectorRef
} 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 { EndpointService } from "../service/endpoint.service";

import { TranslateService } from "@ngx-translate/core";

import { ErrorHandler } from "../error-handler/index";

import { ConfirmationMessage } from "../confirmation-dialog/confirmation-message";
Expand All @@ -36,18 +40,14 @@ import {
ConfirmationButtons
} from "../shared/shared.const";

import { Subscription } from "rxjs/Subscription";

import { CreateEditEndpointComponent } from "../create-edit-endpoint/create-edit-endpoint.component";

import { toPromise, CustomComparator } from "../utils";

import { Comparator } from "clarity-angular";
import {
BatchInfo,
BathInfoChanges
} from "../confirmation-dialog/confirmation-batch-message";
import { Observable } from "rxjs/Observable";


@Component({
selector: "hbr-endpoint",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
SimpleChanges
} from "@angular/core";
import { Observable } from "rxjs/Observable";
import "rxjs/add/observable/forkJoin";
import { Comparator } from "clarity-angular";
import { TranslateService } from "@ngx-translate/core";

Expand Down
12 changes: 6 additions & 6 deletions src/ui_ng/lib/src/replication/replication.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ import {
OnDestroy,
EventEmitter
} 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 { ListReplicationRuleComponent } from "../list-replication-rule/list-replication-rule.component";
Expand All @@ -44,12 +48,8 @@ import {
calculatePage
} from "../utils";

import { Comparator } from "clarity-angular";

import { JobLogViewerComponent } from "../job-log-viewer/index";
import { State } from "clarity-angular";
import { Observable } from "rxjs/Observable";
import { Subscription } from "rxjs/Subscription";

import {
ConfirmationTargets,
ConfirmationButtons,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from "@angular/core";
import { Router } from "@angular/router";
import { Observable } from "rxjs/Observable";
import "rxjs/add/observable/forkJoin";
import { TranslateService } from "@ngx-translate/core";
import { Comparator, State } from "clarity-angular";

Expand Down
4 changes: 3 additions & 1 deletion src/ui_ng/lib/src/service/project.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import { Observable } from "rxjs/Observable";
import { Injectable, Inject } from "@angular/core";
import { Http } from "@angular/http";
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 { Project } from "../project-policy-config/project";
import { ProjectPolicy } from "../project-policy-config/project-policy-config.component";
Expand Down
11 changes: 7 additions & 4 deletions src/ui_ng/lib/src/tag/tag.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ import {
ChangeDetectorRef,
ElementRef, AfterViewInit
} 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 { ErrorHandler } from "../error-handler/error-handler";
Expand Down Expand Up @@ -48,14 +53,12 @@ import {
clone,
} from "../utils";

import { TranslateService } from "@ngx-translate/core";

import { State, Comparator } from "clarity-angular";
import {CopyInputComponent} from "../push-image/copy-input.component";
import {BatchInfo, BathInfoChanges} from "../confirmation-dialog/confirmation-batch-message";
import {Observable} from "rxjs/Observable";

import {LabelService} from "../service/label.service";
import {Subject} from "rxjs/Subject";

export interface LabelState {
iconsShow: boolean;
label: Label;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {
ChangeDetectorRef,
ViewChild
} from '@angular/core';
import { Observable, Subscription } from 'rxjs/Rx';
import "rxjs/add/observable/timer";

import { VULNERABILITY_SCAN_STATUS } from '../utils';
import {
Expand All @@ -16,7 +18,6 @@ import {
} from '../service/index';
import { ErrorHandler } from '../error-handler/index';
import { toPromise } from '../utils';
import { Observable, Subscription } from 'rxjs/Rx';
import { ChannelService } from '../channel/index';
import { JobLogViewerComponent } from '../job-log-viewer/index';

Expand Down
2 changes: 1 addition & 1 deletion src/ui_ng/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"clarity-icons": "^0.10.27",
"clarity-ui": "^0.10.27",
"core-js": "^2.4.1",
"harbor-ui": "0.7.18-dev.8",
"harbor-ui": "0.7.19-dev.3",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",
Expand Down