🐛 fix(inviteUsers): add error handling for useGetProjectsByPidUsersQuery and useGetWorkspacesByWidUsersQuery hooks

✨ feat(translation): add new translation keys for permission settings page

Author: marcbon

src/common/components/inviteUsers/campaignSettings.tsx

@@ -70,6 +70,7 @@ export const CampaignSettings = () => {
     isFetching: isFetchingProjectUsers,
     data: projectUsers,
     refetch: refetchProjectUsers,
+    error: projectUsersError,
   } = useGetProjectsByPidUsersQuery({
     pid: campaign?.project.id.toString() || '0',
   });
@@ -79,6 +80,7 @@ export const CampaignSettings = () => {
     isFetching: isFetchingWorkspaceUsers,
     data: workspaceUsers,
     refetch: refetchWorkspaceUsers,
+    error: workspaceUsersError,
   } = useGetWorkspacesByWidUsersQuery({
     wid: activeWorkspace?.id.toString() || '0',
   });
@@ -264,6 +266,17 @@ export const CampaignSettings = () => {
                   </UsersContainer>
                 </>
               )}
+              {projectUsersError && (
+                <UsersLabel>
+                  <ProjectsIcon
+                    style={{
+                      color: appTheme.palette.grey[600],
+                      marginRight: appTheme.space.xs,
+                    }}
+                  />
+                  <MD isBold>{t('__PERMISSION_SETTINGS_PROJECT_USERS_ALL')}</MD>
+                </UsersLabel>
+              )}
               {projectCount > 0 && (
                 <StyledAccordion
                   level={3}
@@ -302,6 +315,19 @@ export const CampaignSettings = () => {
                   </StyledAccordion.Section>
                 </StyledAccordion>
               )}
+              {workspaceUsersError && (
+                <UsersLabel>
+                  <WorkspacesIcon
+                    style={{
+                      color: appTheme.palette.grey[600],
+                      marginRight: appTheme.space.xs,
+                    }}
+                  />
+                  <MD isBold>
+                    {t('__PERMISSION_SETTINGS_WORKSPACE_USERS_ALL')}
+                  </MD>
+                </UsersLabel>
+              )}
               {workspaceCount > 0 && (
                 <StyledAccordion
                   level={3}

src/common/components/inviteUsers/projectSettings.tsx

@@ -59,6 +59,7 @@ export const ProjectSettings = () => {
     isFetching: isFetchingWorkspaceUsers,
     data: workspaceUsers,
     refetch: refetchWorkspaceUsers,
+    error: workspaceUsersError,
   } = useGetWorkspacesByWidUsersQuery({
     wid: activeWorkspace?.id.toString() || '0',
   });
@@ -240,6 +241,19 @@ export const ProjectSettings = () => {
                   </UsersContainer>
                 </>
               )}
+              {workspaceUsersError && (
+                <UsersLabel>
+                  <WorkspacesIcon
+                    style={{
+                      color: appTheme.palette.grey[600],
+                      marginRight: appTheme.space.xs,
+                    }}
+                  />
+                  <MD isBold>
+                    {t('__PERMISSION_SETTINGS_WORKSPACE_USERS_ALL')}
+                  </MD>
+                </UsersLabel>
+              )}
               {workspaceCount > 0 && (
                 <StyledAccordion
                   level={3}

src/locales/en/translation.json

@@ -658,6 +658,7 @@
   "__PERMISSION_SETTINGS_CAMPAIGN_USERS": "From the campaign",
   "__PERMISSION_SETTINGS_HEADER_TITLE": "Share",
   "__PERMISSION_SETTINGS_PROJECT_USERS": "From the project",
+  "__PERMISSION_SETTINGS_PROJECT_USERS_ALL": "All users from the project",
   "__PERMISSION_SETTINGS_REMOVE_CONFIRM_MODAL_CANCEL_BUTTON_TEXT": "Back",
   "__PERMISSION_SETTINGS_REMOVE_CONFIRM_MODAL_CONTINUE_BUTTON_TEXT": "Remove User",
   "__PERMISSION_SETTINGS_REMOVE_CONFIRM_MODAL_DEEP_CLEAN_LABEL": "Do you want to remove also access to all other related resources?",
@@ -669,6 +670,7 @@
   "__PERMISSION_SETTINGS_TOAST_REMOVE": "User removed",
   "__PERMISSION_SETTINGS_TOAST_RESEND": "New invitation sent",
   "__PERMISSION_SETTINGS_WORKSPACE_USERS": "From the workspace",
+  "__PERMISSION_SETTINGS_WORKSPACE_USERS_ALL": "All users from the workspace",
   "__PROFILE_MODAL_CHAT_SUPPORT_LABEL": "Report a technical issue",
   "__PROFILE_MODAL_COPY_LABEL": "Copy",
   "__PROFILE_MODAL_CSM_CONTACT_LABEL": "Contact your CSM",

src/locales/it/translation.json

@@ -23,8 +23,8 @@
   "__APP_SIDEBAR_HOME_ITEM_LABEL": "Le mie campagne",
   "__APP_SIDEBAR_PROJECTS_DIVIDER_LABEL": "Progetti",
   "__APP_SIDEBAR_SERVICES_ITEM_LABEL": "Servizi",
-  "__APP_SIDEBAR_SHARED_WORKSPACE_HOME_ITEM_LABEL": "",
-  "__APP_SIDEBAR_SHARED_WORKSPACE_LABEL": "",
+  "__APP_SIDEBAR_SHARED_WORKSPACE_HOME_ITEM_LABEL": "Campagne",
+  "__APP_SIDEBAR_SHARED_WORKSPACE_LABEL": "Condivisi con me",
   "__BREADCRUMB_ITEM_SERVICES": "Servizi",
   "__BUG_CUSTOM_STATUS_NOT_A_BUG": "Non un bug",
   "__BUG_CUSTOM_STATUS_OPEN": "Aperto",
@@ -67,12 +67,12 @@
   "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_EXTRA_TAB_ITEM_LABEL": "File extra",
   "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_EXTRA_TAB_TITLE": "Extra",
   "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_IMAGE_LABEL_one": "immagine",
-  "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_IMAGE_LABEL_many": "",
+  "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_IMAGE_LABEL_many": "immagini",
   "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_IMAGE_LABEL_other": "immagini",
   "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_LABEL": "Allegati",
   "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_MEDIA_TAB_TITLE": "Immagini & video",
   "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_VIDEO_LABEL_one": "video",
-  "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_VIDEO_LABEL_many": "",
+  "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_VIDEO_LABEL_many": "video",
   "__BUGS_PAGE_BUG_DETAIL_ATTACHMENTS_VIDEO_LABEL_other": "video",
   "__BUGS_PAGE_BUG_DETAIL_CURRENT_RESULT_LABEL": "Risultato ottenuto",
   "__BUGS_PAGE_BUG_DETAIL_DESCRIPTION_LABEL": "Descrizione",
@@ -107,7 +107,7 @@
   "__BUGS_PAGE_BUG_DETAIL_TAGS_LABEL": "Tag",
   "__BUGS_PAGE_BUG_DETAIL_TAGS_PLACEHOLDER": "Cerca o aggiungi altri tag",
   "__BUGS_PAGE_BUG_DETAIL_TAGS_SHOW_MORE_one": "+ {{count}} altro",
-  "__BUGS_PAGE_BUG_DETAIL_TAGS_SHOW_MORE_many": "",
+  "__BUGS_PAGE_BUG_DETAIL_TAGS_SHOW_MORE_many": "+ altri {{count}}",
   "__BUGS_PAGE_BUG_DETAIL_TAGS_SHOW_MORE_other": "+ altri {{count}}",
   "__BUGS_PAGE_CLOSE_DETAILS_TOOLTIP": "Chiudi",
   "__BUGS_PAGE_FILTER_DRAWER_BODY_ACTIONS_LABEL": "AZIONI FATTE DA TE",
@@ -673,6 +673,7 @@
   "__PERMISSION_SETTINGS_CAMPAIGN_USERS": "Dalla campagna",
   "__PERMISSION_SETTINGS_HEADER_TITLE": "Condividi",
   "__PERMISSION_SETTINGS_PROJECT_USERS": "Dal progetto",
+  "__PERMISSION_SETTINGS_PROJECT_USERS_ALL": "Tutti gli utenti dal progetto",
   "__PERMISSION_SETTINGS_REMOVE_CONFIRM_MODAL_CANCEL_BUTTON_TEXT": "Annulla",
   "__PERMISSION_SETTINGS_REMOVE_CONFIRM_MODAL_CONTINUE_BUTTON_TEXT": "Rimuovi",
   "__PERMISSION_SETTINGS_REMOVE_CONFIRM_MODAL_DEEP_CLEAN_LABEL": "Vuoi rimuovere l'accesso anche a tutte le altre risorse?",
@@ -684,6 +685,7 @@
   "__PERMISSION_SETTINGS_TOAST_REMOVE": "Utente rimosso",
   "__PERMISSION_SETTINGS_TOAST_RESEND": "Hai rimandato l'invito",
   "__PERMISSION_SETTINGS_WORKSPACE_USERS": "Dal workspace",
+  "__PERMISSION_SETTINGS_WORKSPACE_USERS_ALL": "Tutti gli utenti dal workspace",
   "__PROFILE_MODAL_CHAT_SUPPORT_LABEL": "Riporta un problema tecnico",
   "__PROFILE_MODAL_COPY_LABEL": "Copia",
   "__PROFILE_MODAL_CSM_CONTACT_LABEL": "Contatta il tuo CSM",