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/27776 Workspace - WS invite page keeps loading in offline if no members present #28897

Merged
merged 5 commits into from
Oct 10, 2023
Merged

Fix/27776 Workspace - WS invite page keeps loading in offline if no members present #28897

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
165479f
fix: in offline mode not show workspace member
DylanDylann Oct 5, 2023
1b75c22
fix lint
DylanDylann Oct 5, 2023
b0c8503
Update en.ts
DylanDylann Oct 10, 2023
6f9cbbc
Update es.ts
DylanDylann Oct 10, 2023
eba4c5d
Name variable clearer in workspace member page
DylanDylann Oct 10, 2023
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/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,6 +1336,7 @@ export default {
notAuthorized: `You do not have access to this page. Are you trying to join the workspace? Please reach out to the owner of this workspace so they can add you as a member! Something else? Reach out to ${CONST.EMAIL.CONCIERGE}`,
goToRoom: ({roomName}: GoToRoomParams) => `Go to ${roomName} room`,
workspaceAvatar: 'Workspace avatar',
mustBeOnlineToViewMembers: 'You must be online in order to view members of this workspace.',
},
emptyWorkspace: {
title: 'Create a new workspace',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,6 +1356,7 @@ export default {
notAuthorized: `No tienes acceso a esta página. ¿Estás tratando de unirte al espacio de trabajo? Comunícate con el propietario de este espacio de trabajo para que pueda añadirte como miembro. ¿Necesitas algo más? Comunícate con ${CONST.EMAIL.CONCIERGE}`,
goToRoom: ({roomName}: GoToRoomParams) => `Ir a la sala ${roomName}`,
workspaceAvatar: 'Espacio de trabajo avatar',
mustBeOnlineToViewMembers: 'Debes estar en línea para poder ver los miembros de este espacio de trabajo.',
},
emptyWorkspace: {
title: 'Crear un nuevo espacio de trabajo',
Expand Down
15 changes: 10 additions & 5 deletions src/pages/workspace/WorkspaceMembersPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function WorkspaceMembersPage(props) {
const accountIDs = useMemo(() => _.keys(props.policyMembers), [props.policyMembers]);
const prevAccountIDs = usePrevious(accountIDs);
const textInputRef = useRef(null);

const isOfflineAndNoMemberDataAvailable = _.isEmpty(props.policyMembers) && props.network.isOffline;
/**
* Get members for the current workspace
*/
Expand Down Expand Up @@ -344,9 +344,14 @@ function WorkspaceMembersPage(props) {

return result;
};

const data = getMemberOptions();
const headerMessage = searchValue.trim() && !data.length ? props.translate('workspace.common.memberNotFound') : '';

const getHeaderMessage = () => {
if (isOfflineAndNoMemberDataAvailable) {
return props.translate('workspace.common.mustBeOnlineToViewMembers');
}
return searchValue.trim() && !data.length ? props.translate('workspace.common.memberNotFound') : '';
};

return (
<ScreenWrapper
Expand Down Expand Up @@ -411,11 +416,11 @@ function WorkspaceMembersPage(props) {
textInputLabel={props.translate('optionsSelector.findMember')}
textInputValue={searchValue}
onChangeText={setSearchValue}
headerMessage={headerMessage}
headerMessage={getHeaderMessage()}
onSelectRow={(item) => toggleUser(item.keyForList)}
onSelectAll={() => toggleAllUsers(data)}
onDismissError={dismissError}
showLoadingPlaceholder={!OptionsListUtils.isPersonalDetailsReady(props.personalDetails) || _.isEmpty(props.policyMembers)}
showLoadingPlaceholder={!isOfflineAndNoMemberDataAvailable && (!OptionsListUtils.isPersonalDetailsReady(props.personalDetails) || _.isEmpty(props.policyMembers))}
showScrollIndicator
shouldFocusOnSelectRow={!Browser.isMobile()}
inputRef={textInputRef}
Expand Down