Issue 6625 - UI - fix various issues with LDAP browser, etc

Description: Fixed these issues - Creating OU in ldap browser ends in error - Delete MemberOf Config Entry window does not close when you delete the shared config entry of MemberOf - Message about enabling any plugin is missing result - WebUI tries to load non-existent vendor-react.js - Missing word in success alert when changing replica role - Incomplete word after restarting an instance - Broken formatting and unclear descriprion when trying a DN rename - Confusing confirmation message upon deletion of an entry - Unclear message when trying to create entry with duplicate DN - Cannot go back in dialog when creating an entry encounters an error Relates: #6625 Reviewed by: jchapamn (Thanks!)
389ds · Feb 19, 2025 · e0e59f9 · e0e59f9
1 parent 985425b
commit e0e59f9
Show file tree

Hide file tree

Showing 24 changed files with 126 additions and 111 deletions.
diff --git a/src/cockpit/389-console/po/ja.po b/src/cockpit/389-console/po/ja.po
@@ -1954,7 +1954,7 @@ msgstr "警告! Account Policyの設定エントリ $0 が存在しません!"
 #: src/lib/plugins/accountPolicy.jsx:485
 #: src/lib/plugins/referentialIntegrity.jsx:623
 #: src/lib/plugins/memberOf.jsx:843 src/lib/plugins/managedEntries.jsx:797
-msgid "Config entry $0 was successfully $1ed"
+msgid "Config entry $0 was successfully $1"
 msgstr "構成エントリ $0 の $1 に成功しました"
 
 #: src/lib/plugins/accountPolicy.jsx:503 src/lib/plugins/dna.jsx:575
@@ -2622,15 +2622,15 @@ msgid "Delete Shared Config"
 msgstr "共有設定を削除"
 
 #: src/lib/plugins/pluginBasicConfig.jsx:117
-msgid "$0 plugin was successfully $1d."
+msgid "$0 plugin was successfully $1."
 msgstr "$0プラグインを$1にしました。"
 
 #: src/lib/plugins/pluginBasicConfig.jsx:118
 msgid "Please, restart the instance."
 msgstr "インスタンスを再起動してください。"
 
 #: src/lib/plugins/pluginBasicConfig.jsx:129
-msgid "$0 plugin was successfully $1d. Please, restart the instance."
+msgid "$0 plugin was successfully $1. Please, restart the instance."
 msgstr "$0プラグインを$1にしました。インスタンスを再起動してください。"
 
 #: src/lib/plugins/pluginBasicConfig.jsx:138 src/plugins.jsx:384
@@ -5512,7 +5512,7 @@ msgstr ""
 "(passwordSendExpiringTime)"
 
 #: src/lib/database/localPwp.jsx:414 src/lib/database/localPwp.jsx:2791
-msgid "<>Always Send <i>Password Expiring</i> Control</>"
+msgid "Always send Password Expiring Control"
 msgstr "パスワードの有効期限切れを警告する"
 
 #: src/lib/database/localPwp.jsx:425
@@ -7316,7 +7316,7 @@ msgid "Error loading global password policy - $0"
 msgstr "グローバルパスワードポリシーの読み込み中にエラーが発生しました - $0"
 
 #: src/lib/database/globalPwp.jsx:1235
-msgid "<>Always Send <i>Password Expiring</i>&nbsp; Control</>"
+msgid "Always send Password Expiring Control"
 msgstr "パスワードの有効期限切れを警告する"
 
 #: src/lib/database/globalPwp.jsx:1253
@@ -7595,7 +7595,7 @@ msgstr ""
 "してください"
 
 #: src/lib/replication/replConfig.jsx:153
-msgid "Successfully $0d replica to a $1"
+msgid "Successfully $0 replica to a $1"
 msgstr "$1にレプリカを$0しました"
 
 #: src/lib/replication/replConfig.jsx:165
@@ -9082,12 +9082,12 @@ msgstr "DNをリネームする"
 #: src/lib/ldap_editor/lib/editableTable.jsx:734
 msgid ""
 "You cannot modify the RDN ( Relative Distinguished Name ) in the "
-"<strong>Quick Update</strong> mode."
+"edit mode."
 msgstr "クイック更新モードでは、RDN(相対識別名)を変更することはできません。"
 
 #: src/lib/ldap_editor/lib/editableTable.jsx:736
 msgid ""
-"If you want to modify the RDN, please use the <strong>Quick Update</strong> "
+"If you want to modify the RDN, please use the <Rename "
 "action option"
 msgstr ""
 "RDNを変更する場合は、クイック更新アクションオプションを使用してください。"

diff --git a/src/cockpit/389-console/src/ds.jsx b/src/cockpit/389-console/src/ds.jsx
@@ -570,7 +570,7 @@ export class DSInstance extends React.Component {
                                     if (action === "stop") {
                                         action = "stopp"; // Fixes typo in notification
                                     }
-                                    this.addNotification("success", cockpit.format(_("Instance was successfully $0"), action));
+                                    this.addNotification("success", cockpit.format(_("Instance was successfully $0"), action + "ed"));
                                 })
                                 .fail(err => {
                                     const errMsg = JSON.parse(err);
@@ -697,9 +697,9 @@ export class DSInstance extends React.Component {
                             <span className="spinner spinner-lg spinner-inline" />
                         </p>
                         <div className="ds-margin-top-lg">
-                            <Progress 
-                                value={progressValue} 
-                                label={`${progressValue}%`} 
+                            <Progress
+                                value={progressValue}
+                                label={`${progressValue}%`}
                                 measureLocation={ProgressMeasureLocation.inside}
                                 aria-label="Directory Server Configuration loading progress"
                             />
@@ -775,8 +775,8 @@ export class DSInstance extends React.Component {
                             position={DropdownPosition.right}
                             onSelect={this.handleDropdown}
                             toggle={
-                                <DropdownToggle 
-                                    onToggle={(event, isOpen) => this.handleToggle(event, isOpen)} 
+                                <DropdownToggle
+                                    onToggle={(event, isOpen) => this.handleToggle(event, isOpen)}
                                     toggleIndicator={CaretDownIcon}
                                     variant="primary"
                                     id="ds-dropdown"

diff --git a/src/cockpit/389-console/src/index.html b/src/cockpit/389-console/src/index.html
@@ -8,7 +8,6 @@
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <script type="text/javascript" src="../base1/cockpit.js"></script>
-  <script src="./vendor-react.js"></script>
   <script type="text/javascript" src="po.js"></script>
   <link href="./index.css" type="text/css" rel="stylesheet">
 </head>

diff --git a/src/cockpit/389-console/src/lib/database/globalPwp.jsx b/src/cockpit/389-console/src/lib/database/globalPwp.jsx
@@ -721,7 +721,7 @@ export class GlobalPwPolicy extends React.Component {
                     'nsslapd-pwdpbkdf2numiterations': '',
                     '_nsslapd-pwdpbkdf2numiterations': ''
                 };
-                
+
                 if (!skipLoading) {
                     stateUpdates["loading"] = false
                 }
@@ -1393,7 +1393,7 @@ export class GlobalPwPolicy extends React.Component {
                                 onChange={(e, checked) => {
                                     this.handleExpChange(e);
                                 }}
-                                label={_("<>Always Send <i>Password Expiring</i>&nbsp; Control</>")}
+                                label={_("Always send Password Expiring Control")}
                             />
                         </GridItem>
                     </Grid>

diff --git a/src/cockpit/389-console/src/lib/database/localPwp.jsx b/src/cockpit/389-console/src/lib/database/localPwp.jsx
@@ -409,7 +409,7 @@ class CreatePolicy extends React.Component {
                                                 this.props.handleChange(e);
                                             }}
                                             isDisabled={!this.props.passwordexp}
-                                            label={_("<>Always Send <i>Password Expiring</i> Control</>")}
+                                            label={_("Always send Password Expiring Control")}
                                             className="ds-lower-field"
                                         />
                                     </GridItem>
@@ -2805,7 +2805,7 @@ export class LocalPwPolicy extends React.Component {
                                 onChange={(e, checked) => {
                                     this.handleExpChange(e);
                                 }}
-                                label={_("<>Always Send <i>Password Expiring</i> Control</>")}
+                                label={_("Always send Password Expiring Control")}
                             />
                         </GridItem>
                     </Grid>
@@ -3232,7 +3232,7 @@ export class LocalPwPolicy extends React.Component {
                         <TextContent>
                             <Text component={TextVariants.h3}>
                                 {_("Local Password Policies")}
-                                <Button 
+                                <Button
                                     variant="plain"
                                     aria-label={_("Refresh the local password policies")}
                                     onClick={this.handleLoadPolicies}

diff --git a/src/cockpit/389-console/src/lib/ldap_editor/lib/editableTable.jsx b/src/cockpit/389-console/src/lib/ldap_editor/lib/editableTable.jsx
@@ -714,14 +714,14 @@ class EditableTable extends React.Component {
     actionResolver = (rowData, { rowIndex }) => {
         const myAttr = rowData.cells[0].props.value;
         const myName = rowData.cells[0].props.name;
-        
+
         // Early return for DN
         if (myAttr === "dn") {
             return [];
         }
 
         const actions = [];
-        
+
         // Naming Action
         if (!(myName === this.state.namingRowID || this.props.disableNamingChange) &&
             ((this.props.namingAttr && myAttr !== this.props.namingAttr) || this.props.namingAttr === "")) {
@@ -745,7 +745,7 @@ class EditableTable extends React.Component {
         }
 
         // Add separator if needed
-        if (actions.length > 0 && (!this.props.isAttributeSingleValued(myAttr) || 
+        if (actions.length > 0 && (!this.props.isAttributeSingleValued(myAttr) ||
             !(this.state.tableRows.length === 1 || rowData.namingAttr ||
             ((this.props.isAttributeRequired(myAttr) || rowData.required) && this.hasSingleOccurrence(myAttr))))) {
             actions.push({ isSeparator: true });
@@ -889,9 +889,9 @@ class EditableTable extends React.Component {
                             </Button>
                         ]}
                     >
-                        {_("You cannot modify the RDN ( Relative Distinguished Name ) in the <strong>Quick Update</strong> mode.")}
+                        {_("You cannot modify the RDN ( Relative Distinguished Name ) in the edit mode.")}
                         <br />
-                        {_("If you want to modify the RDN, please use the <strong>Quick Update</strong> action option")}
+                        {_("If you want to modify the RDN, please use the Rename action option")}
                     </Modal>}
 
                 {isPasswordField &&
@@ -1023,7 +1023,7 @@ class EditableTable extends React.Component {
                             <Tr key={rowIndex}>
                                 {row.cells.map((cell, cellIndex) => (
                                     <Td key={cellIndex}>
-                                        {typeof cell.title === 'function' 
+                                        {typeof cell.title === 'function'
                                             ? cell.title(cell.props.value, rowIndex, cellIndex, cell.props)
                                             : cell.title}
                                     </Td>

diff --git a/src/cockpit/389-console/src/lib/ldap_editor/wizards/deleteOperation.jsx b/src/cockpit/389-console/src/lib/ldap_editor/wizards/deleteOperation.jsx
@@ -79,7 +79,9 @@ class DeleteOperationWizard extends React.Component {
                                this.state.numSubordinates,
                                (result) => {
                                    this.setState({
-                                       commandOutput: result.errorCode === 0 ? _("Successfully deleted entry") : _("Failed to delete entry, error: ") + result.errorCode,
+                                       commandOutput: result.errorCode === 0 ?
+                                        _("Successfully deleted entry") :
+                                        _("Failed to delete entry: ") + result.output,
                                        resultVariant: result.errorCode === 0 ? 'success' : 'danger',
                                        deleting: false,
                                    }, () => {
@@ -234,7 +236,7 @@ class DeleteOperationWizard extends React.Component {
         );
 
         let reviewInfo = '';
-        if (commandOutput === '') {
+        if (commandOutput === '' || commandOutput === "Successfully deleted entry") {
             reviewInfo = numSubordinates > 0
                 ? _("The entries were")
                 : _("The entry was");

diff --git a/src/cockpit/389-console/src/lib/ldap_editor/wizards/newEntry.jsx b/src/cockpit/389-console/src/lib/ldap_editor/wizards/newEntry.jsx
@@ -33,6 +33,10 @@ class NewEntryWizard extends React.Component {
         this.setState({ getStartedStepRadio: event.currentTarget.value });
     };
 
+    onToggleWizard = () => {
+        this.props.handleToggleWizard();
+    };
+
     createInitialLayout = () => {
         // console.log(`this.props.createRootEntry = ${this.props.createRootEntry}`);
         // Creation of a root entry.
@@ -130,10 +134,6 @@ variant="custom" isInline
         ]);
     };
 
-    onToggleWizard () {
-        this.props.handleToggleWizard();
-    }
-
     render () {
         const {
             getStartedStepRadio

diff --git a/src/cockpit/389-console/src/lib/ldap_editor/wizards/operations/aciNew.jsx b/src/cockpit/389-console/src/lib/ldap_editor/wizards/operations/aciNew.jsx
@@ -594,7 +594,9 @@ class AddNewAci extends React.Component {
             modifyLdapEntry(params, ldifArray, (result) => {
                 this.props.refreshAciTable();
                 this.setState({
-                    commandOutput: result.errorCode === 0 ? _("Successfully added ACI!") : _("Failed to add ACI, error: ") + result.errorCode,
+                    commandOutput: result.errorCode === 0 ?
+                        _("Successfully added ACI!") :
+                        _("Failed to add ACI: ") + result.output,
                     resultVariant: result.errorCode === 0 ? 'success' : 'danger',
                     adding: false
                 }, () => { this.props.onReload() }); // refreshes tableView
@@ -967,7 +969,7 @@ class AddNewAci extends React.Component {
                     <SelectOption key="allow" value="allow" />
                     <SelectOption key="deny" value="deny" />
                 </Select>
-                <Table 
+                <Table
                     aria-label="Selectable Table User Rights"
                     variant="compact"
                     borders={false}
@@ -1432,7 +1434,7 @@ class AddNewAci extends React.Component {
                 component: resultComponent,
                 nextButtonText: _("Finish"),
                 canJumpTo: stepIdReachedVisual >= 9,
-                hideBackButton: true,
+                hideBackButton: this.state.resultVariant === "success" ? true : false,
                 enableNext: !this.state.adding,
             }];
 

diff --git a/src/cockpit/389-console/src/lib/ldap_editor/wizards/operations/addCosDefinition.jsx b/src/cockpit/389-console/src/lib/ldap_editor/wizards/operations/addCosDefinition.jsx
@@ -217,7 +217,9 @@ class AddCosDefinition extends React.Component {
                                 (result) => {
                                     const myDn = myLdifArray[0].substring(4);
                                     this.setState({
-                                        commandOutput: result.errorCode === 0 ? _("CoS Definition successfully created!") : _("Failed to create cos: ") + result.errorCode,
+                                        commandOutput: result.errorCode === 0 ?
+                                            _("CoS Definition successfully created!") :
+                                            _("Failed to create cos: ") + result.output,
                                         resultVariant: result.errorCode === 0 ? 'success' : 'danger',
                                         adding: false,
                                         createdDefiniton: myDn,
@@ -1224,7 +1226,7 @@ class AddCosDefinition extends React.Component {
         );
 
         const ldifListItems = ldifArray.map((line, index) =>
-            <SimpleListItem key={index} isCurrent={line.startsWith('dn: ')}>
+            <SimpleListItem key={index} isActive={line.startsWith('dn: ')}>
                 {line}
             </SimpleListItem>
         );
@@ -1374,7 +1376,7 @@ class AddCosDefinition extends React.Component {
                 component: cosReviewStep,
                 nextButtonText: _("Finish"),
                 canJumpTo: stepIdReached >= 8 && stepIdReached < 9,
-                hideBackButton: true,
+                hideBackButton: this.state.resultVariant === "success" ? true : false,
                 enableNext: !this.state.adding
             },
             ...((this.state.cosType === 'classic') && (resultVariant !== 'danger')
@@ -1385,7 +1387,7 @@ class AddCosDefinition extends React.Component {
                         component: cosReviewStep,
                         nextButtonText: _("Finish"),
                         canJumpTo: stepIdReached > 9,
-                        hideBackButton: true,
+                        hideBackButton: this.state.resultVariant === "success" ? true : false,
                         enableNext: !this.state.adding
                     }
                 ]