Merge a06bdbe into dc94e61

Azure · Oct 10, 2018 · 8c65291 · 8c65291
2 parents dc94e61 + a06bdbe
commit 8c65291
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 14 deletions.
diff --git a/client/src/app/controls/textbox/textbox.component.html b/client/src/app/controls/textbox/textbox.component.html
@@ -23,7 +23,7 @@
         [placeholder]="placeholder"
         [class.dirty]="highlightDirty && control?.dirty" />
 
-    <div class="validation-error">
+    <div *ngIf="!disablePopOverError" class="validation-error">
         <pop-over *ngIf="!!control.errors && Obj.keys(control.errors).length > 0"
                 [message]="control.errors[Obj.keys(control.errors)[0]]"
                 popOverClass="pop-over-container pop-over-input-error">

diff --git a/client/src/app/controls/textbox/textbox.component.ts b/client/src/app/controls/textbox/textbox.component.ts
@@ -17,6 +17,7 @@ export class TextboxComponent implements OnInit, OnChanges {
     @Input() readonly: boolean;
     @Input() disabled: boolean;
     @Input() type: 'text' | 'password' = 'text';
+    @Input() disablePopOverError: boolean;
     @Output() change: Subject<string>;
     @Output() value: Subject<string>;
 

diff --git a/...ntainer-image-source/container-image-source-acr/container-image-source-acr.component.html b/...ntainer-image-source/container-image-source-acr/container-image-source-acr.component.html
@@ -20,6 +20,7 @@
                 [(ngModel)]="selectedRegistry"
                 (change)="registryChanged($event)">
             </ng-select>
+            <div invalidmessage="registry" id="containersettings-acr-registry-error" role="alert"></div>
         </div>
 
         <div *ngIf = "containerImageSourceInfo.container.id === 'single'" class="container-setting-property">
@@ -37,6 +38,7 @@
                 [(ngModel)]="selectedRepository"
                 (change)="respositoryChanged($event)">
             </ng-select>
+            <div invalidmessage="repository" id="containersettings-acr-repository-error" role="alert"></div>
         </div>
 
         <div *ngIf = "containerImageSourceInfo.container.id === 'single'" class="container-setting-property">
@@ -53,11 +55,13 @@
                 [clearable]="false"
                 [(ngModel)]="selectedTag">
             </ng-select>
+            <div invalidmessage="tag" id="containersettings-acr-tag-error" role="alert"></div>
         </div>
 
         <div *ngIf = "containerImageSourceInfo.container.id === 'single'" class="container-setting-property">
             <label>{{ 'containerACRStartupFile' | translate }}</label>
             <textbox [control]="imageSourceForm?.controls?.startupFile"></textbox>
+            <div invalidmessage="startupFile" id="containersettings-acr-startupFile-error" role="alert"></div>
         </div>
 
         <div *ngIf = "containerImageSourceInfo.container.id !== 'single'">
@@ -68,7 +72,8 @@
 
             <div class="container-setting-property">
                 <label>{{ 'containerMultiConfiguration' | translate }}</label><br/>
-                <textarea class="config" formControlName="config" disabled></textarea>
+                <textarea class="config" formControlName="config" readonly></textarea>
+                <div invalidmessage="config" id="containersettings-acr-config-error" role="alert"></div>
             </div>
         </div>
     </div>

diff --git a/...e-source/container-image-source-dockerhub/container-image-source-dockerhub.component.html b/...e-source/container-image-source-dockerhub/container-image-source-dockerhub.component.html
@@ -12,22 +12,26 @@
 <div *ngIf="dockerHubForm" [formGroup] = "dockerHubForm">
     <div *ngIf = "selectedAccessType === 'private'" class="container-setting-property">
         <label>{{ 'containerLogin' | translate }}</label>
-        <textbox [control] = "dockerHubForm?.controls?.login"></textbox>
+        <textbox [control] = "dockerHubForm?.controls?.login" [disablePopOverError] = "true"></textbox>
+        <div invalidmessage="login" id="containersettings-dh-login-error" role="alert"></div>
     </div>
 
     <div *ngIf = "selectedAccessType === 'private'" class="container-setting-property">
         <label>{{ 'containerPassword' | translate }}</label>
-        <textbox type="password" [control] = "dockerHubForm?.controls?.password"></textbox>
+        <textbox type="password" [control] = "dockerHubForm?.controls?.password" [disablePopOverError] = "true"></textbox>
+        <div invalidmessage="password" id="containersettings-dh-password-error" role="alert"></div>
     </div>
 
     <div *ngIf = "containerImageSourceInfo.container.id === 'single'" class="container-setting-property">
         <label>{{ 'containerImageAndTag' | translate }}</label>
-        <textbox [control] = "dockerHubForm?.controls?.image"></textbox>
+        <textbox [control] = "dockerHubForm?.controls?.image" [disablePopOverError] = "true"></textbox>
+        <div invalidmessage="image" [id]="'containersettings-dh-image-error-' + selectedAccessType" role="alert"></div>
     </div>
 
     <div *ngIf = "containerImageSourceInfo.container.id === 'single'" class="container-setting-property">
         <label>{{ 'containerStartupFile' | translate }}</label>
-        <textbox [control] = "dockerHubForm?.controls?.startupFile"></textbox>
+        <textbox [control] = "dockerHubForm?.controls?.startupFile" [disablePopOverError] = "true"></textbox>
+        <div invalidmessage="startupFile" [id]="'containersettings-dh-startupFile-error-' + selectedAccessType" role="alert"></div>
     </div>
 
     <div *ngIf = "containerImageSourceInfo.container.id !== 'single'">
@@ -38,7 +42,16 @@
 
         <div class="container-setting-property">
             <label>{{ 'containerMultiConfiguration' | translate }}</label><br/>
-            <textarea class="config" formControlName="config" disabled></textarea>
+
+            <ng-container *ngIf="selectedAccessType === 'public'">
+                <textarea class="config" formControlName="config" readonly></textarea>
+                <div invalidmessage="config" id="containersettings-dh-config-error-public" role="alert"></div>
+            </ng-container>
+
+            <ng-container *ngIf="selectedAccessType === 'private'">
+                <textarea class="config" formControlName="config" readonly></textarea>
+                <div invalidmessage="config" id="containersettings-dh-config-error-private" role="alert"></div>
+            </ng-container>
         </div>
     </div>
 </div>
diff --git a/...tainer-image-source-privateregistry/container-image-source-privateregistry.component.html b/...tainer-image-source-privateregistry/container-image-source-privateregistry.component.html
@@ -1,27 +1,32 @@
 <div *ngIf="imageSourceForm" [formGroup] = "imageSourceForm">
     <div class="container-setting-property">
         <label>{{ 'containerServerURL' | translate }}</label>
-        <textbox [control] = "imageSourceForm?.controls?.serverUrl"></textbox>
+        <textbox [control] = "imageSourceForm?.controls?.serverUrl" [disablePopOverError] = "true"></textbox>
+        <div invalidmessage="serverUrl" id="containersettings-pr-serverurl-error" role="alert"></div>
     </div>
 
     <div class="container-setting-property">
         <label>{{ 'containerLogin' | translate }}</label>
-        <textbox [control] = "imageSourceForm?.controls?.login"></textbox>
+        <textbox [control] = "imageSourceForm?.controls?.login" [disablePopOverError] = "true"></textbox>
+        <div invalidmessage="login" id="containersettings-pr-login-error" role="alert"></div>
     </div>
 
     <div class="container-setting-property">
         <label>{{ 'containerPassword' | translate }}</label>
-        <textbox type="password" [control] = "imageSourceForm?.controls?.password"></textbox>
+        <textbox type="password" [control] = "imageSourceForm?.controls?.password" [disablePopOverError] = "true"></textbox>
+        <div invalidmessage="password" id="containersettings-pr-password-error" role="alert"></div>
     </div>
 
     <div *ngIf = "containerImageSourceInfo.container.id === 'single'" class="container-setting-property">
         <label>{{ 'containerImageAndTag' | translate }}</label>
-        <textbox [control] = "imageSourceForm?.controls?.image"></textbox>
+        <textbox [control] = "imageSourceForm?.controls?.image" [disablePopOverError] = "true"></textbox>
+        <div invalidmessage="image" id="containersettings-pr-image-error" role="alert"></div>
     </div>
 
     <div *ngIf = "containerImageSourceInfo.container.id === 'single'" class="container-setting-property">
         <label>{{ 'containerStartupFile' | translate }}</label>
-        <textbox [control] = "imageSourceForm?.controls?.startupFile"></textbox>
+        <textbox [control] = "imageSourceForm?.controls?.startupFile" [disablePopOverError] = "true"></textbox>
+        <div invalidmessage="startupFile" id="containersettings-pr-startupFile-error" role="alert"></div>
     </div>
 
     <div *ngIf = "containerImageSourceInfo.container.id !== 'single'">
@@ -32,7 +37,8 @@
 
         <div class="container-setting-property">
             <label>{{ 'containerMultiConfiguration' | translate }}</label><br/>
-            <textarea class="config" formControlName="config" disabled></textarea>
+            <textarea class="config" formControlName="config" readonly></textarea>
+            <div invalidmessage="config" id="containersettings-pr-config-error" role="alert"></div>
         </div>
     </div>
 </div>
diff --git a/client/src/app/site/container-settings/container-settings-manager.ts b/client/src/app/site/container-settings/container-settings-manager.ts
@@ -586,7 +586,7 @@ export class ContainerSettingsManager {
                 registry: [this._getAcrRegistry(appSettings), this.requiredValidator.validate.bind(this.requiredValidator)],
                 login: [this._getAppSettingsUsername(appSettings), this.requiredValidator.validate.bind(this.requiredValidator)],
                 password: [this._getAppSettingsPassword(appSettings), this.requiredValidator.validate.bind(this.requiredValidator)],
-                config: [this._getAcrConfig(fxVersion, appSettings, siteConfig)],
+                config: [this._getAcrConfig(fxVersion, appSettings, siteConfig), this.requiredValidator.validate.bind(this.requiredValidator)],
             });
         }
     }