Commit Graph

395 Commits

Author SHA1 Message Date
Mia ZHOU
709406eb75
Merge pull request #7705 from pureshine/modify-override
Modify the tooltip of the override
2019-05-08 13:57:45 +08:00
Mia ZHOU
3604765d8a
Merge pull request #7715 from pureshine/cannot-save
Fix unable to save after entering invalid cron and then switching back to other schedules
2019-05-08 13:57:00 +08:00
jwangyangls
f4f2278805
Merge pull request #7712 from jwangyangls/oidc_like_ldap
Fix “Delete” and "Reset Password" should be hidden in user management page;forget Password should be hidden when oidc mode;
2019-05-08 11:01:19 +08:00
jwangyangls
37c024621e
Merge pull request #7713 from jwangyangls/fix_configration_bug
Move redirectUrl tip,fix pattern with endpoint,fix incorrect tip message for invalid input of OIDC scope
2019-05-08 10:57:58 +08:00
jwangyangls
e510e5062b
Merge pull request #7714 from jwangyangls/fix_error_message_bug
Fix create project error show in modal;resolve the different color of notification in UI.
2019-05-08 10:55:00 +08:00
FangyuanCheng
a34f99cae4 Fix unable to save after entering invalid cron and then switching back to other schedules
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-08 10:48:48 +08:00
Mia ZHOU
2b5c511c76
Merge pull request #7654 from jwangyangls/remove_required_when_oidc_mode
Remove required  from filed "First and last name" on the OIDC user profile page
2019-05-08 10:06:05 +08:00
Yogi_Wang
0fbc5af2c9 Fix create project error show in modal;resolve the different color of notification in UI.
fix create project error show in modal;resolve the different color of notification in UI.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 03:15:22 +08:00
Yogi_Wang
f14e9c9d52 Fix “Delete” and "Reset Password" should be hidden in user management page;forget Password should be hidden when oidc mode;
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 01:40:32 +08:00
Yogi_Wang
af0a8355eb Remove required from filed "First and last name" on the OIDC user profile page,fix email username cannot save in profile
remove required  from filed "First and last name" on the OIDC user profile page.
fix email username cannot save in profile

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 01:24:18 +08:00
Yogi_Wang
6d0c2f51f3 Move redirectUrl tip,fix pattern with endpoint,fix incorrect tip message for invalid input of OIDC scope
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 00:43:44 +08:00
FangyuanCheng
8d30d24edd Modify the tooltip of the override
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-07 17:58:59 +08:00
Mia ZHOU
09c5f9cfc8
Merge pull request #7663 from pureshine/fix-replication-bug
Fix will not get filter and trigger when switching from push to pull
2019-05-07 13:00:06 +08:00
FangyuanCheng
3d43f3fefe Fix wrong data displayed when editing replication rule in a certain sequence.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-07 11:59:05 +08:00
jwangyangls
a58fb7086d
Merge pull request #7651 from jwangyangls/updateLibPackage
Update lib/package.json
2019-05-07 10:46:42 +08:00
jwangyangls
42e3a506d9
Merge pull request #7653 from jwangyangls/fix_auth_mode_click_error
Modify auth mode icon to jump to a new page only in OIDC mode
2019-05-07 10:42:48 +08:00
Fangyuan Cheng
0988a38e84
Merge pull request #7641 from pureshine/cron-validator
Remove the frontend check of cron
2019-05-06 20:52:00 +08:00
Yogi_Wang
783b6e3aea Modify auth mode icon to jump to a new page only in OIDC mode
for 7622: click the icon of auth mode when value is database in configuration page will go to a wrong pagee

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-06 19:20:33 +08:00
Yogi_Wang
af24cbfa57 Update lib/package.json,update part of dependencies in app/package.json
1.from 6.xxx to 7.xxx
2.update part of dependencies in app/package.json that it eliminate warning when npm install
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-06 18:30:28 +08:00
FangyuanCheng
10d96f6a2b Remove validator
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-06 17:14:42 +08:00
Fangyuan Cheng
26799fc7f4
Merge pull request #7646 from pureshine/fix-replicate-bug
Fix failed to get filter data when switching replication mode
2019-05-06 16:18:46 +08:00
jwangyangls
c22e8008f0
Merge pull request #7618 from jwangyangls/fix_slide_failure_handling
Change request mode specified as API acquisition
2019-05-06 16:06:22 +08:00
Yogi_Wang
a6e1ff33be Change request mode specified as API acquisition
change request mode specified as API acquisition.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-06 14:17:29 +08:00
FangyuanCheng
0653ab6216 Fix failed to get filter data when switching replication mode
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-06 13:22:43 +08:00
Mia ZHOU
f85870511d
Merge pull request #7599 from pureshine/hide-endtime
Display '-' if the end_time does not exist
2019-04-30 14:28:27 +08:00
FangyuanCheng
1b930ad149 Display - if the end_time does not exist
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-30 13:39:17 +08:00
Fangyuan Cheng
0979e56ae5
Merge pull request #7596 from pureshine/add-cron-tip
Add tooltip for cron string
2019-04-30 12:33:00 +08:00
FangyuanCheng
73e6b8cf56 Add tooltip for cron string
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-30 11:42:55 +08:00
Yogi_Wang
289f2230d7 Add OIDC Redirect url on configration and fix delete repository bug and fix operation refresh bug
1. add OIDC Redirect url on configration.
2. fix delete repository bug.
3. fix operation refresh bug when user Appears when the refresh button is clicked on replicate.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-30 11:06:31 +08:00
Daniel Jiang
2ca5e04904
Merge pull request #7053 from JoeWrightss/patch-2
Fix some misspells in file
2019-04-29 18:40:00 +08:00
Fangyuan Cheng
cceb624fc2
Merge pull request #7555 from pureshine/loading-filter
Add loading if the fileter is not loaded when creating the replication rule
2019-04-29 13:34:56 +08:00
FangyuanCheng
ab461abe64 Add loading if the fileter is not loaded when creating the replication rule\
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-29 12:44:31 +08:00
Fangyuan Cheng
41e0c5e31a
Merge branch 'master' into fix-vulnerability 2019-04-29 11:32:05 +08:00
Fangyuan Cheng
12737bfa7b
Merge branch 'master' into add-loading 2019-04-28 22:23:38 +08:00
FangyuanCheng
1979f3b362 Add loading to the vulnerability page and the gc page
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-28 22:22:28 +08:00
FangyuanCheng
1513f468ae Fix bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-28 17:03:22 +08:00
Meina Zhou
f4dcac95fe fix replication add label console error
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-28 15:49:28 +08:00
Mia ZHOU
630fa48ac8
Merge pull request #7517 from pureshine/loading-num
Get the number of execution status every 10s and refresh the task list
2019-04-28 14:22:36 +08:00
FangyuanCheng
e45d402777 Modify tooltips for creating replication rule
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-26 10:54:41 +08:00
FangyuanCheng
4768ad33ed Get the number of execution status every 10s and refresh the task list
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-25 22:01:07 +08:00
Mia ZHOU
3296e2acae
Merge pull request #7513 from pureshine/replication-delete
Get delete or replicate failure information directly and display
2019-04-25 17:11:35 +08:00
FangyuanCheng
5e34cd3cf9 Fix some issues of replication
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-25 16:47:31 +08:00
Mia ZHOU
ffadd13ba6
Merge pull request #7487 from pureshine/fix-scan-error
Fix scan task never ends in UI
2019-04-25 12:16:47 +08:00
FangyuanCheng
6f055cebc3 Fix Scan task never ends in UI target/1.8.0
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-25 10:27:28 +08:00
Meina Zhou
f0d9b41bf5 use endpoint for gc log
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-24 17:04:44 +08:00
jwangyangls
743b3914c3
Merge pull request #7494 from jwangyangls/remove_oidc_ability_to_change_password
Remove OIDC's ability to change passwords
2019-04-24 13:24:54 +08:00
Fangyuan Cheng
24acbcf300
Merge pull request #7485 from pureshine/add-tooltip
Add tooltips for creating replication rule
2019-04-24 13:22:46 +08:00
Mia ZHOU
c4bf07a2ed
Merge pull request #7377 from kofj/fix_history_display
Fix history display
2019-04-24 13:12:14 +08:00
Mia ZHOU
a1230a0ca1
Merge pull request #7490 from pureshine/label-tab
Align all tab spacing between project and configuration pages
2019-04-24 12:45:11 +08:00
Yogi_Wang
32fc76c666 Remove OIDC's ability to change passwords
remove the ability  to change passwords when user login harbor through OIDC.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-23 15:17:59 +08:00
FangyuanCheng
85bd840ff1 Align all tab spacing between project and configuration pages
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-23 11:20:05 +08:00
jwangyangls
1323fbfa14
Merge pull request #7481 from jwangyangls/oidc_generate_cli
Add generate cli secret in user profile page
2019-04-23 11:10:50 +08:00
Yogi_Wang
f164738246 Add generate cli secret in user profile page
add cli secret button in user profile page, OIDC users can click this button to regenerate a cli secret, if the user does so, then the past cli secret will be abandoned.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-23 10:11:07 +08:00
FangyuanCheng
8cf0d58f1f Modify some issues of test ping registry and edit registry
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-23 01:31:45 +08:00
FangyuanCheng
1d4a7d8127 Add tooltips for creating replication rule
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-23 00:32:59 +08:00
FangyuanCheng
f2316601d8 Fix duration missed for failed jobs
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-19 17:48:27 +08:00
FangyuanCheng
87c2684724 Fix replication tasks page cannot pagination
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-19 11:40:10 +08:00
Steven Zou
16f97326ad
Merge pull request #7433 from goharbor/replication_ng
Merge the replication ng branch to master
2019-04-18 16:35:45 +08:00
FangyuanCheng
33852973e3 Hide vulnrability if clair is not installed
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-18 16:03:31 +08:00
FangyuanCheng
f7f5298ba2 Fix replication ui relate issues
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-18 15:06:11 +08:00
Wenkai Yin
7196abc77b
Merge pull request #7417 from pureshine/replication-case
Reload the task list when the task status is pending and scheduled
2019-04-17 20:03:36 +08:00
Wenkai Yin
eb00c9cb70
Merge pull request #7404 from jwangyangls/replication_C
In add or edit replication page ,disable the mode of pull and push when editing the replication and delete src_namespaces and delete useless code and add a validate content that when I choose scheduled, the cron field is mandatory.
2019-04-17 19:11:46 +08:00
FangyuanCheng
f776e6de2c Reload the task list when the task status is pendding and scheduled
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-17 19:10:23 +08:00
wang yan
e017294f71 merge with master latest
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-17 17:52:39 +08:00
Yogi_Wang
8f152392b5 Change new and edit Replication page about pull and push mode.
1.disable the mode of pull and push when editing the replication;
2.delete src_namespaces
3.delete useless code
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-17 16:57:03 +08:00
jwangyangls
cc868aa23e
Merge pull request #7407 from jwangyangls/fixHelmChartRouteIssue
Recovery a test case about 'should filter data by keyword' in the test file named repository-gridview.component.spec.ts
2019-04-17 15:24:56 +08:00
FangyuanCheng
73e408b851 Fix cron input box and select box not in one line
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-16 22:38:28 +08:00
FangyuanCheng
b11c95316f Remove the Replication tab under project view
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-16 17:56:45 +08:00
FangyuanCheng
609f6cbda2 Fix replication frontend issues
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-16 15:20:05 +08:00
Yogi_Wang
4faea92b04 Release a test case about 'should filter data by keyword'
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-15 17:00:27 +08:00
FangyuanCheng
a95cf813fb Fix when editting the policy, the source registry isn’t shown
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-15 16:17:20 +08:00
慕薇疯魔
64cabc0dfc fix #7219
Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-13 22:44:20 +08:00
慕薇疯魔
086926b745 format.
Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-13 22:33:43 +08:00
Daniel Jiang
f92bc8076d "Skip verify cert" to "verify cert"
This commit tweaks the attribute for auth proxy mode and OIDC auth mode.
To change it from "Skip verify cert" to "verify cert" so they are more
consistent with other modes.
Additionally it removes a workaround in `SearchUser` in auth proxy
authenticator.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-12 23:25:54 +08:00
Yogi_Wang
8b82e8925e Add Token Review Endpoint in configuration page
adding token review endpoint to the configuration page allows users to edit token review endpoint when logging in through http auth.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-12 14:29:39 +08:00
jwangyangls
08ecb87220
Merge pull request #7336 from jwangyangls/loginPageChange
Change the login module
2019-04-11 17:00:34 +08:00
Yogi_Wang
94438608a7 Add Cli secret in Harbor user profile
user could copy the CLI secret when login through oidc, and using this cli secret as password when using docker/helm cli to access Harbor.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-11 12:52:15 +08:00
zhoulin xie
cff4df8dfd request change
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-04-10 22:37:02 +08:00
Yogi_Wang
5df1542c22 Change the login module
change the login module to fix the issue that the nav is being in page when we login harbor again

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-10 14:27:51 +08:00
Meina Zhou
46f78906f7 modify filter to show all the filters in once
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-10 11:15:40 +08:00
Wenkai Yin
2644c52926
Merge pull request #7302 from pureshine/registry-update
Fix replication ui related issues
2019-04-09 20:55:44 +08:00
Wenkai Yin
dba9822477
Merge pull request #7323 from zhoumeina/replication_ng
modify filter to show all the filters in once
2019-04-09 20:54:44 +08:00
FangyuanCheng
e76c287a0c Fix replication ui related issues
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-09 17:44:42 +08:00
Meina Zhou
4dac7464cb modify filter to show all the filters in once
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-09 17:28:36 +08:00
Wenkai Yin
580674f3da Merge remote-tracking branch 'upstream/master' into 190409_sync 2019-04-09 17:01:09 +08:00
Yogi_Wang
eec55f18eb Add OIDC onboard page redirect to Harbor url when we login from OIDC and add redirect page address when we login again after logout
1.when we are the first time we login harbor page when we login from OIDC  ,we add the url in onboard-add-username  page.
2.fix the part of issue that we cannot redirect to de origin page when we login

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-08 16:30:32 +08:00
Wenkai Yin
ee6eb41dae
Merge pull request #7303 from zhoumeina/replication_ng
fix frontend issues
2019-04-08 15:50:21 +08:00
Meina Zhou
0028dc0d62 fix frontend issues
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-04 17:08:59 +08:00
jwangyangls
ca846ad031
Merge pull request #7297 from jwangyangls/fix_oidc_ui_save
Fix issue of oidc configuration save button is always disabled.
2019-04-04 15:56:06 +08:00
Wenkai Yin
b66b1f341e Merge remote-tracking branch 'upstream/master' into 190404_sync 2019-04-04 14:55:09 +08:00
Yogi_Wang
311af5d217 Fix issue of oidc configuration save button is always disabled and incorrect character
when we login Harbor width OIDC ,we cannot click the save  button of oidc config page

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-04 14:34:18 +08:00
jwangyangls
a27df46fb6
Merge pull request #7292 from jwangyangls/fix_login_robot_issue
Fix nightly test case failed when login harbor.
2019-04-04 12:14:43 +08:00
Yogi_Wang
4416e1810e fix login harbor issue with test case
Solve the problem that when we log on to the harbor page, the automation test will click on an incorrect button, which results in the test page being unable to log in.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-04 09:58:46 +08:00
Wenkai Yin
3ed8d87406
Merge pull request #7294 from pureshine/replication-ui
Fix cannot search for replication tasks
2019-04-04 09:52:04 +08:00
Fangyuan Cheng
89b72906f4
Merge branch 'master' into move-scan/gc 2019-04-03 16:07:35 +08:00
Meina Zhou
6b3f2bbf74 modify frontend replication UI to apply api changes. use dest registry as object
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-03 15:45:42 +08:00
FangyuanCheng
8a1f3b7c00 Fix cannot search for replication tasks
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-03 15:38:18 +08:00
FangyuanCheng
82716d492d move vulnerability and gc ui
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-03 14:39:46 +08:00
jwangyangls
beeb8b53d7
Merge pull request #7281 from jwangyangls/oidc_step3_onboard_tpl
Add the OIDC onboard page
2019-04-03 14:11:25 +08:00
Yogi_Wang
3bf644012c Add the OIDC onboard page
When a user logs in to Harbor for the first time through OIDC, the user will enter an onboard page, prompting the user to add the user name of Harbor. After the user name is entered, click save, and the user successfully logs in to Harbor through OIDC.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-03 12:58:11 +08:00