Skip to content

Add const / permissions function for help side panel beta #59221

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.

Sign up for GitHub

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

Merged
francoisl merged 5 commits into from
Apr 2, 2025
Merged

Add const / permissions function for help side panel beta #59221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59f7a38
Add HELP_SIDE_PANEL constant and permission check
blazejkustra Mar 27, 2025
f55e52f
Add help side panel beta check to side pane display logic
blazejkustra Mar 27, 2025
286f013
Merge branch 'main' of github.com:Expensify/App into side-pane-featur…
blazejkustra Mar 31, 2025
6205e0d
Merge branch 'main' of github.com:Expensify/App into side-pane-featur…
blazejkustra Mar 31, 2025
c967cd8
refactor: simplify side pane logic by removing unnecessary checks for…
blazejkustra Mar 31, 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
1 change: 1 addition & 0 deletions src/CONST.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,7 @@ const CONST = {
NSQS: 'nsqs',
CUSTOM_RULES: 'customRules',
TABLE_REPORT_VIEW: 'tableReportView',
HELP_SIDE_PANEL: 'newDotHelpSidePanel',
RECEIPT_LINE_ITEMS: 'receiptLineItems',
},
BUTTON_STATES: {
Expand Down
21 changes: 7 additions & 14 deletions src/hooks/useSidePane.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ function useSidePaneDisplayStatus() {
const {isExtraLargeScreenWidth, shouldUseNarrowLayout} = useResponsiveLayout();
const [sidePaneNVP] = useOnyx(ONYXKEYS.NVP_SIDE_PANE);
const [language] = useOnyx(ONYXKEYS.NVP_PREFERRED_LOCALE);
const [canUseHelpSidePanel = false] = useOnyx(ONYXKEYS.BETAS, {selector: (betas) => !!betas?.includes(CONST.BETAS.HELP_SIDE_PANEL)});

@brunovjk brunovjk Mar 31, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why we don't use usePermissions() here? Thanks.

@blazejkustra blazejkustra Mar 31, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why but usePermissions was breaking GH checks here

const [isModalCenteredVisible = false] = useOnyx(ONYXKEYS.MODAL, {
selector: (modal) =>
modal?.type === CONST.MODAL.MODAL_TYPE.CENTERED_SWIPABLE_TO_RIGHT ||
Expand All @@ -35,14 +36,14 @@ function useSidePaneDisplayStatus() {
// - NVP is not set or it is false
// - language is unsupported
// - modal centered is visible
const shouldHideSidePane = !isSidePaneVisible || isLanguageUnsupported || isModalCenteredVisible;
const isSidePaneHiddenOrLargeScreen = !isSidePaneVisible || isLanguageUnsupported || isExtraLargeScreenWidth;
const shouldHideSidePane = !isSidePaneVisible || isLanguageUnsupported || isModalCenteredVisible || !canUseHelpSidePanel;
const isSidePaneHiddenOrLargeScreen = !isSidePaneVisible || isLanguageUnsupported || isExtraLargeScreenWidth || !canUseHelpSidePanel;

// The help button is hidden when:
// - side pane nvp is not set
// - the user is not part of the corresponding beta
// - side pane is displayed currently
// - language is unsupported
const shouldHideHelpButton = !sidePaneNVP || !shouldHideSidePane || isLanguageUnsupported;
const shouldHideHelpButton = !canUseHelpSidePanel || !shouldHideSidePane || isLanguageUnsupported;
const shouldHideSidePaneBackdrop = shouldHideSidePane || isExtraLargeScreenWidth || shouldUseNarrowLayout;

return {shouldHideSidePane, isSidePaneHiddenOrLargeScreen, shouldHideHelpButton, shouldHideSidePaneBackdrop, sidePaneNVP};
Expand Down Expand Up @@ -82,25 +83,17 @@ function useSidePane() {
}, [shouldHideSidePane, shouldApplySidePaneOffset, sidePaneWidth]);

const openSidePane = useCallback(() => {
if (!sidePaneNVP) {
return;
}

setIsSidePaneTransitionEnded(false);
KeyboardUtils.dismiss();

triggerSidePane({
isOpen: true,
isOpenNarrowScreen: isExtraLargeScreenWidth ? undefined : true,
});
}, [isExtraLargeScreenWidth, sidePaneNVP]);
}, [isExtraLargeScreenWidth]);

const closeSidePane = useCallback(
(shouldUpdateNarrow = false) => {
if (!sidePaneNVP) {
return;
}

setIsSidePaneTransitionEnded(false);
const shouldOnlyUpdateNarrowLayout = !isExtraLargeScreenWidth || shouldUpdateNarrow;
triggerSidePane({
Expand All @@ -111,7 +104,7 @@ function useSidePane() {
// Focus the composer after closing the side pane
focusComposerWithDelay(ReportActionComposeFocusManager.composerRef.current, CONST.ANIMATED_TRANSITION + CONST.COMPOSER_FOCUS_DELAY)(true);
},
[isExtraLargeScreenWidth, sidePaneNVP],
[isExtraLargeScreenWidth],
);

return {
Expand Down
5 changes: 5 additions & 0 deletions src/libs/Permissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ function canUseTableReportView(betas: OnyxEntry<Beta[]>): boolean {
return !!betas?.includes(CONST.BETAS.TABLE_REPORT_VIEW) || canUseAllBetas(betas);
}

function canUseHelpSidePanel(betas: OnyxEntry<Beta[]>): boolean {
return !!betas?.includes(CONST.BETAS.HELP_SIDE_PANEL) || canUseAllBetas(betas);
}
Comment on lines +61 to +63

@francoisl francoisl Apr 1, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this isn't used anywhere? If so let's remove it.

@francoisl francoisl Apr 2, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a tracking issue to remove the beta when it's no longer needed anyway, not blocking on this.

@blazejkustra blazejkustra Apr 3, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, I missed that one 🤦 I should've used this function as the selector of useOnyx. I'll refactor it for Stage 4


function canUseTalkToAISales(betas: OnyxEntry<Beta[]>): boolean {
return !!betas?.includes(CONST.BETAS.NEW_DOT_TALK_TO_AI_SALES) || canUseAllBetas(betas);
}
Expand All @@ -79,6 +83,7 @@ export default {
canUseNSQS,
canUseCustomRules,
canUseTableReportView,
canUseHelpSidePanel,
canUseTalkToAISales,
canUseProhibitedExpenses,
};