Merge branch 'jira-wktui-498-file-chooser' into 'develop-2.0'

Support file selection for path attributes

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

Author: robertpatrick

electron/app/js/ipcRendererPreload.js

@@ -123,6 +123,7 @@ contextBridge.exposeInMainWorld(
           'get-network-settings',
           'choose-archive-file',
           'choose-archive-entry-file',
+          'choose-attribute-file',
           'add-archive-entry',
           'choose-domain-home',
           'choose-java-home',

electron/app/js/modelEdit/modelEditUtils.js

@@ -11,6 +11,7 @@ const fsPromises = require('fs/promises');
 const JSZip = require('jszip');
 const fs = require('fs');
 const path = require('path');
+const wdtArchive = require('../wdtArchive');
 
 const acronyms = [
   'ACL', 'ACS', 'CCDI', 'CORS', 'CPU', 'CRL', 'DB', 'DDL', 'EJB', 'HTTP', 'ID', 'JDBC', 'JMS', 'JNDI',
@@ -94,11 +95,11 @@ function addPaths(aliasFolder, path, pathMap) {
     }
 
     const wlstType = firstValue['wlst_type'];
-
-    // TODO: fix WLST types that are ${abc:xyz}
+    const usesPath = firstValue['uses_path_tokens'];
 
     attributes[key] = {
-      wlstType: wlstType
+      wlstType,
+      usesPath
     };
   }
 
@@ -164,7 +165,14 @@ function getMessagesFile() {
   return MESSAGES_FILE;
 }
 
+function chooseAttributeFile(targetWindow, fileOption, currentValue) {
+  const label = fileOption.chooserName || fileOption.label;
+  return wdtArchive.chooseAttributeFile(targetWindow, label, fileOption.type,
+    fileOption.extensions, currentValue, 'dialog-chooseAttributeFile');
+}
+
 module.exports = {
+  chooseAttributeFile,
   getAliasInfo,
   getMessageKeys,
   getMessageMap,

electron/app/js/wdtArchive.js

@@ -65,6 +65,8 @@ function getEntryTypes() {
       subtype: 'emptyDir',
       subtypeChoices: [
         { name: 'active', label: i18n.t('wdt-archiveType-coherenceStore-activeLabel')},
+        { name: 'backup', label: i18n.t('wdt-archiveType-coherenceStore-backupLabel')},
+        { name: 'events', label: i18n.t('wdt-archiveType-coherenceStore-eventsLabel')},
         { name: 'snapshot', label: i18n.t('wdt-archiveType-coherenceStore-snapshotLabel')},
         { name: 'trash', label: i18n.t('wdt-archiveType-coherenceStore-trashLabel')}
       ],
@@ -217,14 +219,17 @@ function getEntryTypes() {
 }
 
 async function chooseArchiveEntryFile(targetWindow, entryType, fileType, fileExtensions, currentValue) {
-  const i18n = require('./i18next.config');
-
   const typeDetail = getEntryTypes()[entryType];
   if (!typeDetail) {
     return Promise.reject(new Error(`Unknown archive entry type: ${entryType}`));
   }
+  return chooseAttributeFile(targetWindow, typeDetail.name, fileType, fileExtensions, currentValue, 'dialog-chooseArchiveEntry');
+}
+
+async function chooseAttributeFile(targetWindow, typeName, fileType, fileExtensions, currentValue, titleKey) {
+  const i18n = require('./i18next.config');
 
-  const title = i18n.t('dialog-chooseArchiveEntry', {entryType: typeDetail.name});
+  const title = i18n.t(titleKey, {entryType: typeName});
   const openProperty = fileType === 'dir' ? 'openDirectory' : 'openFile';
 
   let options = {
@@ -240,7 +245,7 @@ async function chooseArchiveEntryFile(targetWindow, entryType, fileType, fileExt
   }
 
   if (fileType === 'file' && Array.isArray(fileExtensions) && fileExtensions.length > 0) {
-    const filterName = i18n.t('dialog-archiveEntryFilter', {entryType: typeDetail.name});
+    const filterName = i18n.t('dialog-archiveEntryFilter', {entryType: typeName});
     options['filters'] = [ {name: filterName, extensions: fileExtensions} ];
   }
 
@@ -487,5 +492,6 @@ async function _showArchiveEntryAddError(targetWindow, title, errMessage) {
 module.exports = {
   getEntryTypes,
   addArchiveEntry,
-  chooseArchiveEntryFile
+  chooseArchiveEntryFile,
+  chooseAttributeFile
 };

electron/app/locales/en/electron.json

@@ -153,7 +153,7 @@
   "dialog-openProjectFileCredentialManagerErrorTitle": "Failed to Create Credential Manager",
   "dialog-openProjectFileCredentialManagerErrorMessage": "Unable to create credential manager for project file {{projectFileName}} due to an error: {{error}}",
   "dialog-openProjectFileSendToWindowErrorTitleErrorTitle": "Failed to Open Project",
-  "dialog-openProjectFileSendToWindowErrorTitleErrorMessage": "Unable to open project file {{projectFileName}} due to an error initializing the project window: {{err}}",
+  "dialog-openProjectFileSendToWindowErrorMessage": "Unable to open project file {{projectFileName}} due to an error initializing the project window: {{err}}",
   "dialog-createNewProjectTitle": "Create WebLogic Kubernetes Toolkit Project",
   "dialog-projectSaveFileLocationNotWritableTitle": "Project Directory Not Writable",
   "dialog-projectSaveFileLocationNotWritableError": "The {{projectFileDirectory}} directory chosen to write the new project file is not writable by the current process.",
@@ -202,6 +202,7 @@
   "dialog-tls-certfile": "Select TLS cert file",
 
   "dialog-chooseArchiveEntry": "Choose {{entryType}} for Archive",
+  "dialog-chooseAttributeFile": "Choose {{entryType}}",
   "dialog-archiveEntryFilter": "{{entryType}}",
   "dialog-getWebLogicRemoteConsoleHome": "Select the WebLogic Remote Console Installation",
   "dialog-getWebLogicRemoteConsoleAppImage": "Select the WebLogic Remote Console AppImage file",
@@ -392,6 +393,8 @@
 
   "wdt-archiveType-coherenceStore": "Coherence Persistence Directory",
   "wdt-archiveType-coherenceStore-activeLabel": "Active",
+  "wdt-archiveType-coherenceStore-backupLabel": "Backup",
+  "wdt-archiveType-coherenceStore-eventsLabel": "Events",
   "wdt-archiveType-coherenceStore-snapshotLabel": "Snapshot",
   "wdt-archiveType-coherenceStore-trashLabel": "Trash",
   "wdt-archiveType-coherenceStore-emptyDirLabel": "Coherence Persistence Directory Name",

electron/app/locales/en/modeledit.json

@@ -113,6 +113,18 @@
   "security-model-custom-roles-and-policies-label": "Custom Roles and Policies",
   "security-model-dd-only-label": "Deployment Descriptor Only",
 
+  "file-select-title": "Select {{attribute}}",
+  "file-select-label": "Selection type",
+  "file-select-type-file": "File",
+  "file-select-type-dir": "Directory",
+  "file-select-type-emptyDir": "Empty Directory",
+  "file-select-archive-title": "{{attribute}} Location",
+  "file-select-archive-label": "Location Type",
+  "file-select-use-file-location": "Use \"{{fileName}}\" on the local file system",
+  "file-select-add-to-archive": "Add \"{{fileName}}\" to archive file",
+  "file-select-archive-empty-dir": "Use a new empty directory in the archive file",
+  "file-select-local-empty-dir": "Use an empty directory on the file system",
+
   "options-default-label": "Default",
   "options-persist-label": "Persistent",
   "options-non-persist-label": "Not Persistent",
@@ -426,6 +438,7 @@
   "attribute-editor-from-variable": "From variable \"{{variable}}\"",
   "attribute-editor-missing-variable": "Missing variable \"{{variable}}\"",
   "attribute-editor-options": "Options",
+  "attribute-editor-select": "Select",
 
   "invalid-integer-error": "Value must be an integer",
   "invalid-double-error": "Value must be a decimal number, such as 4 or 3.5",
@@ -866,7 +879,7 @@
   "a-BatchSize-label": "Batch Size",
   "f-MessagingBridge-a-BatchSize-help": "The number of messages that are processed within one transaction. Batch Size only applies to a messaging bridge instance forwarding messages in synchronous mode and has a QOS (quality of service) that requires two-phase transactions.",
 
-  "a-BeaHome-label": "Bea Home",
+  "a-BeaHome-label": "BEA Home",
 
   "a-BeforeCompletionIterationLimit-label": "Before Completion Iteration Limit",
   "a-BeforeCompletionIterationLimit-help": "The maximum number of cycles that the transaction manager performs the beforeCompletion synchronization callback for this WebLogic Server domain. Nothing prevents a Synchronization object from registering another during beforeCompletion, even those whose beforeCompletions have already been called. For example, an EJB can call another in its ejbStore() method. To accommodate this, the transaction manager calls all Synchronization objects, then repeats the cycle if new ones have been registered. This count sets a limit to the number of cycles that synchronization occurs.",
@@ -4872,7 +4885,7 @@
   "a-PlaintextPasswordsEnabled-help": "Specifies whether plaintext passwords are allowed to be used.",
 
   "a-PlanDir-label": "Plan Directory",
-  "a-PlanDir-help": "The location of this application's configuration area. This directory can contain external descriptor files as specified within the deployment plan document. f the plan directory is a relative path, it is resolved relative to InstallDir if InstallDir is not null; otherwise, it is resolved relative to the domain root.",
+  "a-PlanDir-help": "The location of this application's configuration area. This directory can contain external descriptor files as specified within the deployment plan document. If the plan directory is a relative path, it is resolved relative to InstallDir if InstallDir is not null; otherwise, it is resolved relative to the domain root.",
 
   "a-PlanPath-label": "Plan Path",
   "a-PlanPath-help": "The path to the deployment plan document on the Administration Server. If the plan path is a relative path, it is resolved relative to PlanDir if PlanDir is not null; otherwise, it is resolved relative to the domain root.",
@@ -4921,7 +4934,7 @@
   "a-PolicyDeploymentEnabled-help": "Specifies whether this Authorization provider stores policies that are created while deploying a Web application or EJB.",
 
   "a-PolicySelectionPreference-label": "Policy Selection Preference",
-  "f-WebserviceSecurity-a-PolicySelectionPreference-help": "Specifies the value of the PolicySelectionPreference attribute. f NONE is specified, no preference is applied - the first policy alternative is always chosen, and optional policy assertions are ignored.",
+  "f-WebserviceSecurity-a-PolicySelectionPreference-help": "Specifies the value of the PolicySelectionPreference attribute. If NONE is specified, no preference is applied - the first policy alternative is always chosen, and optional policy assertions are ignored.",
 
   "a-PollingInterval-label": "Polling Interval",
   "a-PollingInterval-help": "The frequency (in seconds) that WebLogic Server checks the attribute value.  The default value is 10.",
@@ -7076,7 +7089,7 @@
   "a-coherence_StartScriptName-label": "Coherence Start Script Name",
   "f-NMProperties-a-coherence_StartScriptName-help": "The name of the script to be executed to start the server.",
 
-  "a-compInfoXMLLocation-label": "Comp Info XML Location",
+  "a-compInfoXMLLocation-label": "Component Info XML Location",
   "a-compInfoXMLLocation-help": "The full path to the location of the ComponentInfo.xml file. The default location is ORACLE_HOME/oracle_common/rcu/config.",
 
   "a-databaseType-label": "Database Type",
@@ -7171,7 +7184,7 @@
 
   "a-st-label": "st",
 
-  "a-storageXMLLocation-label": "Storage XML Location",
+  "a-storageXMLLocation-label": "Storage Info XML Location",
   "a-storageXMLLocation-help": "The full path to the location of the StorageInfo.xml file. The default location is ORACLE_HOME/oracle_common/rcu/config.",
 
   "a-street-label": "street",

electron/app/main.js

@@ -478,6 +478,10 @@ class Main {
       return project.chooseArchiveFile(event.sender.getOwnerBrowserWindow());
     });
 
+    ipcMain.handle('choose-attribute-file', async (event, fileOption, currentValue) => {
+      return modelEditUtils.chooseAttributeFile(event.sender.getOwnerBrowserWindow(), fileOption, currentValue);
+    });
+
     ipcMain.handle('choose-archive-entry-file', async (event, itemType, fileType,
       fileExtensions, currentValue) => {