Merge branch 'jira-wktui-418' into 'main'

Support adding SAML2 initialization data files to archive

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

Author: robertpatrick

electron/app/js/wdtArchive.js

@@ -154,6 +154,13 @@ function getEntryTypes() {
       fileHelp: i18n.t('wdt-archiveType-opssWallet-fileHelp'),
       pathPrefix: 'wlsdeploy/opsswallet/'
     },
+    'saml2InitializationData': {
+      name: i18n.t('wdt-archiveType-saml2InitializationData'),
+      subtype: 'file',
+      fileLabel: i18n.t('wdt-archiveType-saml2InitializationData-fileLabel'),
+      fileHelp: i18n.t('wdt-archiveType-saml2InitializationData-fileHelp'),
+      pathPrefix: 'wlsdeploy/security/saml2/'
+    },
     'script': {
       name: i18n.t('wdt-archiveType-script'),
       subtype: 'file',
@@ -590,6 +597,7 @@ async function _validateArchiveEntryData(targetWindow, entryType, typeDetail, en
       case 'nodeManagerKeystore':
       case 'script':
       case 'sharedLibraryDeploymentPlan':
+      case 'saml2InitializationData':
         _validateArchiveEntryFile(targetWindow, entryType, 'file', entryData.fileName).then(result => {
           resolve(result);
         });

electron/app/locales/en/electron.json

@@ -469,6 +469,10 @@
   "wdt-archiveType-opssWallet-fileLabel": "OPSS Wallet File",
   "wdt-archiveType-opssWallet-fileHelp": "Choose the full path to the OPSS wallet file to add to the OPSS wallet",
 
+  "wdt-archiveType-saml2InitializationData": "SAML2 Initialization Data",
+  "wdt-archiveType-saml2InitializationData-fileLabel": "SAML2 Initialization Data File",
+  "wdt-archiveType-saml2InitializationData-fileHelp": "Choose the full path to the SAML2 initialization data file",
+
   "wdt-archiveType-script": "Script",
   "wdt-archiveType-script-fileLabel": "Script File",
   "wdt-archiveType-script-fileHelp": "Choose the full path to the script file",

webui/src/css/app.css

@@ -87,22 +87,28 @@
 
 /* collapsible console panel, on every page */
 
-.wkt-console-header {
-  box-sizing: border-box;
+.wkt-console-section .oj-collapsible-header-wrapper {
   background-color: var(--oj-badge-bg-color);
   color: var(--oj-badge-text-color);
-  flex: 0 0 auto;
-  padding: 0 8px;
-  font-size: 1em;
-  font-weight: 600;
+  padding: 0;
 }
 
-.oj-collapsible .wkt-console-header.oj-collapsible-header .oj-collapsible-header-icon {
-  margin: 0;
+.wkt-console-section .oj-collapsible-header-wrapper .oj-collapsible-header-icon {
+  margin: 0 !important;
   padding: 2px 0;
   color: var(--oj-badge-text-color);
 }
 
+.wkt-console-section .oj-collapsible-header-wrapper .oj-collapsible-header-icon:hover {
+  color: var(--oj-badge-text-color);
+}
+
+.wkt-console-header {
+  color: var(--oj-badge-text-color);
+  padding: 0 2px;
+  font-weight: bold;
+}
+
 .wkt-console-content {
   box-sizing: border-box;
   flex: 1 1 auto;

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

@@ -6,12 +6,16 @@
 'use strict';
 
 define(['accUtils', 'knockout', 'utils/i18n', 'models/wkt-project', 'utils/dialog-helper', 'utils/wdt-archive-helper',
-  'ojs/ojarraydataprovider', 'utils/wkt-logger', 'ojs/ojknockout', 'ojs/ojinputtext', 'ojs/ojlabel', 'ojs/ojbutton',
-  'ojs/ojdialog', 'ojs/ojformlayout', 'ojs/ojselectsingle', 'ojs/ojvalidationgroup', 'ojs/ojradioset'],
-function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, ArrayDataProvider, wktLogger) {
+  'utils/view-helper', 'ojs/ojarraydataprovider', 'utils/wkt-logger', 'ojs/ojknockout', 'ojs/ojinputtext',
+  'ojs/ojlabel', 'ojs/ojbutton', 'ojs/ojdialog', 'ojs/ojformlayout', 'ojs/ojselectsingle', 'ojs/ojvalidationgroup',
+  'ojs/ojradioset'],
+function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, viewHelper, ArrayDataProvider, wktLogger) {
 
   const jqueryDialogName = '#addToArchiveSelectionDialog';
 
+  // static - remember the last selected type between invocations
+  let lastSelectedType = null;
+
   function AddToArchiveSelectionDialogModel() {
 
     let subscriptions = [];
@@ -23,11 +27,11 @@ function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, ArrayDataProv
         this.handleArchiveEntryTypeChange(newEntryKey);
       }));
 
-      // open the dialog after the current thread, which is loading this view model.
+      // open the dialog when the container is ready.
       // using oj-dialog initial-visibility="show" causes vertical centering issues.
-      setTimeout(function() {
+      viewHelper.componentReady(this.dialogContainer).then(() => {
         $(jqueryDialogName)[0].open();
-      }, 1);
+      });
     };
 
     this.disconnected = () => {
@@ -67,6 +71,11 @@ function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, ArrayDataProv
         this.archiveEntryTypes.push({key: key, label: value.name, ...value});
         this.archiveEntryTypes.sort((a, b) => (a.label > b.label) ? 1 : -1);
       }
+
+      // entryTypesMap must be established before setting this
+      if(lastSelectedType) {
+        this.archiveEntryType(lastSelectedType);
+      }
     });
 
     this.archiveEntryType = ko.observable();
@@ -228,6 +237,7 @@ function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, ArrayDataProv
 
         wktLogger.debug(`Calling addToArchive for entry type ${this.archiveEntryType()} with options: ${JSON.stringify(options)}`);
         archiveHelper.addToArchive(this.archiveEntryType(), options).then(() => {
+          lastSelectedType = this.archiveEntryType();
           $(jqueryDialogName)[0].close();
         }).catch(err => {
           dialogHelper.displayCatchAllError('add-archive-entry', err).then();

webui/src/js/views/app-main.html

@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+ Copyright (c) 2021, 2023, Oracle and/or its affiliates.
  Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
  -->
 
@@ -37,7 +37,7 @@
       <oj-module role="main" id="wktMainPane" class="wkt-main-pane" config="[[moduleAdapter.koObservableConfig]]">
       </oj-module>
 
-      <oj-collapsible expanded='{{wktConsole.show}}'>
+      <oj-collapsible class="wkt-console-section" expanded='{{wktConsole.show}}'>
         <span class="wkt-console-header" slot='header'><oj-bind-text value="{{consoleLabel}}"></oj-bind-text></span>
         <div id="wkt-console-content" class="wkt-console-content">
         </div>