upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 18:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix URL hardcode on replication service

Browse Source 
Url hardcoded in replication service. This commit is to fix it.
This commit is contained in:
Deng, Qian 2018-05-02 14:09:12 +08:00
parent 4c192ae71f
commit 8d79747085
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_ng/lib/package.json
View File

@ -1,6 +1,6 @@
{
"name": "harbor-ui",
"version": "0.7.10",
"version": "0.7.13",
"description": "Harbor shared UI components based on Clarity and Angular4",
"scripts": {
"start": "ng serve --host 0.0.0.0 --port 4500 --proxy-config proxy.config.json",

2
src/ui_ng/lib/pkg/package.json
View File

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

4
src/ui_ng/lib/src/harbor-library.module.ts
View File

@ -75,14 +75,16 @@ export const DefaultServiceConfig: IServiceConfig = {
repositoryBaseEndpoint: "/api/repositories",
logBaseEndpoint: "/api/logs",
targetBaseEndpoint: "/api/targets",
replicationBaseEndpoint: "/api/replications",
replicationRuleEndpoint: "/api/policies/replication",
replicationJobEndpoint: "/api/jobs/replication",
vulnerabilityScanningBaseEndpoint: "/api/repositories",
projectPolicyEndpoint: "/api/projects/configs",
projectBaseEndpoint: "/api/projects",
enablei18Support: false,
defaultLang: DEFAULT_LANG,
langCookieKey: DEFAULT_LANG_COOKIE_KEY,
supportedLangs: DEFAULT_SUPPORTING_LANGS,
defaultLang: DEFAULT_LANG,
langMessageLoader: "local",
langMessagePathForHttpLoader: "i18n/langs/",
langMessageFileSuffixForHttpLoader: "-lang.json",

5
src/ui_ng/lib/src/service.config.ts
View File

@ -50,6 +50,11 @@ export interface IServiceConfig {
*/
targetBaseEndpoint?: string;
/**
* The base endpoint of the service used to handle the replications.
*/
replicationBaseEndpoint?: string;
/**
* The base endpoint of the service used to handle the replication rules.
* Replication rule related endpoints will be built based on this endpoint.

8
src/ui_ng/lib/src/service/replication.service.ts
View File

@ -149,11 +149,9 @@ export class ReplicationDefaultService extends ReplicationService {
@Inject(SERVICE_CONFIG) config: IServiceConfig
) {
super();
this._ruleBaseUrl = config.replicationRuleEndpoint ?
config.replicationRuleEndpoint : '/api/policies/replication';
this._jobBaseUrl = config.replicationJobEndpoint ?
config.replicationJobEndpoint : '/api/jobs/replication';
this._replicateUrl = '/api/replications';
this._ruleBaseUrl = config.replicationRuleEndpoint ? config.replicationRuleEndpoint : '/api/policies/replication';
this._jobBaseUrl = config.replicationJobEndpoint ? config.replicationJobEndpoint : '/api/jobs/replication';
this._replicateUrl = config.replicationBaseEndpoint ? config.replicationBaseEndpoint : '/api/replications';
}
//Private methods

2
src/ui_ng/package.json
View File

@ -30,7 +30,7 @@
"clarity-icons": "^0.10.27",
"clarity-ui": "^0.10.27",
"core-js": "^2.4.1",
"harbor-ui": "0.7.12",
"harbor-ui": "0.7.13",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",