Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Org Sidebar #2087

Merged
merged 43 commits into from
Jan 29, 2025
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
aef65a5
feat: Org Sidebar
kanikabansal-juspay Jan 19, 2025
1f7ed34
feat:orgsidebar changes
kanikabansal-juspay Jan 20, 2025
203755e
feat:orgsidebar changes
kanikabansal-juspay Jan 20, 2025
df8db76
Merge branch 'main' into org-sidebar
kanikabansal-juspay Jan 20, 2025
3bbf472
chore: orgsidebar
kanikabansal-juspay Jan 20, 2025
2faeecd
Merge branch 'main' into org-sidebar
kanikabansal-juspay Jan 21, 2025
174ed7a
Merge branch 'main' into org-sidebar
kanikabansal-juspay Jan 21, 2025
3610335
feat: orgsidebar changes
kanikabansal-juspay Jan 21, 2025
2c0f4e3
Merge branch 'main' into org-sidebar
kanikabansal-juspay Jan 21, 2025
0ea98b1
Merge branch 'main' into org-sidebar
kanikabansal-juspay Jan 23, 2025
ec77565
Merge branch 'main' into org-sidebar
kanikabansal-juspay Jan 23, 2025
30f0e2f
fix: edit input
kanikabansal-juspay Jan 23, 2025
c50429e
fix:progress
kanikabansal-juspay Jan 23, 2025
a23c33d
chore: update inline edit
JeevaRamu0104 Jan 23, 2025
8c0b560
chore: update inline edit
JeevaRamu0104 Jan 24, 2025
66f3f7b
fix: orgsidebar progress
kanikabansal-juspay Jan 24, 2025
d22c8e4
fix: orgsidebar progress
kanikabansal-juspay Jan 24, 2025
abd17de
Merge branch 'org-sidebar' of github.com:juspay/hyperswitch-control-c…
JeevaRamu0104 Jan 24, 2025
f2ce312
chore: update inline edit
JeevaRamu0104 Jan 24, 2025
de549d4
chore: orgsidebar changes
kanikabansal-juspay Jan 24, 2025
010f608
chore: orgsidebar changes
kanikabansal-juspay Jan 24, 2025
c29a4c0
fix: orgsidebar useraccess
kanikabansal-juspay Jan 25, 2025
e7bbf8a
fix: orgsidebar progress
kanikabansal-juspay Jan 26, 2025
a926b58
chore: update orglist api
kanikabansal-juspay Jan 26, 2025
ad034aa
chore: feature flag addition
kanikabansal-juspay Jan 27, 2025
d6053c1
chore: feature flag addition
kanikabansal-juspay Jan 27, 2025
049dc8e
chore: feature flag addition
kanikabansal-juspay Jan 27, 2025
95b17ec
Merge branch 'main' into org-sidebar
kanikabansal-juspay Jan 27, 2025
551481d
chore: org-sidebar changes
kanikabansal-juspay Jan 27, 2025
db35b93
chore: org-sidebar changes
kanikabansal-juspay Jan 27, 2025
f03c32e
merge branch:fix conflicts
kanikabansal-juspay Jan 28, 2025
f4b01a6
chore: fix orgsidebar
kanikabansal-juspay Jan 28, 2025
f6db11e
chore: fix orgsidebar changes
kanikabansal-juspay Jan 28, 2025
83dd2d1
chore: fix orgsidebar changes
kanikabansal-juspay Jan 28, 2025
ebe0569
chore: org-sidebar-changes
kanikabansal-juspay Jan 29, 2025
fc3472f
chore: org-sidebar-changes
kanikabansal-juspay Jan 29, 2025
8de7cb2
chore: org-sidebar-changes
kanikabansal-juspay Jan 29, 2025
1e87931
chore: org-sidebar-changes
kanikabansal-juspay Jan 29, 2025
13324ca
chore: font-weight changes
kanikabansal-juspay Jan 29, 2025
4f3263d
chore: font-weight changes
kanikabansal-juspay Jan 29, 2025
89b02de
merge branch:fix conflicts
kanikabansal-juspay Jan 29, 2025
74ad5ca
chore:width changes
kanikabansal-juspay Jan 29, 2025
08d3635
chore: config comments
kanikabansal-juspay Jan 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: feature flag addition
kanikabansal-juspay committed Jan 27, 2025
commit ad034aa0c8bb36d8eebfcbbb1d05b464db300126
1 change: 1 addition & 0 deletions config/config.toml
Original file line number Diff line number Diff line change
@@ -52,6 +52,7 @@ x_feature_route=false
tenant_user=false
dev_click_to_pay=false
dev_recon_v2_product=false
dev_org_sidebar=false
maintainence_alert=""
[default.merchant_config]
[default.merchant_config.new_analytics]
31 changes: 31 additions & 0 deletions src/components/InlineEditInput.resi
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
module HoverInline: {
@react.component
let make: (
~customStyle: string=?,
~leftIcon: option<React.element>,
~value: string,
~subText: string,
~showEditIconOnHover: bool,
~leftActionButtons: React.element,
~labelTextCustomStyle: string,
) => React.element
}
@react.component
let make: (
~index: int=?,
~labelText: string=?,
~subText: string=?,
~customStyle: string=?,
~showEditIconOnHover: bool=?,
~leftIcon: React.element=?,
~onSubmit: string => 'a=?,
~customIconComponent: React.element=?,
~customInputStyle: string=?,
~customIconStyle: string=?,
~showEditIcon: bool=?,
~handleEdit: option<int> => unit,
~isUnderEdit: bool=?,
~displayHoverOnEdit: bool=?,
~validateInput: 'b => RescriptCore.Dict.t<'c>,
~labelTextCustomStyle: string=?,
) => React.element
2 changes: 2 additions & 0 deletions src/entryPoints/FeatureFlagUtils.res
Original file line number Diff line number Diff line change
@@ -45,6 +45,7 @@ type featureFlag = {
devReconv2Product: bool,
maintainenceAlert: string,
forceCookies: bool,
devOrgSidebar: bool,
}

let featureFlagType = (featureFlags: JSON.t) => {
@@ -92,6 +93,7 @@ let featureFlagType = (featureFlags: JSON.t) => {
devReconv2Product: dict->getBool("dev_recon_v2_product", false),
maintainenceAlert: dict->getString("maintainence_alert", ""),
forceCookies: dict->getBool("force_cookies", false),
devOrgSidebar: dict->getBool("dev_org_sidebar", false),
}
}

7 changes: 5 additions & 2 deletions src/entryPoints/HyperSwitchApp.res
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@ let make = () => {
let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
let (userGroupACL, setuserGroupACL) = Recoil.useRecoilState(userGroupACLAtom)
let {getThemesJson} = React.useContext(ThemeProvider.themeContext)
let {devThemeFeature} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
let {devThemeFeature, devOrgSidebar} =
HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
let {
fetchMerchantSpecificConfig,
useIsFeatureEnabledForMerchant,
@@ -105,7 +106,9 @@ let make = () => {
<div className={`h-screen flex flex-col`}>
<div className="flex relative overflow-auto h-screen ">
<RenderIf condition={screenState === Success}>
<OrgSidebar />
<RenderIf condition={devOrgSidebar}>
JeevaRamu0104 marked this conversation as resolved.
Show resolved Hide resolved
<OrgSidebar />
</RenderIf>
<Sidebar
path={url.path}
sidebars={hyperSwitchAppSidebars}
15 changes: 12 additions & 3 deletions src/screens/Sidebar/SidebarSwitch.res
Original file line number Diff line number Diff line change
@@ -13,7 +13,16 @@ module OrgMerchantSwitchCollapsed = {

@react.component
let make = (~isSidebarExpanded=false) => {
<RenderIf condition={!isSidebarExpanded}>
<OrgMerchantSwitchCollapsed />
</RenderIf>
let {devOrgSidebar} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
let expandedContent =
<div className="border-b border-secondary">
<OrgSwitch />
</div>

<>
<RenderIf condition={isSidebarExpanded && !devOrgSidebar}> expandedContent </RenderIf>
<RenderIf condition={!isSidebarExpanded}>
<OrgMerchantSwitchCollapsed />
</RenderIf>
</>
}