From fddc2c32c54d324a2f5f328a46f09f70d663f6e4 Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Mon, 22 Nov 2021 20:32:58 -0800 Subject: [PATCH] htmlui: upgraded react-bootstrap to 2.x (#1532) --- htmlui/package-lock.json | 220 ++++++++++++++++++--------------- htmlui/package.json | 10 +- htmlui/src/App.js | 6 +- htmlui/src/BeginRestore.js | 8 +- htmlui/src/DirectoryObject.js | 8 +- htmlui/src/NewSnapshot.js | 8 +- htmlui/src/PoliciesTable.js | 12 +- htmlui/src/PolicyEditor.js | 14 +-- htmlui/src/RepoStatus.js | 14 +-- htmlui/src/SetupAzure.js | 2 +- htmlui/src/SetupB2.js | 2 +- htmlui/src/SetupFilesystem.js | 2 +- htmlui/src/SetupGCS.js | 2 +- htmlui/src/SetupKopiaServer.js | 2 +- htmlui/src/SetupRclone.js | 2 +- htmlui/src/SetupRepository.js | 12 +- htmlui/src/SetupS3.js | 2 +- htmlui/src/SetupSFTP.js | 2 +- htmlui/src/SetupToken.js | 2 +- htmlui/src/SetupWebDAV.js | 2 +- htmlui/src/SnapshotsTable.js | 10 +- htmlui/src/SourcesTable.js | 12 +- htmlui/src/Table.js | 4 +- htmlui/src/TaskDetails.js | 14 +-- htmlui/src/TaskLogs.js | 2 +- htmlui/src/TasksTable.js | 10 +- htmlui/src/forms.js | 4 +- htmlui/src/uiutil.js | 10 +- 28 files changed, 207 insertions(+), 191 deletions(-) diff --git a/htmlui/package-lock.json b/htmlui/package-lock.json index f08483477..28b9de333 100644 --- a/htmlui/package-lock.json +++ b/htmlui/package-lock.json @@ -15,7 +15,7 @@ "@fortawesome/react-fontawesome": "^0.1.16", "bootstrap": "^5.1.3", "moment": "^2.29.1", - "react-bootstrap-v5": "^1.4.0", + "react-bootstrap": "^2.0.2", "react-dom": "^17.0.2", "react-router-dom": "^5.3.0", "react-table": "^7.7.0" @@ -3082,6 +3082,17 @@ "url": "https://opencollective.com/popperjs" } }, + "node_modules/@react-aria/ssr": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.1.0.tgz", + "integrity": "sha512-RxqQKmE8sO7TGdrcSlHTcVzMP450hqowtBSd2bBS9oPlcokVkaGq28c3Rwa8ty5ctw4EBCjXqjP7xdcKMGDzug==", + "dependencies": { + "@babel/runtime": "^7.6.2" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1" + } + }, "node_modules/@restart/context": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz", @@ -3102,6 +3113,38 @@ "react": ">=16.8.0" } }, + "node_modules/@restart/ui": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-0.2.3.tgz", + "integrity": "sha512-FDhtjIR9QvUfMwvFsgVurRA1qdYxM0F0S07acywjG7gNI2YmQo78rtCYIe553V/pyBjEjaKAg3fzBFCocFTqyQ==", + "dependencies": { + "@babel/runtime": "^7.13.16", + "@popperjs/core": "^2.10.1", + "@react-aria/ssr": "^3.0.1", + "@restart/hooks": "^0.4.0", + "@types/warning": "^3.0.0", + "dequal": "^2.0.2", + "dom-helpers": "^5.2.0", + "prop-types": "^15.7.2", + "uncontrollable": "^7.2.1", + "warning": "^4.0.3" + }, + "peerDependencies": { + "react": ">=16.14.0", + "react-dom": ">=16.14.0" + } + }, + "node_modules/@restart/ui/node_modules/@restart/hooks": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.1.tgz", + "integrity": "sha512-87UMGZcFwbj0Gr+8eEBAzL6H8xF5pMwq/S3LWeFK9cg4+lTqLFMsiVQFT4ncMJzqgpdD7T6ktF8PsEHeN2O+MQ==", + "dependencies": { + "dequal": "^2.0.2" + }, + "peerDependencies": { + "react": ">=16.8.0" + } + }, "node_modules/@rollup/plugin-node-resolve": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz", @@ -3651,15 +3694,6 @@ "@babel/types": "^7.3.0" } }, - "node_modules/@types/classnames": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz", - "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==", - "deprecated": "This is a stub types definition. classnames provides its own type definitions, so you do not need this installed.", - "dependencies": { - "classnames": "*" - } - }, "node_modules/@types/eslint": { "version": "7.2.14", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.14.tgz", @@ -8890,6 +8924,14 @@ "node": ">= 0.6" } }, + "node_modules/dequal": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.2.tgz", + "integrity": "sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==", + "engines": { + "node": ">=6" + } + }, "node_modules/des.js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", @@ -24424,62 +24466,32 @@ "node": ">=10" } }, - "node_modules/react-bootstrap-v5": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/react-bootstrap-v5/-/react-bootstrap-v5-1.4.0.tgz", - "integrity": "sha512-AsPE19bacvLNXdTVqDLspM+K5SOa4XBgT6SFesUiC5JnYGqVmspIgYSgu8SwcSaiGgrkFtd9v9XLSqf0l9YvEA==", + "node_modules/react-bootstrap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.2.tgz", + "integrity": "sha512-QuMqJ+WJmd6dUyOys6OF3nr6T/FjUVAoEMbSjsFrwVufJtvMox0SU1Dvz/cDID+Dl6Rz2RLcJzyqkdl+DEK2Gg==", "dependencies": { - "@babel/runtime": "^7.4.2", + "@babel/runtime": "^7.14.0", "@restart/context": "^2.1.4", - "@restart/hooks": "^0.3.21", - "@types/classnames": "^2.2.10", + "@restart/hooks": "^0.3.26", + "@restart/ui": "^0.2.3", "@types/invariant": "^2.2.33", "@types/prop-types": "^15.7.3", - "@types/react": "^16.9.35", - "@types/react-transition-group": "^4.4.0", + "@types/react": ">=16.14.8", + "@types/react-transition-group": "^4.4.1", "@types/warning": "^3.0.0", - "classnames": "^2.2.6", - "dom-helpers": "^5.1.2", + "classnames": "^2.3.1", + "dom-helpers": "^5.2.1", "invariant": "^2.2.4", "prop-types": "^15.7.2", "prop-types-extra": "^1.1.0", - "react-overlays": "^4.1.0", "react-transition-group": "^4.4.1", - "uncontrollable": "^7.0.0", + "uncontrollable": "^7.2.1", "warning": "^4.0.3" }, "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } - }, - "node_modules/react-bootstrap-v5/node_modules/@types/react": { - "version": "16.14.11", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.11.tgz", - "integrity": "sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ==", - "dependencies": { - "@types/prop-types": "*", - "@types/scheduler": "*", - "csstype": "^3.0.2" - } - }, - "node_modules/react-bootstrap-v5/node_modules/react-overlays": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-4.1.1.tgz", - "integrity": "sha512-WtJifh081e6M24KnvTQoNjQEpz7HoLxqt8TwZM7LOYIkYJ8i/Ly1Xi7RVte87ZVnmqQ4PFaFiNHZhSINPSpdBQ==", - "dependencies": { - "@babel/runtime": "^7.12.1", - "@popperjs/core": "^2.5.3", - "@restart/hooks": "^0.3.25", - "@types/warning": "^3.0.0", - "dom-helpers": "^5.2.0", - "prop-types": "^15.7.2", - "uncontrollable": "^7.0.0", - "warning": "^4.0.3" - }, - "peerDependencies": { - "react": ">=16.3.0", - "react-dom": ">=16.3.0" + "react": ">=16.14.0", + "react-dom": ">=16.14.0" } }, "node_modules/react-dev-utils": { @@ -32872,6 +32884,14 @@ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.1.tgz", "integrity": "sha512-HnUhk1Sy9IuKrxEMdIRCxpIqPw6BFsbYSEUO9p/hNw5sMld/+3OLMWQP80F8/db9qsv3qUjs7ZR5bS/R+iinXw==" }, + "@react-aria/ssr": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.1.0.tgz", + "integrity": "sha512-RxqQKmE8sO7TGdrcSlHTcVzMP450hqowtBSd2bBS9oPlcokVkaGq28c3Rwa8ty5ctw4EBCjXqjP7xdcKMGDzug==", + "requires": { + "@babel/runtime": "^7.6.2" + } + }, "@restart/context": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz", @@ -32887,6 +32907,33 @@ "lodash-es": "^4.17.20" } }, + "@restart/ui": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-0.2.3.tgz", + "integrity": "sha512-FDhtjIR9QvUfMwvFsgVurRA1qdYxM0F0S07acywjG7gNI2YmQo78rtCYIe553V/pyBjEjaKAg3fzBFCocFTqyQ==", + "requires": { + "@babel/runtime": "^7.13.16", + "@popperjs/core": "^2.10.1", + "@react-aria/ssr": "^3.0.1", + "@restart/hooks": "^0.4.0", + "@types/warning": "^3.0.0", + "dequal": "^2.0.2", + "dom-helpers": "^5.2.0", + "prop-types": "^15.7.2", + "uncontrollable": "^7.2.1", + "warning": "^4.0.3" + }, + "dependencies": { + "@restart/hooks": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.1.tgz", + "integrity": "sha512-87UMGZcFwbj0Gr+8eEBAzL6H8xF5pMwq/S3LWeFK9cg4+lTqLFMsiVQFT4ncMJzqgpdD7T6ktF8PsEHeN2O+MQ==", + "requires": { + "dequal": "^2.0.2" + } + } + } + }, "@rollup/plugin-node-resolve": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz", @@ -33278,14 +33325,6 @@ "@babel/types": "^7.3.0" } }, - "@types/classnames": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz", - "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==", - "requires": { - "classnames": "*" - } - }, "@types/eslint": { "version": "7.2.14", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.14.tgz", @@ -37463,6 +37502,11 @@ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", "dev": true }, + "dequal": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.2.tgz", + "integrity": "sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==" + }, "des.js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", @@ -49502,56 +49546,28 @@ "whatwg-fetch": "^3.4.1" } }, - "react-bootstrap-v5": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/react-bootstrap-v5/-/react-bootstrap-v5-1.4.0.tgz", - "integrity": "sha512-AsPE19bacvLNXdTVqDLspM+K5SOa4XBgT6SFesUiC5JnYGqVmspIgYSgu8SwcSaiGgrkFtd9v9XLSqf0l9YvEA==", + "react-bootstrap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.2.tgz", + "integrity": "sha512-QuMqJ+WJmd6dUyOys6OF3nr6T/FjUVAoEMbSjsFrwVufJtvMox0SU1Dvz/cDID+Dl6Rz2RLcJzyqkdl+DEK2Gg==", "requires": { - "@babel/runtime": "^7.4.2", + "@babel/runtime": "^7.14.0", "@restart/context": "^2.1.4", - "@restart/hooks": "^0.3.21", - "@types/classnames": "^2.2.10", + "@restart/hooks": "^0.3.26", + "@restart/ui": "^0.2.3", "@types/invariant": "^2.2.33", "@types/prop-types": "^15.7.3", - "@types/react": "^16.9.35", - "@types/react-transition-group": "^4.4.0", + "@types/react": ">=16.14.8", + "@types/react-transition-group": "^4.4.1", "@types/warning": "^3.0.0", - "classnames": "^2.2.6", - "dom-helpers": "^5.1.2", + "classnames": "^2.3.1", + "dom-helpers": "^5.2.1", "invariant": "^2.2.4", "prop-types": "^15.7.2", "prop-types-extra": "^1.1.0", - "react-overlays": "^4.1.0", "react-transition-group": "^4.4.1", - "uncontrollable": "^7.0.0", + "uncontrollable": "^7.2.1", "warning": "^4.0.3" - }, - "dependencies": { - "@types/react": { - "version": "16.14.11", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.11.tgz", - "integrity": "sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ==", - "requires": { - "@types/prop-types": "*", - "@types/scheduler": "*", - "csstype": "^3.0.2" - } - }, - "react-overlays": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-4.1.1.tgz", - "integrity": "sha512-WtJifh081e6M24KnvTQoNjQEpz7HoLxqt8TwZM7LOYIkYJ8i/Ly1Xi7RVte87ZVnmqQ4PFaFiNHZhSINPSpdBQ==", - "requires": { - "@babel/runtime": "^7.12.1", - "@popperjs/core": "^2.5.3", - "@restart/hooks": "^0.3.25", - "@types/warning": "^3.0.0", - "dom-helpers": "^5.2.0", - "prop-types": "^15.7.2", - "uncontrollable": "^7.0.0", - "warning": "^4.0.3" - } - } } }, "react-dev-utils": { diff --git a/htmlui/package.json b/htmlui/package.json index 1036f1dc6..45b47f0bb 100644 --- a/htmlui/package.json +++ b/htmlui/package.json @@ -9,7 +9,7 @@ "@fortawesome/react-fontawesome": "^0.1.16", "bootstrap": "^5.1.3", "moment": "^2.29.1", - "react-bootstrap-v5": "^1.4.0", + "react-bootstrap": "^2.0.2", "react-dom": "^17.0.2", "react-router-dom": "^5.3.0", "react-table": "^7.7.0" @@ -40,12 +40,12 @@ "@testing-library/jest-dom": "^5.15.0", "@testing-library/react": "^12.1.2", "axios": "^0.24.0", + "axios-mock-adapter": "^1.20.0", + "enzyme": "^3.11.0", + "enzyme-adapter-react-16": "^1.15.6", "postcss": "^8.3.11", "pretty": "^2.0.0", "react": "^17.0.2", - "react-scripts": "^4.0.3", - "axios-mock-adapter": "^1.20.0", - "enzyme": "^3.11.0", - "enzyme-adapter-react-16": "^1.15.6" + "react-scripts": "^4.0.3" } } diff --git a/htmlui/src/App.js b/htmlui/src/App.js index f876e0a85..5dda500ab 100644 --- a/htmlui/src/App.js +++ b/htmlui/src/App.js @@ -1,9 +1,9 @@ import axios from 'axios'; import 'bootstrap/dist/css/bootstrap.min.css'; import React, { useEffect, useRef, useState } from 'react'; -import Container from 'react-bootstrap-v5/lib/Container'; -import Nav from 'react-bootstrap-v5/lib/Nav'; -import Navbar from 'react-bootstrap-v5/lib/Navbar'; +import Container from 'react-bootstrap/Container'; +import Nav from 'react-bootstrap/Nav'; +import Navbar from 'react-bootstrap/Navbar'; import { BrowserRouter as Router, NavLink, Redirect, Route, Switch } from 'react-router-dom'; import './App.css'; import { BeginRestore } from './BeginRestore'; diff --git a/htmlui/src/BeginRestore.js b/htmlui/src/BeginRestore.js index 3be5893c7..3f65fac80 100644 --- a/htmlui/src/BeginRestore.js +++ b/htmlui/src/BeginRestore.js @@ -1,9 +1,9 @@ import axios from 'axios'; import React, { Component } from 'react'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Form from 'react-bootstrap-v5/lib/Form'; -import Row from 'react-bootstrap-v5/lib/Row'; -import Col from 'react-bootstrap-v5/lib/Col'; +import Button from 'react-bootstrap/Button'; +import Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; +import Col from 'react-bootstrap/Col'; import { Link } from "react-router-dom"; import { handleChange, RequiredBoolean, RequiredField, RequiredNumberField, validateRequiredFields } from './forms'; import { errorAlert, GoBackButton } from './uiutil'; diff --git a/htmlui/src/DirectoryObject.js b/htmlui/src/DirectoryObject.js index 317f7ce0a..45d58139c 100644 --- a/htmlui/src/DirectoryObject.js +++ b/htmlui/src/DirectoryObject.js @@ -2,10 +2,10 @@ import { faCopy } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import axios from 'axios'; import React, { Component } from 'react'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Row from 'react-bootstrap-v5/lib/Row'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Spinner from 'react-bootstrap-v5/lib/Spinner'; +import Button from 'react-bootstrap/Button'; +import Row from 'react-bootstrap/Row'; +import Col from 'react-bootstrap/Col'; +import Spinner from 'react-bootstrap/Spinner'; import { DirectoryItems } from "./DirectoryItems"; import { GoBackButton } from './uiutil'; diff --git a/htmlui/src/NewSnapshot.js b/htmlui/src/NewSnapshot.js index e8b3d57ea..d4b79cee9 100644 --- a/htmlui/src/NewSnapshot.js +++ b/htmlui/src/NewSnapshot.js @@ -2,10 +2,10 @@ import { faWindowClose } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import axios from 'axios'; import React, { Component } from 'react'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Form from 'react-bootstrap-v5/lib/Form'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Button from 'react-bootstrap/Button'; +import Col from 'react-bootstrap/Col'; +import Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; import { handleChange, validateRequiredFields } from './forms'; import { PolicyEditor } from './PolicyEditor'; import { TaskDetails } from './TaskDetails'; diff --git a/htmlui/src/PoliciesTable.js b/htmlui/src/PoliciesTable.js index 92132d31f..ababcfa2d 100644 --- a/htmlui/src/PoliciesTable.js +++ b/htmlui/src/PoliciesTable.js @@ -2,12 +2,12 @@ import { faUserFriends } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import axios from 'axios'; import React, { Component } from 'react'; -import Badge from 'react-bootstrap-v5/lib/Badge'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Dropdown from 'react-bootstrap-v5/lib/Dropdown'; -import Form from 'react-bootstrap-v5/lib/Form'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Badge from 'react-bootstrap/Badge'; +import Button from 'react-bootstrap/Button'; +import Col from 'react-bootstrap/Col'; +import Dropdown from 'react-bootstrap/Dropdown'; +import Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; import { handleChange } from './forms'; import { PolicyEditor } from './PolicyEditor'; import MyTable from './Table'; diff --git a/htmlui/src/PolicyEditor.js b/htmlui/src/PolicyEditor.js index 327ea8fc7..4e9161975 100644 --- a/htmlui/src/PolicyEditor.js +++ b/htmlui/src/PolicyEditor.js @@ -2,13 +2,13 @@ import { faChevronLeft } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import axios from 'axios'; import React, { Component } from 'react'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Form from 'react-bootstrap-v5/lib/Form'; -import Row from 'react-bootstrap-v5/lib/Row'; -import Spinner from 'react-bootstrap-v5/lib/Spinner'; -import Tab from 'react-bootstrap-v5/lib/Tab'; -import Tabs from 'react-bootstrap-v5/lib/Tabs'; +import Button from 'react-bootstrap/Button'; +import Col from 'react-bootstrap/Col'; +import Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; +import Spinner from 'react-bootstrap/Spinner'; +import Tab from 'react-bootstrap/Tab'; +import Tabs from 'react-bootstrap/Tabs'; import { handleChange, OptionalBoolean, OptionalNumberField, RequiredBoolean, stateProperty, StringList } from './forms'; import { errorAlert, sourceQueryStringParams } from './uiutil'; diff --git a/htmlui/src/RepoStatus.js b/htmlui/src/RepoStatus.js index 05d74bca2..3624f0d3a 100644 --- a/htmlui/src/RepoStatus.js +++ b/htmlui/src/RepoStatus.js @@ -1,12 +1,12 @@ import axios from 'axios'; import React, { Component } from 'react'; -import Badge from 'react-bootstrap-v5/lib/Badge'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Row from 'react-bootstrap-v5/lib/Row'; -import Form from 'react-bootstrap-v5/lib/Form'; -import InputGroup from 'react-bootstrap-v5/lib/InputGroup'; -import Spinner from 'react-bootstrap-v5/lib/Spinner'; +import Badge from 'react-bootstrap/Badge'; +import Button from 'react-bootstrap/Button'; +import Col from 'react-bootstrap/Col'; +import Row from 'react-bootstrap/Row'; +import Form from 'react-bootstrap/Form'; +import InputGroup from 'react-bootstrap/InputGroup'; +import Spinner from 'react-bootstrap/Spinner'; import { handleChange } from './forms'; import { SetupRepository } from './SetupRepository'; diff --git a/htmlui/src/SetupAzure.js b/htmlui/src/SetupAzure.js index 64eed4b2d..a371f51d7 100644 --- a/htmlui/src/SetupAzure.js +++ b/htmlui/src/SetupAzure.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, OptionalField, RequiredField, validateRequiredFields } from './forms'; export class SetupAzure extends Component { diff --git a/htmlui/src/SetupB2.js b/htmlui/src/SetupB2.js index 335933be2..1e95dc4af 100644 --- a/htmlui/src/SetupB2.js +++ b/htmlui/src/SetupB2.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, OptionalField, RequiredField, validateRequiredFields } from './forms'; export class SetupB2 extends Component { diff --git a/htmlui/src/SetupFilesystem.js b/htmlui/src/SetupFilesystem.js index 9d10db8c1..a51efa5e3 100644 --- a/htmlui/src/SetupFilesystem.js +++ b/htmlui/src/SetupFilesystem.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, RequiredField, validateRequiredFields } from './forms'; diff --git a/htmlui/src/SetupGCS.js b/htmlui/src/SetupGCS.js index 8b0b34c40..fdf37a1c2 100644 --- a/htmlui/src/SetupGCS.js +++ b/htmlui/src/SetupGCS.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, OptionalField, RequiredField, validateRequiredFields } from './forms'; diff --git a/htmlui/src/SetupKopiaServer.js b/htmlui/src/SetupKopiaServer.js index 283fa659c..a430a96dc 100644 --- a/htmlui/src/SetupKopiaServer.js +++ b/htmlui/src/SetupKopiaServer.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, OptionalField, RequiredField, validateRequiredFields } from './forms'; export class SetupKopiaServer extends Component { diff --git a/htmlui/src/SetupRclone.js b/htmlui/src/SetupRclone.js index b0571ffbd..b2176adfe 100644 --- a/htmlui/src/SetupRclone.js +++ b/htmlui/src/SetupRclone.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, OptionalField, RequiredField, validateRequiredFields } from './forms'; export class SetupRclone extends Component { diff --git a/htmlui/src/SetupRepository.js b/htmlui/src/SetupRepository.js index 55e86da6a..bc996272e 100644 --- a/htmlui/src/SetupRepository.js +++ b/htmlui/src/SetupRepository.js @@ -2,12 +2,12 @@ import { faAngleDoubleDown, faAngleDoubleUp } from '@fortawesome/free-solid-svg- import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import axios from 'axios'; import React, { Component } from 'react'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Collapse from 'react-bootstrap-v5/lib/Collapse'; -import Form from 'react-bootstrap-v5/lib/Form'; -import Row from 'react-bootstrap-v5/lib/Row'; -import Spinner from 'react-bootstrap-v5/lib/Spinner'; +import Button from 'react-bootstrap/Button'; +import Col from 'react-bootstrap/Col'; +import Collapse from 'react-bootstrap/Collapse'; +import Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; +import Spinner from 'react-bootstrap/Spinner'; import { handleChange, RequiredBoolean, RequiredField, validateRequiredFields } from './forms'; import { SetupAzure } from './SetupAzure'; import { SetupB2 } from "./SetupB2"; diff --git a/htmlui/src/SetupS3.js b/htmlui/src/SetupS3.js index c1574623c..57ccc3193 100644 --- a/htmlui/src/SetupS3.js +++ b/htmlui/src/SetupS3.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, OptionalField, RequiredBoolean, RequiredField, validateRequiredFields } from './forms'; export class SetupS3 extends Component { diff --git a/htmlui/src/SetupSFTP.js b/htmlui/src/SetupSFTP.js index ce7c99245..3aae5e175 100644 --- a/htmlui/src/SetupSFTP.js +++ b/htmlui/src/SetupSFTP.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, hasExactlyOneOf, OptionalField, OptionalNumberField, RequiredBoolean, RequiredField, validateRequiredFields } from './forms'; export class SetupSFTP extends Component { diff --git a/htmlui/src/SetupToken.js b/htmlui/src/SetupToken.js index bb0616c8a..da3f6a3f4 100644 --- a/htmlui/src/SetupToken.js +++ b/htmlui/src/SetupToken.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, RequiredField, validateRequiredFields } from './forms'; export class SetupToken extends Component { diff --git a/htmlui/src/SetupWebDAV.js b/htmlui/src/SetupWebDAV.js index c7bb69803..7582521aa 100644 --- a/htmlui/src/SetupWebDAV.js +++ b/htmlui/src/SetupWebDAV.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Row from 'react-bootstrap/Row'; import { handleChange, OptionalField, RequiredField, validateRequiredFields } from './forms'; export class SetupWebDAV extends Component { diff --git a/htmlui/src/SnapshotsTable.js b/htmlui/src/SnapshotsTable.js index 24eecaf5b..f061bc3bc 100644 --- a/htmlui/src/SnapshotsTable.js +++ b/htmlui/src/SnapshotsTable.js @@ -1,10 +1,10 @@ import axios from 'axios'; import React, { Component } from 'react'; -import Badge from 'react-bootstrap-v5/lib/Badge'; -import Form from 'react-bootstrap-v5/lib/Form'; -import Row from 'react-bootstrap-v5/lib/Row'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Spinner from 'react-bootstrap-v5/lib/Spinner'; +import Badge from 'react-bootstrap/Badge'; +import Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; +import Col from 'react-bootstrap/Col'; +import Spinner from 'react-bootstrap/Spinner'; import { Link } from "react-router-dom"; import MyTable from './Table'; import { compare, GoBackButton, objectLink, parseQuery, rfc3339TimestampForDisplay, sizeWithFailures, sourceQueryStringParams } from './uiutil'; diff --git a/htmlui/src/SourcesTable.js b/htmlui/src/SourcesTable.js index 8eadbe200..f369b977d 100644 --- a/htmlui/src/SourcesTable.js +++ b/htmlui/src/SourcesTable.js @@ -3,12 +3,12 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import axios from 'axios'; import moment from 'moment'; import React, { Component } from 'react'; -import Badge from 'react-bootstrap-v5/lib/Badge'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Dropdown from 'react-bootstrap-v5/lib/Dropdown'; -import Row from 'react-bootstrap-v5/lib/Row'; -import Spinner from 'react-bootstrap-v5/lib/Spinner'; +import Badge from 'react-bootstrap/Badge'; +import Button from 'react-bootstrap/Button'; +import Col from 'react-bootstrap/Col'; +import Dropdown from 'react-bootstrap/Dropdown'; +import Row from 'react-bootstrap/Row'; +import Spinner from 'react-bootstrap/Spinner'; import { Link } from 'react-router-dom'; import { handleChange } from './forms'; import MyTable from './Table'; diff --git a/htmlui/src/Table.js b/htmlui/src/Table.js index 82fc81b40..991a05b41 100644 --- a/htmlui/src/Table.js +++ b/htmlui/src/Table.js @@ -1,6 +1,6 @@ import React from 'react'; -import Pagination from 'react-bootstrap-v5/lib/Pagination'; -import Table from 'react-bootstrap-v5/lib/Table'; +import Pagination from 'react-bootstrap/Pagination'; +import Table from 'react-bootstrap/Table'; import { usePagination, useSortBy, useTable } from 'react-table'; function paginationItems(count, active, gotoPage) { diff --git a/htmlui/src/TaskDetails.js b/htmlui/src/TaskDetails.js index a124ac558..f0e073ebe 100644 --- a/htmlui/src/TaskDetails.js +++ b/htmlui/src/TaskDetails.js @@ -3,13 +3,13 @@ import { faChevronCircleDown, faChevronCircleUp, faStopCircle } from '@fortaweso import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import axios from 'axios'; import React, { Component } from 'react'; -import Alert from 'react-bootstrap-v5/lib/Alert'; -import Badge from 'react-bootstrap-v5/lib/Badge'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Form from 'react-bootstrap-v5/lib/Form'; -import Row from 'react-bootstrap-v5/lib/Row'; -import Spinner from 'react-bootstrap-v5/lib/Spinner'; +import Alert from 'react-bootstrap/Alert'; +import Badge from 'react-bootstrap/Badge'; +import Button from 'react-bootstrap/Button'; +import Col from 'react-bootstrap/Col'; +import Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; +import Spinner from 'react-bootstrap/Spinner'; import { TaskLogs } from './TaskLogs'; import { cancelTask, formatDuration, GoBackButton, redirectIfNotConnected, sizeDisplayName } from './uiutil'; diff --git a/htmlui/src/TaskLogs.js b/htmlui/src/TaskLogs.js index da31454cb..bfeba314c 100644 --- a/htmlui/src/TaskLogs.js +++ b/htmlui/src/TaskLogs.js @@ -1,7 +1,7 @@ import axios from 'axios'; import React, { Component } from 'react'; -import Table from 'react-bootstrap-v5/lib/Table'; +import Table from 'react-bootstrap/Table'; import { handleChange } from './forms'; import { redirectIfNotConnected } from './uiutil'; diff --git a/htmlui/src/TasksTable.js b/htmlui/src/TasksTable.js index d95e79456..9512fce57 100644 --- a/htmlui/src/TasksTable.js +++ b/htmlui/src/TasksTable.js @@ -4,11 +4,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import axios from 'axios'; import moment from 'moment'; import React, { Component } from 'react'; -import Alert from 'react-bootstrap-v5/lib/Alert'; -import Col from 'react-bootstrap-v5/lib/Col'; -import Dropdown from 'react-bootstrap-v5/lib/Dropdown'; -import Form from 'react-bootstrap-v5/lib/Form'; -import Row from 'react-bootstrap-v5/lib/Row'; +import Alert from 'react-bootstrap/Alert'; +import Col from 'react-bootstrap/Col'; +import Dropdown from 'react-bootstrap/Dropdown'; +import Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; import { Link } from 'react-router-dom'; import { handleChange } from './forms'; import MyTable from './Table'; diff --git a/htmlui/src/forms.js b/htmlui/src/forms.js index 065a4fa8e..a8ab655d5 100644 --- a/htmlui/src/forms.js +++ b/htmlui/src/forms.js @@ -1,6 +1,6 @@ import React from 'react'; -import Form from 'react-bootstrap-v5/lib/Form'; -import Col from 'react-bootstrap-v5/lib/Col'; +import Form from 'react-bootstrap/Form'; +import Col from 'react-bootstrap/Col'; export function validateRequiredFields(component, fields) { let updateState = {}; diff --git a/htmlui/src/uiutil.js b/htmlui/src/uiutil.js index 2aead927b..fc9705c18 100644 --- a/htmlui/src/uiutil.js +++ b/htmlui/src/uiutil.js @@ -2,11 +2,11 @@ import { faBan, faCheck, faChevronLeft, faExclamationCircle, faExclamationTriang import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import axios from 'axios'; import React from 'react'; -import Button from 'react-bootstrap-v5/lib/Button'; -import Form from 'react-bootstrap-v5/lib/Form'; -import FormControl from 'react-bootstrap-v5/lib/FormControl'; -import InputGroup from 'react-bootstrap-v5/lib/InputGroup'; -import Spinner from 'react-bootstrap-v5/lib/Spinner'; +import Button from 'react-bootstrap/Button'; +import Form from 'react-bootstrap/Form'; +import FormControl from 'react-bootstrap/FormControl'; +import InputGroup from 'react-bootstrap/InputGroup'; +import Spinner from 'react-bootstrap/Spinner'; const base10UnitPrefixes = ["", "K", "M", "G", "T"];