fixing bugs, removing debug code, and adding some tooltips (#159)

robertpatrick · web-flow · commit d6deb0c74be2 · 2022-09-13T21:44:28.000-05:00
diff --git a/electron/app/locales/en/webui.json b/electron/app/locales/en/webui.json
@@ -42,6 +42,7 @@
   "kubectl-config-file-label": "Kubernetes Client Config File(s)",
   "kubectl-config-file-help": "The Kubernetes client configuration file(s) to use.  Leave this empty to use the default location.",
   "kubectl-config-context-label": "Kubectl Config Context to Use",
+  "kubectl-config-context-tooltip": "Get the current Kubernetes cluster context from the Kubernetes Client Config File",
   "kubectl-config-context-help": "The Kubernetes config file context name for the cluster to which you want to connect.  The default is to use whatever the current context is, if any.",
   "kubectl-helm-exe-file-path-label": "Helm Executable to Use",
   "kubectl-helm-exe-file-path-help": "The full path to the Helm executable that is used to install the WebLogic Kubernetes Operator and some ingress controllers in your Kubernetes cluster.",
@@ -1425,7 +1426,8 @@
   "vz-component-design-namespace-label": "Component Namespace",
   "vz-component-design-namespace-help": "The Kubernetes namespace to which the Verrazzano component will be deployed.",
   "vz-component-design-installed-version-label": "Verrazzano Version",
-  "vz-component-design-installed-version-help": "The three digit version number of the target Verrazzano installation.",
+  "vz-component-design-installed-version-help": "The three digit version number of the installed Verrazzano version from the target environment.",
+  "vz-component-design-installed-version-tooltip": "Get the installed version of Verrazzano from the target environment",
 
   "vz-component-code-script-title": "Install Script",
   "vz-component-code-component-resource-title": "Component Resource",
@@ -1548,16 +1550,16 @@
   "vz-application-design-component-ingress-trait-secret-name-help": "The name of the TLS secret to associate with the routes defined by this ingress.",
   "vz-application-design-choose-ingress-trait-secret-validation-error-title": "Choose Secret for Ingress Trait Aborted",
   "vz-application-design-choose-ingress-trait-get-secrets-error-message": "Unable to choose secret due to an error while getting the list of available secrets: {{error}}.",
-  "vz-application-design-ingress-trait-rules-uid-label": "Unique ID",
+  "vz-application-design-ingress-trait-rules-table-title": "Ingress Rules",
+  "vz-application-design-ingress-trait-rules-table-aria-label": "Ingress Rules table",
   "vz-application-design-ingress-trait-rules-hosts-label": "Hosts",
   "vz-application-design-ingress-trait-rules-first-path-type-label": "First Path Type",
   "vz-application-design-ingress-trait-rules-first-path-label": "First Path",
   "vz-application-design-ingress-trait-rules-destination-host-label": "Destination Host",
   "vz-application-design-ingress-trait-rules-destination-port-label": "Destination Port",
-  "vz-application-design-rules-table-aria-label": "Ingress Trait Rules table",
-  "vz-application-design-add-rule-label": "Add Ingress Trait Rule",
-  "vz-application-design-edit-rule-label": "Edit Ingress Trait Rule",
-  "vz-application-design-delete-rule-label": "Delete Ingress Trait Rule",
+  "vz-application-design-add-rule-label": "Add Ingress Rule",
+  "vz-application-design-edit-rule-label": "Edit Ingress Rule",
+  "vz-application-design-delete-rule-label": "Delete Ingress Rule",
 
   "vz-application-design-component-logging-trait-enabled-label": "Enable Logging Trait",
   "vz-application-design-component-logging-trait-enabled-help": "Enable the Logging Trait for this component.",
@@ -1609,13 +1611,13 @@
   "vz-application-design-ingress-trait-rule-edit-destination-host-label": "Host",
   "vz-application-design-ingress-trait-rule-edit-destination-host-help": "Destination host for the ingress path.",
   "vz-application-design-ingress-trait-rule-edit-destination-port-label": "Port",
-  "vz-application-design-ingress-trait-rule-edit-destination-port-help": "Destination port for the ingress path (-1 indicates that the value is not set).",
+  "vz-application-design-ingress-trait-rule-edit-destination-port-help": "Destination port for the ingress path.",
   "vz-application-design-ingress-trait-rule-edit-destination-cookie-name-label": "Session Affinity Cookie Name",
   "vz-application-design-ingress-trait-rule-edit-destination-cookie-name-help": "The name of the HTTP Cookie to use for session affinity for this path.",
   "vz-application-design-ingress-trait-rule-edit-destination-cookie-path-label": "Session Affinity Cookie Path",
   "vz-application-design-ingress-trait-rule-edit-destination-cookie-path-help": "The path of the HTTP Cookie to use for session affinity for this path.",
   "vz-application-design-ingress-trait-rule-edit-destination-cookie-ttl-label": "Session Affinity Cookie Time-to-Live Seconds",
-  "vz-application-design-ingress-trait-rule-edit-destination-cookie-ttl-help": "The lifetime of the HTTP Cookie in seconds to use for session affinity for this path (-1 indicates that the value is not set).",
+  "vz-application-design-ingress-trait-rule-edit-destination-cookie-ttl-help": "The lifetime of the HTTP Cookie in seconds to use for session affinity for this path.",
 
   "vz-application-code-script-title": "Deploy Script",
   "vz-application-code-application-resource-title": "Application Resource",
diff --git a/electron/package-lock.json b/electron/package-lock.json
diff --git a/webui/src/js/utils/vz-actions-base.js b/webui/src/js/utils/vz-actions-base.js
@@ -18,7 +18,7 @@ define(['utils/wkt-actions-base', 'utils/validation-helper', 'utils/dialog-helpe
         kubectlFormConfig.formName = 'kubectl-form-name';
 
         validationObject.addField('kubectl-exe-file-path-label',
-          validationHelper.validateRequiredField(this.project.settings.javaHome.value), kubectlFormConfig);
+          validationHelper.validateRequiredField(this.project.kubectl.executableFilePath.value), kubectlFormConfig);
 
         return validationObject;
       }
diff --git a/webui/src/js/utils/vz-get-installed-version.js b/webui/src/js/utils/vz-get-installed-version.js
@@ -27,7 +27,7 @@ function(VzActionsBase, project, wktConsole, i18n, projectIo, dialogHelper) {
       const validatableObject = this.getValidatableObject('flow-verrazzano-get-install-version-name');
       if (validatableObject.hasValidationErrors()) {
         const validationErrorDialogConfig = validatableObject.getValidationErrorDialogConfig(errTitle);
-        dialogHelper.openDialog('validation-error-dialog', validationErrorDialogConfig);
+        await dialogHelper.openDialog('validation-error-dialog', validationErrorDialogConfig);
         return Promise.resolve(false);
       }
 
diff --git a/webui/src/js/viewModels/vz-application-design-view.js b/webui/src/js/viewModels/vz-application-design-view.js
@@ -62,7 +62,7 @@ function (project, accUtils, utils, ko, i18n, BufferingDataProvider, ArrayDataPr
 
     this.addComponent = async () => {
       // First, determine if the required fields are set...
-      const errTitle = 'vz-application-design-add-component-validation-error-title';
+      const errTitle = this.labelMapper('add-component-validation-error-title');
       const validationObject = this.getValidationObject('vz-application-design-add-component-flow-nane');
       if (validationObject.hasValidationErrors()) {
         const validationErrorDialogConfig = validationObject.getValidationErrorDialogConfig(errTitle);
@@ -400,10 +400,6 @@ function (project, accUtils, utils, ko, i18n, BufferingDataProvider, ArrayDataPr
 
     // this is dynamic to allow i18n fields to load correctly
     this.ingressTraitRulesColumnData = [
-      {
-        'headerText': this.labelMapper('ingress-trait-rules-uid-label'),
-        'sortable': 'disable',
-      },
       {
         'headerText': this.labelMapper('ingress-trait-rules-hosts-label'),
         'sortable': 'disable',
diff --git a/webui/src/js/views/kubectl-page.html b/webui/src/js/views/kubectl-page.html
@@ -43,6 +43,7 @@ <h6><oj-bind-text value="[[labelMapper('title')]]"></oj-bind-text></h6>
                        help.instruction="[[labelMapper('config-context-help')]]">
           <oj-button slot="end" display="icons" chroming="borderless" on-oj-action="[[getCurrentContext]]">
             <span slot="endIcon" class="oj-ux-ico-annotation" role="img"></span>
+            <oj-bind-text value="[[labelMapper('config-context-tooltip')]]"></oj-bind-text>
           </oj-button>
         </oj-input-text>
         <oj-bind-if test="[[usingWko() === true]]">
diff --git a/webui/src/js/views/vz-application-design-view.html b/webui/src/js/views/vz-application-design-view.html
@@ -23,9 +23,10 @@ <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('title')]]"></oj-b
     </oj-input-text>
     <oj-input-text label-hint="[[i18n.t('vz-component-design-installed-version-label')]]"
                    value="{{project.vzInstall.actualInstalledVersion.observable}}"
-                   help.instructions="[[i18n.t('vz-component-design-installed-version-help')]]">
+                   help.instruction="[[i18n.t('vz-component-design-installed-version-help')]]">
       <oj-button slot="end" display="icons" chroming="borderless" on-oj-action="[[getInstalledVersionNumber]]">
         <span slot="endIcon" class="oj-ux-ico-annotation" role="img"></span>
+        <oj-bind-text value="[[i18n.t('vz-component-design-installed-version-tooltip')]]"></oj-bind-text>
       </oj-button>
     </oj-input-text>
   </oj-form-layout>
@@ -122,9 +123,12 @@ <h6 slot="header">
                       </oj-input-text>
                     </oj-form-layout>
                     <div>
+                      <h6 class="wkt-subheading">
+                        <oj-bind-text value="[[labelMapper('ingress-trait-rules-table-title')]]"></oj-bind-text>
+                      </h6>
                       <oj-table :id="[[`ingress-rules-table-${component.index}`]]"
                                 class="wkt-model-properties-table"
-                                :aria-label="[[labelMapper('rules-table-aria-label')]]"
+                                :aria-label="[[labelMapper('ingress-trait-rules-table-aria-label')]]"
                                 data="[[componentsIngressTraitRulesDataProvider(component.data)]]"
                                 display="grid"
                                 horizontal-grid-visible="enabled"
@@ -133,9 +137,6 @@ <h6 slot="header">
                                 columns='[[ingressTraitRulesColumnData]]'>
                         <template slot="rowTemplate" data-oj-as="row">
                           <tr>
-                            <td>
-                              <oj-bind-text value="[[row.data.uid]]"></oj-bind-text>
-                            </td>
                             <td>
                               <oj-bind-text value="[[row.data.hosts]]"></oj-bind-text>
                             </td>
diff --git a/webui/src/js/views/vz-component-design-view.html b/webui/src/js/views/vz-component-design-view.html
@@ -15,9 +15,10 @@ <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('title')]]"></oj-b
     </oj-input-text>
     <oj-input-text label-hint="[[labelMapper('installed-version-label')]]"
                    value="{{project.vzInstall.actualInstalledVersion.observable}}"
-                   help.instructions="[[labelMapper('installed-version-help')]]">
+                   help.instruction="[[labelMapper('installed-version-help')]]">
       <oj-button slot="end" display="icons" chroming="borderless" on-oj-action="[[getInstalledVersionNumber]]">
         <span slot="endIcon" class="oj-ux-ico-annotation" role="img"></span>
+        <oj-bind-text value="[[labelMapper('installed-version-tooltip')]]"></oj-bind-text>
       </oj-button>
     </oj-input-text>
     <oj-input-text label-hint="[[domainLabelMapper('wls-credential-label')]]"

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ define(['utils/wkt-actions-base', 'utils/validation-helper', 'utils/dialog-helpe`
`18`	`18`	`kubectlFormConfig.formName = 'kubectl-form-name';`
`19`	`19`
`20`	`20`	`validationObject.addField('kubectl-exe-file-path-label',`
`21`		`- validationHelper.validateRequiredField(this.project.settings.javaHome.value), kubectlFormConfig);`
	`21`	`+ validationHelper.validateRequiredField(this.project.kubectl.executableFilePath.value), kubectlFormConfig);`
`22`	`22`
`23`	`23`	`return validationObject;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function(VzActionsBase, project, wktConsole, i18n, projectIo, dialogHelper) {`
`27`	`27`	`const validatableObject = this.getValidatableObject('flow-verrazzano-get-install-version-name');`
`28`	`28`	`if (validatableObject.hasValidationErrors()) {`
`29`	`29`	`const validationErrorDialogConfig = validatableObject.getValidationErrorDialogConfig(errTitle);`
`30`		`- dialogHelper.openDialog('validation-error-dialog', validationErrorDialogConfig);`
	`30`	`+ await dialogHelper.openDialog('validation-error-dialog', validationErrorDialogConfig);`
`31`	`31`	`return Promise.resolve(false);`
`32`	`32`	`}`
`33`	`33`