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.

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

Fix: ws options available from all devices for same user #42008

Merged
merged 14 commits into from
May 31, 2024
Merged

Fix: ws options available from all devices for same user #42008

Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
adf4099
Fix: ws options available from all devices for same user
dragnoir May 10, 2024
b5d94a9
Merge branch 'Expensify:main' into 40686-fix
dragnoir May 20, 2024
16145e9
revert isPolicyAdmin
dragnoir May 20, 2024
67e0f08
fix policyUtility
dragnoir May 20, 2024
7eaeda0
fix role not available
dragnoir May 20, 2024
9ec30ac
fix admin when not on policy
dragnoir May 20, 2024
349b220
move employe check into isPolicyAdmin
dragnoir May 22, 2024
64a9e26
better approach
dragnoir May 22, 2024
1aeaaee
fix lint
dragnoir May 22, 2024
799d626
Merge branch 'Expensify:main' into 40686-fix
dragnoir May 25, 2024
f0b1770
Merge branch 'Expensify:main' into 40686-fix
dragnoir May 30, 2024
2f349db
same logic for AccessOrNotFoundWrapper
dragnoir May 30, 2024
f9e0e16
Merge remote-tracking branch 'upstream/main' into 40686-fix
dragnoir May 30, 2024
ca4d45f
fix ts
dragnoir May 30, 2024
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
5 changes: 4 additions & 1 deletion src/pages/workspace/WorkspaceInitialPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import * as Expensicons from '@components/Icon/Expensicons';
import OfflineWithFeedback from '@components/OfflineWithFeedback';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import usePermissions from '@hooks/usePermissions';
Expand Down Expand Up @@ -142,7 +143,9 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
const hasMembersError = PolicyUtils.hasEmployeeListError(policy);
const hasPolicyCategoryError = PolicyUtils.hasPolicyCategoriesError(policyCategories);
const hasGeneralSettingsError = !isEmptyObject(policy?.errorFields?.generalSettings ?? {}) || !isEmptyObject(policy?.errorFields?.avatarURL ?? {});
const shouldShowProtectedItems = PolicyUtils.isPolicyAdmin(policy);
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const employee = policyProp?.employeeList?.[currentUserPersonalDetails.login ?? ''] ?? {};
const shouldShowProtectedItems = PolicyUtils.isPolicyAdmin(policyProp) || (employee && employee.role === CONST.POLICY.ROLE.ADMIN);
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's better to move the fix into method isPolicyAdmin

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The problem I am facing is that policyProp is not turning the role. When policyProp is checking the role from another device, it's undefined.

but policyProp has the correct logic.

What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think you can try get accountid by policy owner, get employee and then compare employee role.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, I will move the fix into the method isPolicyAdmin. I tried using useCurrentUserPersonalDetails into isPolicyAdmin but I got an error, seems I can't use a hook there, I will see.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@eh2077 can we do the following?

const isPolicyAdmin = (policy: OnyxEntry<Policy> | EmptyObject, currentUserLogin?: string): boolean =>

Where currentUserLogin will be props passed from WorkspaceInitialPage

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, I think it's okay to add an optional parameter to the method

const isPaidGroupPolicy = PolicyUtils.isPaidGroupPolicy(policy);
const isFreeGroupPolicy = PolicyUtils.isFreeGroupPolicy(policy);
const [featureStates, setFeatureStates] = useState(policyFeatureStates);
Expand Down
Loading