Skip to content

Commit

Permalink
Remove history library (#2119)
Browse files Browse the repository at this point in the history
* Use navigate instead of push
* Remove use navigate
* Remove import
* Remove history
  • Loading branch information
reivaj05 committed Jun 13, 2022
1 parent 1d17f11 commit b02c37b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 39 deletions.
1 change: 0 additions & 1 deletion portal-ui/package.json
Expand Up @@ -32,7 +32,6 @@
"@types/websocket": "^1.0.0",
"@uiw/react-textarea-code-editor": "^2.0.2",
"chart.js": "^2.9.3",
"history": "^4.10.1",
"kbar": "^0.1.0-beta.34",
"local-storage-fallback": "^4.1.1",
"lodash": "^4.17.21",
Expand Down
10 changes: 0 additions & 10 deletions portal-ui/src/history.ts
@@ -1,15 +1,5 @@
import { createBrowserHistory } from "history";
import { BrowserHistoryBuildOptions } from "history/createBrowserHistory";

let browserHistoryOpts: BrowserHistoryBuildOptions = {};

let basename = document.baseURI.replace(window.location.origin, "");
// check if we are using base path, if not this always is `/`
const baseLocation = new URL(document.baseURI);
export const baseUrl = baseLocation.pathname;

if (basename !== "") {
browserHistoryOpts.basename = basename;
}

export default createBrowserHistory(browserHistoryOpts);
3 changes: 0 additions & 3 deletions portal-ui/src/screens/Console/Users/thunk/AddUsersThunk.tsx
Expand Up @@ -27,8 +27,6 @@ import {AppState} from "../../../../store";
import api from "../../../../common/api";
import {ErrorResponseHandler} from "../../../../common/types";
import {setErrorSnackMessage} from "../../../../systemSlice";
import history from "../../../../history";
import {IAM_PAGES} from "../../../../common/SecureComponent/permissions";

export const resetFormAsync = createAsyncThunk(
"resetForm/resetFormAsync",
Expand Down Expand Up @@ -58,7 +56,6 @@ export const createUserAsync = createAsyncThunk(
})
.then((res) => {
dispatch(setAddLoading(false));
history.push(`${IAM_PAGES.USERS}`);
})
.catch((err: ErrorResponseHandler) => {
dispatch(setAddLoading(false));
Expand Down
28 changes: 3 additions & 25 deletions portal-ui/yarn.lock
Expand Up @@ -6187,18 +6187,6 @@ highlight-es@^1.0.0:
is-es2016-keyword "^1.0.0"
js-tokens "^3.0.0"

history@^4.10.1:
version "4.10.1"
resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
dependencies:
"@babel/runtime" "^7.1.2"
loose-envify "^1.2.0"
resolve-pathname "^3.0.0"
tiny-invariant "^1.0.2"
tiny-warning "^1.0.0"
value-equal "^1.0.1"

history@^5.2.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
Expand Down Expand Up @@ -7836,7 +7824,7 @@ log-update-async-hook@^2.0.7:
onetime "^2.0.1"
wrap-ansi "^7.0.0"

loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.4.0:
loose-envify@^1.1.0, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
Expand Down Expand Up @@ -9993,11 +9981,6 @@ resolve-from@^5.0.0:
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==

resolve-pathname@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==

resolve-url-loader@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz#d50d4ddc746bb10468443167acf800dcd6c3ad57"
Expand Down Expand Up @@ -11146,12 +11129,12 @@ time-limit-promise@^1.0.2:
resolved "https://registry.yarnpkg.com/time-limit-promise/-/time-limit-promise-1.0.4.tgz#33e928212273c70d52153c28ad2a7e3319b975f9"
integrity sha512-FLHDDsIDducw7MBcRWlFtW2Tm50DoKOSFf0Nzx17qwXj8REXCte0eUkHrJl9QU3Bl9arG3XNYX0PcHpZ9xyuLw==

tiny-invariant@^1.0.2, tiny-invariant@^1.2.0:
tiny-invariant@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"
integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==

tiny-warning@^1.0.0, tiny-warning@^1.0.2, tiny-warning@^1.0.3:
tiny-warning@^1.0.2, tiny-warning@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
Expand Down Expand Up @@ -11564,11 +11547,6 @@ v8-to-istanbul@^8.1.0:
convert-source-map "^1.6.0"
source-map "^0.7.3"

value-equal@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==

vary@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
Expand Down

0 comments on commit b02c37b

Please sign in to comment.