Issue 4169 - UI - Migrate Buttons to PF4 (#4745)

Description: Migrate buttons from PF3 to PF4

relates: https://github.com/389ds/389-ds-base/issues/4169

Reviewed by: mreynolds389, droideck (Many thanks)

src/cockpit/389-console/src/lib/database/backups.jsx

@@ -564,14 +564,14 @@ export class Backups extends React.Component {
                                 </div>
                                 <div className="ds-inline">
                                     <Button
-                                        bsStyle="primary"
+                                        variant="primary"
                                         onClick={this.showBackupModal}
                                         className="ds-margin-top"
                                     >
                                         Create Backup
                                     </Button>
                                     <Button
-                                        bsStyle="default"
+                                        variant="default"
                                         onClick={this.props.reload}
                                         className="ds-left-margin ds-margin-top"
                                     >
@@ -591,14 +591,14 @@ export class Backups extends React.Component {
                                 </div>
                                 <div className="ds-inline">
                                     <Button
-                                        bsStyle="primary"
+                                        variant="primary"
                                         onClick={this.showExportModal}
                                         className="ds-margin-top"
                                     >
                                         Create LDIF Export
                                     </Button>
                                     <Button
-                                        bsStyle="default"
+                                        variant="default"
                                         onClick={this.props.reload}
                                         className="ds-left-margin ds-margin-top"
                                     >

src/cockpit/389-console/src/lib/database/chaining.jsx

@@ -838,7 +838,7 @@ export class ChainingConfig extends React.Component {
             return;
         }
 
-        // Buld up the command of all the hcnge we have to do
+        // Build up the command of all the changes we need to make
         let cmd = [
             "dsconf", "-j", "ldapi://%2fvar%2frun%2fslapd-" + this.props.serverId + ".socket",
             "chaining", "link-set", this.props.suffix
@@ -984,7 +984,7 @@ export class ChainingConfig extends React.Component {
                     </Col>
                     <Col sm={2}>
                         <Button
-                            bsStyle="danger"
+                            variant="danger"
                             onClick={this.showDeleteConfirm}
                         >
                             Delete Link

src/cockpit/389-console/src/lib/database/globalPwp.jsx

@@ -2,7 +2,6 @@ import cockpit from "cockpit";
 import React from "react";
 import { log_cmd } from "../tools.jsx";
 import {
-    Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -18,7 +17,7 @@ import {
 } from "patternfly-react";
 import {
     Spinner,
-    // Button,
+    Button
     // Checkbox,
     // Form,
     // FormGroup,
@@ -1248,7 +1247,7 @@ export class GlobalPwPolicy extends React.Component {
                                             </Row>
                                             <Button
                                                 disabled={this.state.saveGeneralDisabled}
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 className="ds-margin-top-lg"
                                                 onClick={this.saveGeneral}
                                             >
@@ -1273,7 +1272,7 @@ export class GlobalPwPolicy extends React.Component {
                                             {pwExpirationRows}
                                             <Button
                                                 disabled={this.state.saveExpDisabled}
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 className="ds-margin-top-lg ds-margin-left"
                                                 onClick={this.saveExp}
                                             >
@@ -1298,7 +1297,7 @@ export class GlobalPwPolicy extends React.Component {
                                             {pwLockoutRows}
                                             <Button
                                                 disabled={this.state.saveLockoutDisabled}
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 className="ds-margin-top-lg ds-margin-left"
                                                 onClick={this.saveLockout}
                                             >
@@ -1323,7 +1322,7 @@ export class GlobalPwPolicy extends React.Component {
                                             {pwSyntaxRows}
                                             <Button
                                                 disabled={this.state.saveSyntaxDisabled}
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 className="ds-margin-top-lg ds-margin-left"
                                                 onClick={this.saveSyntax}
                                             >

src/cockpit/389-console/src/lib/database/localPwp.jsx

@@ -4,7 +4,6 @@ import { log_cmd, valid_dn } from "../tools.jsx";
 import { DoubleConfirmModal } from "../notifications.jsx";
 import { PwpTable } from "./databaseTables.jsx";
 import {
-    Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -22,7 +21,7 @@ import { Typeahead } from "react-bootstrap-typeahead";
 import {
     ExpandableSection,
     Spinner,
-    // Button,
+    Button
     // Checkbox,
     // Form,
     // FormGroup,
@@ -664,7 +663,7 @@ class CreatePolicy extends React.Component {
                 </Form>
                 <Button
                     disabled={this.props.createDisabled}
-                    bsStyle="primary"
+                    variant="primary"
                     className="ds-margin-top-lg ds-margin-left"
                     onClick={this.props.createPolicy}
                 >
@@ -2399,7 +2398,7 @@ export class LocalPwPolicy extends React.Component {
                                         </Row>
                                         <Button
                                             disabled={this.state.saveGeneralDisabled}
-                                            bsStyle="primary"
+                                            variant="primary"
                                             className="ds-margin-top-lg"
                                             onClick={this.saveGeneral}
                                             title="Save the General Settings"
@@ -2425,7 +2424,7 @@ export class LocalPwPolicy extends React.Component {
                                         {pwExpirationRows}
                                         <Button
                                             disabled={this.state.saveExpDisabled}
-                                            bsStyle="primary"
+                                            variant="primary"
                                             className="ds-margin-top-lg ds-margin-left"
                                             onClick={this.saveExp}
                                             title="Save the Expiration Settings"
@@ -2451,7 +2450,7 @@ export class LocalPwPolicy extends React.Component {
                                         {pwLockoutRows}
                                         <Button
                                             disabled={this.state.saveLockoutDisabled}
-                                            bsStyle="primary"
+                                            variant="primary"
                                             className="ds-margin-top-lg ds-margin-left"
                                             onClick={this.saveLockout}
                                             title="Save the Lockout Settings"
@@ -2477,7 +2476,7 @@ export class LocalPwPolicy extends React.Component {
                                         {pwSyntaxRows}
                                         <Button
                                             disabled={this.state.saveSyntaxDisabled}
-                                            bsStyle="primary"
+                                            variant="primary"
                                             className="ds-margin-top-lg ds-margin-left"
                                             onClick={this.saveSyntax}
                                             title="Save the Syntax Settings"

src/cockpit/389-console/src/lib/plugins/pluginTables.jsx

@@ -1,6 +1,5 @@
 import React from "react";
 import {
-    Button,
     DropdownButton,
     MenuItem,
     actionHeaderCellFormatter,
@@ -8,6 +7,9 @@ import {
     tableCellFormatter,
     noop
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import { DSTable } from "../dsTable.jsx";
 import PropTypes from "prop-types";
 
@@ -102,6 +104,7 @@ class PluginTable extends React.Component {
                                 return [
                                     <td key={rowData.cn[0]}>
                                         <Button
+                                            variant='primary'
                                             onClick={() => {
                                                 this.props.loadModalHandler(rowData);
                                             }}

src/cockpit/389-console/src/lib/replication/replAgmts.jsx

@@ -6,9 +6,11 @@ import { ReplAgmtModal } from "./replModals.jsx";
 import { log_cmd, valid_dn, valid_port } from "../tools.jsx";
 import PropTypes from "prop-types";
 import {
-    Button,
-    noop,
+    noop
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import {
     SortByDirection,
 } from '@patternfly/react-table';
@@ -1321,14 +1323,14 @@ export class ReplAgmts extends React.Component {
                 />
                 <div className="ds-margin-top ds-container ds-inline">
                     <Button
-                        bsStyle="primary"
+                        variant="primary"
                         onClick={this.showCreateAgmtModal}
                     >
                         Create Agreement
                     </Button>
                     <Button
                         className="ds-left-margin"
-                        bsStyle="default"
+                        variant="default"
                         onClick={() => {
                             this.props.reload(this.props.suffix);
                         }}

src/cockpit/389-console/src/lib/replication/replChangelog.jsx

@@ -3,7 +3,6 @@ import React from "react";
 import PropTypes from "prop-types";
 import { log_cmd } from "../tools.jsx";
 import {
-    Button,
     Col,
     ControlLabel,
     Checkbox,
@@ -13,7 +12,10 @@ import {
     Row,
     Spinner,
 } from "patternfly-react";
-import { Tooltip } from '@patternfly/react-core';
+import {
+    Tooltip,
+    Button
+} from '@patternfly/react-core';
 import OutlinedQuestionCircleIcon from '@patternfly/react-icons/dist/js/icons/outlined-question-circle-icon';
 
 export class Changelog extends React.Component {
@@ -305,7 +307,7 @@ export class Changelog extends React.Component {
                         <Row className="ds-margin-top-lg">
                             <Col sm={2}>
                                 <Button
-                                    bsStyle="primary"
+                                    variant="primary"
                                     onClick={this.saveSettings}
                                     disabled={!this.state.saveOK}
                                 >

src/cockpit/389-console/src/lib/replication/replConfig.jsx

@@ -5,7 +5,6 @@ import { ConfirmPopup } from "../notifications.jsx";
 import { ManagerTable } from "./replTables.jsx";
 import { AddManagerModal, ChangeReplRoleModal } from "./replModals.jsx";
 import {
-    Button,
     Row,
     Checkbox,
     Col,
@@ -15,12 +14,12 @@ import {
 } from "patternfly-react";
 import {
     ExpandableSection,
-    // Button,
+    Button,
     // Checkbox,
     // Form,
     // FormGroup,
     // TextInput,
-    Spinner,
+    Spinner
     // Grid,
     // GridItem,
     // noop
@@ -413,7 +412,7 @@ export class ReplConfig extends React.Component {
         if (this.props.role == "Supplier") {
             roleButton =
                 <Button
-                    bsStyle="primary"
+                    variant="primary"
                     onClick={this.showPromoteDemoteModal}
                     title="Demote this Supplier replica to a Hub or Consumer"
                     className="ds-inline-btn"
@@ -423,7 +422,7 @@ export class ReplConfig extends React.Component {
         } else if (this.props.role == "Hub") {
             roleButton =
                 <Button
-                    bsStyle="primary"
+                    variant="primary"
                     onClick={this.showPromoteDemoteModal}
                     title="Promote or Demote this Hub replica to a Supplier or Consumer"
                     className="ds-inline-btn"
@@ -434,7 +433,7 @@ export class ReplConfig extends React.Component {
             // Consumer
             roleButton =
                 <Button
-                    bsStyle="primary"
+                    variant="primary"
                     onClick={this.showPromoteDemoteModal}
                     title="Promote this Consumer replica to a Supplier or Hub"
                     className="ds-inline-btn"
@@ -497,7 +496,7 @@ export class ReplConfig extends React.Component {
                         <Row className="ds-margin-top">
                             <Col sm={4}>
                                 <Button
-                                    bsStyle="primary"
+                                    variant="primary"
                                     onClick={this.showAddManager}
                                 >
                                     Add Replication Manager
@@ -632,7 +631,7 @@ export class ReplConfig extends React.Component {
                                     <Row className="ds-margin-top-lg">
                                         <Col componentClass={ControlLabel} sm={4}>
                                             <Button
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 onClick={this.saveConfig}
                                             >
                                                 Save Configuration

src/cockpit/389-console/src/lib/replication/replSuffix.jsx

@@ -8,7 +8,6 @@ import { ReplRUV } from "./replTasks.jsx";
 import { DoubleConfirmModal } from "../notifications.jsx";
 import { EnableReplModal } from "./replModals.jsx";
 import {
-    Button,
     Col,
     ControlLabel,
     Icon,
@@ -21,6 +20,9 @@ import {
     TabContent,
     TabPane,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import PropTypes from "prop-types";
 import { log_cmd, valid_dn } from "../tools.jsx";
 
@@ -372,7 +374,7 @@ export class ReplSuffix extends React.Component {
         if (this.props.replicated) {
             replActionButton =
                 <Button
-                    bsStyle="danger"
+                    variant="danger"
                     onClick={this.handleReplChange}
                     title="Disable replication, and remove all replication agreements."
                 >
@@ -385,7 +387,7 @@ export class ReplSuffix extends React.Component {
                         Replication is not enabled for this suffix
                     </h4>
                     <Button
-                        bsStyle="primary"
+                        variant="primary"
                         onClick={this.handleReplChange}
                         className="ds-margin-top-lg"
                     >

src/cockpit/389-console/src/lib/replication/replTasks.jsx

@@ -6,7 +6,6 @@ import { ExportModal, ExportCLModal } from "./replModals.jsx";
 import { DoubleConfirmModal } from "../notifications.jsx";
 import PropTypes from "prop-types";
 import {
-    Button,
     Col,
     ControlLabel,
     Form,
@@ -14,6 +13,9 @@ import {
     noop,
     Row,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 
 export class ReplRUV extends React.Component {
     constructor(props) {
@@ -431,7 +433,7 @@ export class ReplRUV extends React.Component {
                     <Row className="ds-margin-top-lg">
                         <Col sm={3} componentClass={ControlLabel}>
                             <Button
-                                bsStyle="primary"
+                                variant="primary"
                                 onClick={this.showConfirmExport}
                                 title="See Database Tab -> Backups & LDIFs to manage the new LDIF"
                             >
@@ -454,7 +456,7 @@ export class ReplRUV extends React.Component {
                             title="Export the changelog to an LDIF file.  Typically used for changelog encryption purposes, or debugging."
                         >
                             <Button
-                                bsStyle="primary"
+                                variant="primary"
                                 onClick={this.showCLExport}
                             >
                                 Export Changelog
@@ -472,7 +474,7 @@ export class ReplRUV extends React.Component {
                             title="Initialize the changelog with an LDIF file for changelog encryption purposes."
                         >
                             <Button
-                                bsStyle="primary"
+                                variant="primary"
                                 onClick={this.showConfirmCLImport}
                             >
                                 Import Changelog

src/cockpit/389-console/src/lib/replication/winsyncAgmts.jsx

@@ -6,9 +6,11 @@ import { WinsyncAgmtModal } from "./replModals.jsx";
 import { log_cmd, valid_dn, valid_port } from "../tools.jsx";
 import PropTypes from "prop-types";
 import {
-    Button,
     noop,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import {
     SortByDirection,
 } from '@patternfly/react-table';
@@ -1106,14 +1108,14 @@ export class WinsyncAgmts extends React.Component {
                 />
                 <div className="ds-margin-top ds-container ds-inline">
                     <Button
-                        bsStyle="primary"
+                        variant="primary"
                         onClick={this.showCreateAgmtModal}
                     >
                         Create Agreement
                     </Button>
                     <Button
                         className="ds-left-margin"
-                        bsStyle="default"
+                        variant="default"
                         onClick={() => {
                             this.props.reload(this.props.suffix);
                         }}

src/cockpit/389-console/src/lib/security/certificateManagement.jsx

@@ -6,10 +6,12 @@ import {
     TabContainer,
     TabContent,
     TabPane,
-    Button,
     Spinner,
     noop
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import { DoubleConfirmModal } from "../../lib/notifications.jsx";
 import {
     CertTable
@@ -529,7 +531,7 @@ export class CertificateManagement extends React.Component {
                                             delCert={this.showDeleteConfirm}
                                         />
                                         <Button
-                                            bsStyle="primary"
+                                            variant="primary"
                                             className="ds-margin-top-med"
                                             onClick={() => {
                                                 this.showAddCAModal();
@@ -548,7 +550,7 @@ export class CertificateManagement extends React.Component {
                                             delCert={this.showDeleteConfirm}
                                         />
                                         <Button
-                                            bsStyle="primary"
+                                            variant="primary"
                                             className="ds-margin-top-med"
                                             onClick={() => {
                                                 this.showAddModal();

src/cockpit/389-console/src/lib/security/ciphers.jsx

@@ -1,13 +1,15 @@
 import React from "react";
 import cockpit from "cockpit";
 import {
-    Button,
     Row,
     Col,
     ControlLabel,
     Spinner,
     noop,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import { log_cmd } from "../../lib/tools.jsx";
 import PropTypes from "prop-types";
 import { Typeahead } from "react-bootstrap-typeahead";
@@ -278,7 +280,7 @@ export class Ciphers extends React.Component {
                         </Col>
                     </Row>
                     <Button
-                        bsStyle="primary"
+                        variant="primary"
                         className="ds-margin-top-lg"
                         onClick={() => {
                             this.saveCipherPref();

src/cockpit/389-console/src/lib/server/accessLog.jsx

@@ -2,7 +2,6 @@ import cockpit from "cockpit";
 import React from "react";
 import { log_cmd } from "../tools.jsx";
 import {
-    Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -18,6 +17,9 @@ import {
     noop,
     TabPane,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import PropTypes from "prop-types";
 
 const accesslog_levels = [
@@ -479,7 +481,7 @@ export class ServerAccessLog extends React.Component {
                                     </div>
                                     <Button
                                         disabled={this.state.saveSettingsDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("settings");
@@ -598,7 +600,7 @@ export class ServerAccessLog extends React.Component {
                                     </Row>
                                     <Button
                                         disabled={this.state.saveRotationDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("rotation");
@@ -680,7 +682,7 @@ export class ServerAccessLog extends React.Component {
                                     </Row>
                                     <Button
                                         disabled={this.state.saveExpDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("exp");

src/cockpit/389-console/src/lib/server/auditLog.jsx

@@ -2,7 +2,6 @@ import cockpit from "cockpit";
 import React from "react";
 import { log_cmd } from "../tools.jsx";
 import {
-    Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -18,6 +17,9 @@ import {
     noop,
     TabPane,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import PropTypes from "prop-types";
 
 const settings_attrs = [
@@ -339,7 +341,7 @@ export class ServerAuditLog extends React.Component {
                                     </div>
                                     <Button
                                         disabled={this.state.saveSettingsDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("settings");
@@ -458,7 +460,7 @@ export class ServerAuditLog extends React.Component {
                                     </Row>
                                     <Button
                                         disabled={this.state.saveRotationDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("rotation");
@@ -540,7 +542,7 @@ export class ServerAuditLog extends React.Component {
                                     </Row>
                                     <Button
                                         disabled={this.state.saveExpDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("exp");

src/cockpit/389-console/src/lib/server/auditfailLog.jsx

@@ -2,7 +2,6 @@ import cockpit from "cockpit";
 import React from "react";
 import { log_cmd } from "../tools.jsx";
 import {
-    Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -18,6 +17,9 @@ import {
     noop,
     TabPane,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import PropTypes from "prop-types";
 
 const settings_attrs = [
@@ -337,7 +339,7 @@ export class ServerAuditFailLog extends React.Component {
                                     </div>
                                     <Button
                                         disabled={this.state.saveSettingsDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("settings");
@@ -456,7 +458,7 @@ export class ServerAuditFailLog extends React.Component {
                                     </Row>
                                     <Button
                                         disabled={this.state.saveRotationDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("rotation");
@@ -538,7 +540,7 @@ export class ServerAuditFailLog extends React.Component {
                                     </Row>
                                     <Button
                                         disabled={this.state.saveExpDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("exp");

src/cockpit/389-console/src/lib/server/errorLog.jsx

@@ -2,7 +2,6 @@ import cockpit from "cockpit";
 import React from "react";
 import { log_cmd } from "../tools.jsx";
 import {
-    Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -18,6 +17,9 @@ import {
     noop,
     TabPane,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import PropTypes from "prop-types";
 
 const errorlog_levels = [
@@ -672,7 +674,7 @@ export class ServerErrorLog extends React.Component {
                                     </div>
                                     <Button
                                         disabled={this.state.saveSettingsDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("settings");
@@ -791,7 +793,7 @@ export class ServerErrorLog extends React.Component {
                                     </Row>
                                     <Button
                                         disabled={this.state.saveRotationDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("rotation");
@@ -873,7 +875,7 @@ export class ServerErrorLog extends React.Component {
                                     </Row>
                                     <Button
                                         disabled={this.state.saveExpDisabled}
-                                        bsStyle="primary"
+                                        variant="primary"
                                         className="ds-margin-top-med"
                                         onClick={() => {
                                             this.saveConfig("exp");

src/cockpit/389-console/src/lib/server/ldapi.jsx

@@ -2,7 +2,6 @@ import cockpit from "cockpit";
 import React from "react";
 import { log_cmd } from "../tools.jsx";
 import {
-    Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -13,6 +12,9 @@ import {
     noop,
     Spinner,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import PropTypes from "prop-types";
 
 const ldapi_attrs = [
@@ -252,7 +254,7 @@ export class ServerLDAPI extends React.Component {
                     {mapUserAttrs}
                     <Button
                         disabled={this.state.saveDisabled}
-                        bsStyle="primary"
+                        variant="primary"
                         className="ds-margin-top-med"
                         onClick={this.saveConfig}
                     >

src/cockpit/389-console/src/lib/server/sasl.jsx

@@ -3,7 +3,6 @@ import React from "react";
 import { DoubleConfirmModal } from "../notifications.jsx";
 import { log_cmd } from "../tools.jsx";
 import {
-    // Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -14,8 +13,8 @@ import {
     Spinner,
 } from "patternfly-react";
 import {
-    Button,
-} from '@patternfly/react-core';
+    Button
+} from "@patternfly/react-core";
 import { SASLTable } from "./serverTables.jsx";
 import { SASLMappingModal } from "./serverModals.jsx";
 import { Typeahead } from "react-bootstrap-typeahead";
@@ -694,7 +693,7 @@ export class ServerSASL extends React.Component {
                     </Form>
                     <Button
                         disabled={this.state.saveDisabled}
-                        bsStyle="primary"
+                        variant="primary"
                         className="ds-margin-top-med"
                         onClick={this.saveConfig}
                     >
@@ -723,7 +722,7 @@ export class ServerSASL extends React.Component {
                         className="ds-margin-top"
                     />
                     <Button
-                        bsStyle="primary"
+                        variant="primary"
                         className="ds-margin-top-med"
                         onClick={this.showCreateMapping}
                     >

src/cockpit/389-console/src/lib/server/serverModals.jsx

@@ -111,7 +111,7 @@ export class SASLMappingModal extends React.Component {
                         <Col sm={1}>
                             <Button
                                 disabled={this.props.testBtnDisabled}
-                                bsStyle="primary"
+                                variant="primary"
                                 onClick={this.props.handleTestRegex}
                             >
                                 Test It

src/cockpit/389-console/src/lib/server/settings.jsx

@@ -2,7 +2,6 @@ import cockpit from "cockpit";
 import React from "react";
 import { log_cmd, valid_dn } from "../tools.jsx";
 import {
-    Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -18,6 +17,9 @@ import {
     noop,
     TabPane,
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import PropTypes from "prop-types";
 
 const general_attrs = [
@@ -1034,7 +1036,7 @@ export class ServerSettings extends React.Component {
                                             </Row>
                                             <Button
                                                 disabled={this.state.configSaveDisabled}
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 className="ds-margin-top-med"
                                                 onClick={this.saveConfig}
                                             >
@@ -1109,7 +1111,7 @@ export class ServerSettings extends React.Component {
                                                 </Col>
                                             </Row>
                                             <Button
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 className="ds-margin-top-med"
                                                 disabled={this.state.rootDNSaveDisabled}
                                                 onClick={this.saveRootDN}
@@ -1134,7 +1136,7 @@ export class ServerSettings extends React.Component {
                                         {diskMonitor}
                                         <Button
                                             disabled={this.state.diskMonSaveDisabled}
-                                            bsStyle="primary"
+                                            variant="primary"
                                             className="ds-margin-top-med"
                                             onClick={this.saveDiskMonitoring}
                                         >
@@ -1294,7 +1296,7 @@ export class ServerSettings extends React.Component {
                                             </Row>
                                             <Button
                                                 disabled={this.state.advSaveDisabled}
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 className="ds-margin-top-lg"
                                                 onClick={this.saveAdvanced}
                                             >

src/cockpit/389-console/src/lib/server/tuning.jsx

@@ -2,7 +2,6 @@ import cockpit from "cockpit";
 import React from "react";
 import { log_cmd } from "../tools.jsx";
 import {
-    Button,
     Col,
     ControlLabel,
     Form,
@@ -13,7 +12,7 @@ import {
 } from "patternfly-react";
 import {
     ExpandableSection,
-    // Button,
+    Button,
     // Form,
     // FormGroup,
     // TextInput,
@@ -532,7 +531,7 @@ export class ServerTuning extends React.Component {
                     </ExpandableSection>
                     <Button
                         disabled={this.state.saveDisabled}
-                        bsStyle="primary"
+                        variant="primary"
                         className="ds-margin-top-lg ds-margin-left"
                         onClick={this.saveConfig}
                     >

src/cockpit/389-console/src/schema.jsx

@@ -14,10 +14,10 @@ import {
     Checkbox,
     TabContainer,
     TabContent,
-    TabPane,
-    Button
+    TabPane
 } from "patternfly-react";
 import {
+    Button,
     Spinner,
     noop
 } from "@patternfly/react-core";
@@ -957,7 +957,7 @@ export class Schema extends React.Component {
                                             />
                                             <Button
                                                 className="ds-margin-top"
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 onClick={this.showAddObjectclassModal}
                                             >
                                                 Add ObjectClass
@@ -1008,7 +1008,7 @@ export class Schema extends React.Component {
                                             />
                                             <Button
                                                 className="ds-margin-top"
-                                                bsStyle="primary"
+                                                variant="primary"
                                                 onClick={this.showAddAttributeModal}
                                             >
                                                 Add Attribute

src/cockpit/389-console/src/security.jsx

@@ -8,7 +8,6 @@ import { CertificateManagement } from "./lib/security/certificateManagement.jsx"
 import { SecurityEnableModal } from "./lib/security/securityModals.jsx";
 import { Ciphers } from "./lib/security/ciphers.jsx";
 import {
-    Button,
     Checkbox,
     Col,
     ControlLabel,
@@ -24,6 +23,9 @@ import {
     noop,
     TabPane
 } from "patternfly-react";
+import {
+    Button
+} from "@patternfly/react-core";
 import PropTypes from "prop-types";
 
 export class Security extends React.Component {
@@ -756,7 +758,7 @@ export class Security extends React.Component {
                             </Col>
                         </Row>
                         <Button
-                            bsStyle="primary"
+                            variant="primary"
                             className="ds-margin-top-lg"
                             onClick={() => {
                                 this.saveSecurityConfig();