Merge branch 'server-keystore-fix' into 'main'

fixing a bug in the Archive Editor when adding entries that are segregated by name

See merge request weblogic-cloud/weblogic-toolkit-ui!261

Author: robertpatrick

webui/src/js/utils/wdt-archive-helper.js

@@ -48,14 +48,13 @@ define(['knockout', 'models/wkt-project', 'utils/wkt-logger'],
             break;
         }
 
-        if (archiveEntry.segregatedName) {
-          options.segregatedName = otherArgs.segregationName;
+        if (otherArgs.segregatedName) {
+          options.segregatedName = otherArgs.segregatedName;
         }
 
         if (archiveEntryTypeName === 'custom' && !!otherArgs.customPath) {
           options.customPath = otherArgs.customPath;
         }
-
         return options;
       };
 

webui/src/js/viewModels/add-to-archive-selection-dialog.js

@@ -109,15 +109,15 @@ function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, viewHelper, A
       return undefined;
     }, this);
 
-    this.segregationName = ko.observable();
-    this.segregationLabel = ko.computed(() => {
+    this.segregatedName = ko.observable();
+    this.segregatedLabel = ko.computed(() => {
       const entry = this.archiveEntry();
       if (!!entry) {
         return entry.segregatedLabel;
       }
       return undefined;
     }, this);
-    this.segregationHelp = ko.computed(() => {
+    this.segregatedHelp = ko.computed(() => {
       const entry = this.archiveEntry();
       if (!!entry) {
         return entry.segregatedHelp;
@@ -180,7 +180,7 @@ function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, viewHelper, A
       this.archiveEntryTypeSubtype(newEntry.subtype);
       this.fileOrDirectory('file');
       this.fileNameSourcePath(undefined);
-      this.segregationName(undefined);
+      this.segregatedName(undefined);
       this.emptyDirValue(undefined);
       this.customPathValue(undefined);
     };
@@ -231,7 +231,7 @@ function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, viewHelper, A
         const options = archiveHelper.buildAddToArchiveOptions(this.archiveEntryType(), this.archiveEntry(),
           this.fileNameSourcePath(), this.fileOrDirectory(), {
             emptyDirName: this.emptyDirValue(),
-            segregationName: this.segregationName(),
+            segregatedName: this.segregatedName(),
             customPath: this.customPathValue()
           });
 

webui/src/js/views/add-to-archive-selection-dialog.html

@@ -18,10 +18,10 @@
         </oj-select-single>
 
         <oj-bind-if test="[[showSegregatedNameField() === true]]">
-          <oj-input-text label-hint="{{segregationLabel}}"
-                         value="{{segregationName}}"
+          <oj-input-text label-hint="{{segregatedLabel}}"
+                         value="{{segregatedName}}"
                          validators="[[[segregatedNameValidator]]]"
-                         help.instruction="{{segregationHelp}}"
+                         help.instruction="{{segregatedHelp}}"
                          required="true">
           </oj-input-text>
         </oj-bind-if>