From 35516226ad3e784626812e4a3be09dcb165a867d Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <77892330+PritishBudhiraja@users.noreply.github.com>
Date: Wed, 20 Dec 2023 19:21:41 +0530
Subject: [PATCH 1/7] feat: Resend Invite Removal (#121)
---
src/screens/HyperSwitch/APIUtils/APIUtils.res | 1 +
.../UserManagement/ShowUserData.res | 18 +++++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/screens/HyperSwitch/APIUtils/APIUtils.res b/src/screens/HyperSwitch/APIUtils/APIUtils.res
index b66e3f52d..c4ed16b9f 100644
--- a/src/screens/HyperSwitch/APIUtils/APIUtils.res
+++ b/src/screens/HyperSwitch/APIUtils/APIUtils.res
@@ -179,6 +179,7 @@ let getURL = (
| #INVITE
| #RESEND_INVITE =>
`${userUrl}/user/${(userType :> string)->Js.String2.toLowerCase}`
+
| #SWITCH_MERCHANT =>
switch methodType {
| Get => `${userUrl}/switch/list`
diff --git a/src/screens/HyperSwitch/UserManagement/ShowUserData.res b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
index e5a88bd68..1f01211cb 100644
--- a/src/screens/HyperSwitch/UserManagement/ShowUserData.res
+++ b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
@@ -12,7 +12,7 @@ module UserHeading = {
let updateDetails = useUpdateMethod()
let status = infoValue.status->UserRoleEntity.statusToVariantMapper
- let resendInvite = async () => {
+ let _resendInvite = async () => {
try {
let url = getURL(~entityName=USERS, ~userType=#RESEND_INVITE, ~methodType=Post, ())
let body = [("user_id", userId->Js.Json.string)]->Js.Dict.fromArray->Js.Json.object_
@@ -38,14 +38,14 @@ module UserHeading = {
| _ => infoValue.status->Js.String2.toUpperCase->React.string
}}
-
-
+ //
+ //
}
From c7a2d3c5f7f88bc719c2c96ad315221574e967b7 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 20 Dec 2023 14:33:55 +0000
Subject: [PATCH 2/7] chore(version): v1.13.0
---
CHANGELOG.md | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db1abb654..8207bd0ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,28 @@ All notable changes to this project will be documented in this file. See [conven
- - -
+## 1.13.0 (2023-12-20)
+
+### Features
+
+- New wasm changes ([#114](https://github.com/juspay/hyperswitch-control-center/pull/114)) ([`758f80d`](https://github.com/juspay/hyperswitch-control-center/commit/758f80d945bd558f7059b8ec40b2b373aaa2e77a))
+- Dropdown grouping added in routing ([#102](https://github.com/juspay/hyperswitch-control-center/pull/102)) ([`52933b4`](https://github.com/juspay/hyperswitch-control-center/commit/52933b434dd6920e821a465b51c5bbb46ced68cd))
+- Resend Invite Removal ([#121](https://github.com/juspay/hyperswitch-control-center/pull/121)) ([`3551622`](https://github.com/juspay/hyperswitch-control-center/commit/35516226ad3e784626812e4a3be09dcb165a867d))
+
+### Bug Fixes
+
+- Connector UI Issue. ([#113](https://github.com/juspay/hyperswitch-control-center/pull/113)) ([`ad28e1c`](https://github.com/juspay/hyperswitch-control-center/commit/ad28e1ca72f3d57407cb679a451e43ccd94ae2de))
+- Signout API removed. ([#116](https://github.com/juspay/hyperswitch-control-center/pull/116)) ([`af13892`](https://github.com/juspay/hyperswitch-control-center/commit/af13892017a5ca1e4bac8dcbe26d837a87467634))
+- Connector files changes for paypal onboarding ([#115](https://github.com/juspay/hyperswitch-control-center/pull/115)) ([`74f327c`](https://github.com/juspay/hyperswitch-control-center/commit/74f327c5067a17d44313492e0032422a70d8aa9d))
+- Metadata field issue fix ([#117](https://github.com/juspay/hyperswitch-control-center/pull/117)) ([`585674a`](https://github.com/juspay/hyperswitch-control-center/commit/585674a5fe324492c290c1e6ec32fd8b71822402))
+- Typos in readme - fix typos in Readme.md ([#105](https://github.com/juspay/hyperswitch-control-center/pull/105)) ([`c88dcd2`](https://github.com/juspay/hyperswitch-control-center/commit/c88dcd23a8c291fd538ba6c4631a15cdf28c502d))
+- Refunds reports end point change ([#119](https://github.com/juspay/hyperswitch-control-center/pull/119)) ([`ffc819e`](https://github.com/juspay/hyperswitch-control-center/commit/ffc819ef39c33f7a58e560cd3d1a1e7184ef4eba))
+
+**Full Changelog:** [`v1.12.0...v1.13.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.12.0...v1.13.0)
+
+- - -
+
+
## 1.12.0 (2023-12-19)
### Features
From 36177c71ae369b1b82c16b6ed59d298a646efc3a Mon Sep 17 00:00:00 2001
From: Rachit Naithani <81706961+racnan@users.noreply.github.com>
Date: Thu, 21 Dec 2023 20:44:36 +0530
Subject: [PATCH 3/7] fix: disable-user-invite-button (#124)
---
.../HyperSwitch/UserManagement/UserRoleEntry.res | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res b/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res
index 5541a02fb..faebc0ed5 100644
--- a/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res
+++ b/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res
@@ -122,14 +122,14 @@ let make = () => {
subTitle="Manage user roles and invite members of your organisation"
/>
-
-
+ //
+ //
Date: Thu, 21 Dec 2023 15:19:10 +0000
Subject: [PATCH 4/7] chore(version): v1.13.1
---
CHANGELOG.md | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8207bd0ac..a7564bbe6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [conven
- - -
+## 1.13.1 (2023-12-21)
+
+### Bug Fixes
+
+- Disable-user-invite-button ([#124](https://github.com/juspay/hyperswitch-control-center/pull/124)) ([`36177c7`](https://github.com/juspay/hyperswitch-control-center/commit/36177c71ae369b1b82c16b6ed59d298a646efc3a))
+
+**Full Changelog:** [`v1.13.0...v1.13.1`](https://github.com/juspay/hyperswitch-control-center/compare/v1.13.0...v1.13.1)
+
+- - -
+
+
## 1.13.0 (2023-12-20)
### Features
From ea91fba4505fc8b64e0bc161ca41d1395fb83af2 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <77892330+PritishBudhiraja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 15:49:38 +0530
Subject: [PATCH 5/7] feat: Sidebar expansion close (#126)
---
src/screens/HyperSwitch/Sidebar/Sidebar.res | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/screens/HyperSwitch/Sidebar/Sidebar.res b/src/screens/HyperSwitch/Sidebar/Sidebar.res
index 6767f8d19..cf2ae62b5 100644
--- a/src/screens/HyperSwitch/Sidebar/Sidebar.res
+++ b/src/screens/HyperSwitch/Sidebar/Sidebar.res
@@ -364,6 +364,15 @@ module SidebarNestedSection = {
None
}, (isSectionExpanded, isSideBarExpanded))
+ React.useEffect2(() => {
+ if isSideBarExpanded {
+ setIsSectionExpanded(_ => isAnySubItemSelected)
+ } else {
+ setIsSectionExpanded(_ => false)
+ }
+ None
+ }, (isSideBarExpanded, isAnySubItemSelected))
+
let toggleSectionExpansion = React.useCallback4(_ev => {
if !isSideBarExpanded {
setIsSidebarExpanded(_ => true)
From 195aee00302ea2b4a353a8002575aee36427fc42 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 24 Dec 2023 14:33:51 +0000
Subject: [PATCH 6/7] chore(version): v1.14.0
---
CHANGELOG.md | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7564bbe6..02aa64c18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [conven
- - -
+## 1.14.0 (2023-12-24)
+
+### Features
+
+- Sidebar expansion close ([#126](https://github.com/juspay/hyperswitch-control-center/pull/126)) ([`ea91fba`](https://github.com/juspay/hyperswitch-control-center/commit/ea91fba4505fc8b64e0bc161ca41d1395fb83af2))
+
+**Full Changelog:** [`v1.13.1...v1.14.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.13.1...v1.14.0)
+
+- - -
+
+
## 1.13.1 (2023-12-21)
### Bug Fixes
From aeb49279fde5fdf290b5662b6a2a99b322516d81 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <77892330+PritishBudhiraja@users.noreply.github.com>
Date: Tue, 26 Dec 2023 11:44:50 +0530
Subject: [PATCH 7/7] fix: Removed Sublevel remote link type & Pageloader CSS
fixes. (#120)
---
src/screens/HyperSwitch/Sidebar/Sidebar.res | 53 +++++--------------
.../HyperSwitch/Sidebar/SidebarTypes.res | 4 +-
.../Utils/HSwitchGlobalSearchBar.res | 3 +-
.../HyperSwitch/Utils/PageLoaderWrapper.res | 3 +-
4 files changed, 16 insertions(+), 47 deletions(-)
diff --git a/src/screens/HyperSwitch/Sidebar/Sidebar.res b/src/screens/HyperSwitch/Sidebar/Sidebar.res
index cf2ae62b5..11b063f99 100644
--- a/src/screens/HyperSwitch/Sidebar/Sidebar.res
+++ b/src/screens/HyperSwitch/Sidebar/Sidebar.res
@@ -216,25 +216,6 @@ module NestedSidebarItem = {
}
-
- | SubLevelRemoteLink(tabOption) => {
- let {name, link, access, ?remoteIcon} = tabOption
- let (remoteUi, link) = if remoteIcon->Belt.Option.getWithDefault(false) {
- (, link)
- } else {
- (React.null, `${link}${getSearchParamByLink(link)}`)
- }
-
- ReactDOM.Ref.domRef}
- href={link}
- target="_blank"
- className={`${textColor} relative overflow-hidden flex flex-row items-center cursor-pointer ${paddingClass} ${selectedClass} `}>
-
- remoteUi
-
-
- }
}}
}
@@ -308,23 +289,18 @@ module NestedSectionItem = {
- {
- let subSectionsArr =
- section.links
- ->Array.mapWithIndex((subLevelItem, index) => {
- let isSelected = subLevelItem->isSubLevelItemSelected
-
- })
- ->React.array
-
- subSectionsArr
- }
+ {section.links
+ ->Array.mapWithIndex((subLevelItem, index) => {
+ let isSelected = subLevelItem->isSubLevelItemSelected
+
+ })
+ ->React.array}
}
@@ -341,9 +317,7 @@ module SidebarNestedSection = {
) => {
let isSubLevelItemSelected = tabInfo => {
switch tabInfo {
- | SubLevelRemoteLink(item)
- | SubLevelLink(item) =>
- linkSelectionCheck(firstPart, item.link)
+ | SubLevelLink(item) => linkSelectionCheck(firstPart, item.link)
}
}
@@ -410,7 +384,6 @@ module SidebarNestedSection = {
acc &&
switch subLevelItem {
| SubLevelLink({access}) => access === NoAccess
- | SubLevelRemoteLink({access}) => access === NoAccess
}
})
diff --git a/src/screens/HyperSwitch/Sidebar/SidebarTypes.res b/src/screens/HyperSwitch/Sidebar/SidebarTypes.res
index 3b8f54486..7433db462 100644
--- a/src/screens/HyperSwitch/Sidebar/SidebarTypes.res
+++ b/src/screens/HyperSwitch/Sidebar/SidebarTypes.res
@@ -27,9 +27,7 @@ type nestedOption = {
iconSize?: int,
}
-type subLevelItem =
- | SubLevelRemoteLink(nestedOption)
- | SubLevelLink(nestedOption)
+type subLevelItem = SubLevelLink(nestedOption)
type sectionType = {
name: string,
diff --git a/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res b/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
index 5e0dbd867..2209ed1d8 100644
--- a/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
+++ b/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
@@ -104,8 +104,7 @@ let make = () => {
[],
(insideAcc, item) => {
switch item {
- | SubLevelLink(obj)
- | SubLevelRemoteLink(obj) => {
+ | SubLevelLink(obj) => {
if (
checkStringStartsWithSubstring(~itemToCheck=sectionObj.name, ~searchText) ||
checkStringStartsWithSubstring(~itemToCheck=obj.name, ~searchText)
diff --git a/src/screens/HyperSwitch/Utils/PageLoaderWrapper.res b/src/screens/HyperSwitch/Utils/PageLoaderWrapper.res
index 02cf33e39..ec220919a 100644
--- a/src/screens/HyperSwitch/Utils/PageLoaderWrapper.res
+++ b/src/screens/HyperSwitch/Utils/PageLoaderWrapper.res
@@ -20,9 +20,8 @@ let make = (
}
| Error(_err) =>