Skip to content

Commit 11bfa96

Browse files
damienrunnabledamienrunnable
committed
SAN-6186 Code review comments
1 parent 876431e commit 11bfa96

5 files changed

Lines changed: 106 additions & 106 deletions

File tree

‎client/directives/modals/settingsModal/forms/privateRegistryForm/privateRegistryFormController.js‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
require('app')
44
.controller('PrivateRegistryFormController', PrivateRegistryFormController);
55

6-
/**
7-
* @ngInject
8-
*/
96
function PrivateRegistryFormController (
107
privateRegistry,
118
keypather,
@@ -22,25 +19,27 @@ function PrivateRegistryFormController (
2219

2320
privateRegistry.addRegistry(PRFC.url, PRFC.username, PRFC.password)
2421
.then(function(response) {
25-
if (response.status === 204) {
26-
PRFC.invalidCredentials = false;
27-
PRFC.authorized = true;
28-
PRFC.formReset = false;
29-
30-
keypather.set(PRFC, 'registryCredentials.url', PRFC.url);
31-
keypather.set(PRFC, 'registryCredentials.username', PRFC.username);
32-
33-
PRFC.url = null;
34-
PRFC.username = null;
35-
PRFC.password = null;
36-
} else {
22+
if (response.status !== 204) {
3723
PRFC.invalidCredentials = true;
24+
return;
3825
}
26+
27+
PRFC.invalidCredentials = false;
28+
PRFC.authorized = true;
29+
PRFC.formReset = false;
30+
31+
keypather.set(PRFC, 'registryCredentials.url', PRFC.url);
32+
keypather.set(PRFC, 'registryCredentials.username', PRFC.username);
33+
34+
PRFC.url = null;
35+
PRFC.username = null;
36+
PRFC.password = null;
3937
}).finally(function() {
4038
loading('privateRegistry',false);
4139
});
4240
};
4341

42+
// Set them back to a blank form, but leave the data in place since they may decide not to replace it.
4443
PRFC.changeRegistry = function () {
4544
PRFC.formReset = true;
4645
};

‎client/directives/modals/settingsModal/forms/privateRegistryForm/privateRegistryFormDirective.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require('app')
55

66
function privateRegistryForm() {
77
return {
8-
restrict: 'E',
8+
restrict: 'A',
99
controller: 'PrivateRegistryFormController',
1010
controllerAs: 'PRFC',
1111
templateUrl: 'privateRegistryFormView'

‎client/directives/modals/settingsModal/forms/privateRegistryForm/privateRegistryFormView.jade‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
.grid-block.vertical.modal-form.no-border.form-registry
2-
section.label-description
3-
.label-col Private Registry
4-
.small.text-gray If you push your images to a private registry, you can safely store your credentials to use those images on Runnable. 
5-
a.link(
6-
href = "//runnable.com/docs"
7-
target = "_blank"
8-
) Learn more
9-
| .
101

11-
form.grid-block.vertical.well.gray.ignore-margin(
12-
name = "privateRegistryForm"
13-
ng-class = "{'invalid': PRFC.invalidCredentials}"
14-
ng-if = "!PRFC.authorized || PRFC.formReset"
2+
section.label-description
3+
.label-col Private Registry
4+
.small.text-gray If you push your images to a private registry, you can safely store your credentials to use those images on Runnable. 
5+
a.link(
6+
href = "//runnable.com/docs"
7+
target = "_blank"
8+
) Learn more
9+
| .
10+
11+
form.grid-block.vertical.well.gray.ignore-margin(
12+
name = "privateRegistryForm"
13+
ng-class = "{'invalid': PRFC.invalidCredentials}"
14+
ng-if = "!PRFC.authorized || PRFC.formReset"
15+
)
16+
p.red.small.text-center(
17+
ng-if = "PRFC.invalidCredentials"
18+
) We couldn’t validate your credentials.
19+
br
20+
| Please check them and try again.
21+
label.padding-sm.label
22+
.padding-xxs.small.label-sm Registry URL
23+
input.input.input-md.input-validate(
24+
name = "PRFC.url"
25+
ng-disabled = "$root.isLoading.privateRegistry"
26+
ng-model = "PRFC.url"
27+
ng-required = "true"
28+
placeholder = "https://index.docker.io/v1/"
29+
spellcheck = "false"
30+
type = "url"
31+
)
32+
small.grid-block.padding-xxs.small Add the URL for the registry you use. This could be from Docker Hub or a private registry.
33+
label.padding-sm.label
34+
.padding-xxs.small.label-sm Username
35+
input.input.input-md.input-validate(
36+
name = "PRFC.username"
37+
ng-disabled = "$root.isLoading.privateRegistry"
38+
ng-model = "PRFC.username"
39+
ng-required = "true"
40+
spellcheck = "false"
41+
)
42+
label.padding-sm.label
43+
.padding-xxs.small.label-sm Password
44+
input.input.input-md.input-validate(
45+
autocomplete = "new-password"
46+
name = "PRFC.password"
47+
ng-disabled = "$root.isLoading.privateRegistry"
48+
ng-model = "PRFC.password"
49+
ng-required = "true"
50+
spellcheck = "false"
51+
type = "password"
52+
)
53+
footer.margin-top-sm.padding-sm.grid-block.footer(
54+
ng-class = "{\
55+
'justify-justified': PRFC.authorized,\
56+
'justify-right': !PRFC.authorized\
57+
}"
1558
)
16-
p.red.small.text-center(
17-
ng-if = "PRFC.invalidCredentials"
18-
) We couldn’t validate your credentials.
19-
br
20-
| Please check them and try again.
21-
label.padding-sm.label
22-
.padding-xxs.small.label-sm Registry URL
23-
input.input.input-md.input-validate(
24-
name = "PRFC.url"
25-
ng-disabled = "$root.isLoading.privateRegistry"
26-
ng-model = "PRFC.url"
27-
ng-required = "true"
28-
placeholder = "https://index.docker.io/v1/"
29-
spellcheck = "false"
30-
type = "url"
31-
)
32-
small.grid-block.padding-xxs.small Add the URL for the registry you use. This could be from Docker Hub or a private registry.
33-
label.padding-sm.label
34-
.padding-xxs.small.label-sm Username
35-
input.input.input-md.input-validate(
36-
name = "PRFC.username"
37-
ng-disabled = "$root.isLoading.privateRegistry"
38-
ng-model = "PRFC.username"
39-
ng-required = "true"
40-
spellcheck = "false"
41-
)
42-
label.padding-sm.label
43-
.padding-xxs.small.label-sm Password
44-
input.input.input-md.input-validate(
45-
autocomplete = "new-password"
46-
name = "PRFC.password"
47-
ng-disabled = "$root.isLoading.privateRegistry"
48-
ng-model = "PRFC.password"
49-
ng-required = "true"
50-
spellcheck = "false"
51-
type = "password"
52-
)
53-
footer.margin-top-sm.padding-sm.grid-block.footer(
54-
ng-class = "{\
55-
'justify-justified': PRFC.authorized,\
56-
'justify-right': !PRFC.authorized\
57-
}"
59+
button.btn.btn-md.gray.btn-cancel(
60+
data-event-name = "Clicked 'Back' in Private Registry Settings"
61+
ng-if = "PRFC.authorized && PRFC.formReset"
62+
ng-click = "PRFC.formReset = false"
63+
) Back
64+
button.grid-block.shrink.align-center.btn.btn-md.green(
65+
data-event-name = "Clicked to Add Private Registry"
66+
ng-click = "PRFC.verifyAndSave()"
67+
ng-disabled = "$root.isLoading.privateRegistry || privateRegistryForm.$invalid"
5868
)
59-
button.btn.btn-md.gray.btn-cancel(
60-
data-event-name = "Clicked 'Back' in Private Registry Settings"
61-
ng-if = "PRFC.authorized && PRFC.formReset"
62-
ng-click = "PRFC.formReset = false"
63-
) Back
64-
button.grid-block.shrink.align-center.btn.btn-md.green(
65-
data-event-name = "Clicked to Add Private Registry"
66-
ng-click = "PRFC.verifyAndSave()"
67-
ng-disabled = "$root.isLoading.privateRegistry || privateRegistryForm.$invalid"
69+
.spinner-wrapper.spinner-sm.spinner-white(
70+
ng-if = "$root.isLoading.privateRegistry"
71+
ng-include = "'spinner'"
6872
)
69-
.spinner-wrapper.spinner-sm.spinner-white(
70-
ng-if = "$root.isLoading.privateRegistry"
71-
ng-include = "'spinner'"
72-
)
73-
span Verify & Save
73+
span Verify & Save
7474

75-
section.padding-sm.grid-block.align-center.well.white.ignore-margin(
76-
ng-if = "PRFC.authorized && !PRFC.formReset"
77-
)
78-
svg.margin-right-xxs.text-green.grid-block.shrink.iconnables.icons-check
79-
use(
80-
xlink:href = "#icons-check"
81-
)
82-
.grid-block.vertical
83-
p.small.weight-strong.text-overflow Authorized {{PRFC.registryCredentials.username}}
84-
small.small.text-gray.text-overflow {{PRFC.registryCredentials.url}}
85-
button.btn.btn-xs.gray.margin-left-xxs(
86-
data-event-name = "Clicked to Change Private Registry"
87-
ng-click = "PRFC.changeRegistry()"
88-
) Change
75+
section.padding-sm.grid-block.align-center.well.white.ignore-margin(
76+
ng-if = "PRFC.authorized && !PRFC.formReset"
77+
)
78+
svg.margin-right-xxs.text-green.grid-block.shrink.iconnables.icons-check
79+
use(
80+
xlink:href = "#icons-check"
81+
)
82+
.grid-block.vertical
83+
p.small.weight-strong.text-overflow Authorized {{PRFC.registryCredentials.username}}
84+
small.small.text-gray.text-overflow {{PRFC.registryCredentials.url}}
85+
button.btn.btn-xs.gray.margin-left-xxs(
86+
data-event-name = "Clicked to Change Private Registry"
87+
ng-click = "PRFC.changeRegistry()"
88+
) Change

‎client/directives/modals/settingsModal/settingsModalView.jade‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@
9999
ng-include = "'gitHubForm'"
100100
)
101101

102-
private-registry-form(
102+
.grid-block.vertical.modal-form.no-border.form-registry(
103+
private-registry-form
103104
ng-if = "$root.featureFlags.privateRegistry && SEMC.currentTab === 'privateRegistry'"
104105
)
105106

‎client/services/privateRegistry.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ function privateRegistry(
2525
var username = keypather.get(currentOrg, 'poppa.attrs.privateRegistryUsername');
2626
var url = keypather.get(currentOrg, 'poppa.attrs.privateRegistryUrl');
2727

28-
if (username && url) {
29-
return {
30-
username: username,
31-
url: url
32-
};
28+
if (!username || !url) {
29+
return null;
3330
}
3431

35-
return null;
32+
return {
33+
username: username,
34+
url: url
35+
};
3636
}
3737
};
3838
}

0 commit comments

Comments
 (0)