From 245323ef827640b1c588f7122f53e266b9c2aebd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:16:28 -0700 Subject: [PATCH] chore(release): Test v7.27.2 (#9656) Signed-off-by: dependabot[bot] Signed-off-by: Matt Krick Co-authored-by: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com> Co-authored-by: Georg Bremer Co-authored-by: Nick O'Ferrall Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com> Co-authored-by: Matt Krick Co-authored-by: Jordan Husney Co-authored-by: adaniels-parabol <71724289+adaniels-parabol@users.noreply.github.com> Co-authored-by: snyk-bot Co-authored-by: Dale Bumblis <135627447+dbumblis-parabol@users.noreply.github.com> Co-authored-by: Bartosz Jarocki Co-authored-by: Marcus Wermuth Co-authored-by: Rafael Romero Co-authored-by: Bruce Tian Co-authored-by: GitHub Action Co-authored-by: Mohd Muneeb Co-authored-by: Muneeb-Ventures Co-authored-by: github-actions --- .github/workflows/ironbank.yml | 4 +- .prettierrc | 2 +- .release-please-manifest.json | 2 +- CHANGELOG.md | 27 + docker/images/parabol-ubi/cloudbuild.yml | 17 - docker/images/parabol-ubi/docker-compose.yml | 30 - .../dockerfiles/parabol.dockerfile | 118 - .../parabol-ubi/environments/legacy-build | 54 - ...rule_account_disable_post_pw_expiration.sh | 93 - ....content_rule_accounts_logon_fail_delay.sh | 95 - ..._accounts_max_concurrent_login_sessions.sh | 25 - ...nt_rule_accounts_maximum_age_login_defs.sh | 23 - ...nt_rule_accounts_minimum_age_login_defs.sh | 23 - ...e_accounts_password_all_shadowed_sha512.sh | 7 - ...ule_accounts_password_minlen_login_defs.sh | 24 - ...tent_rule_accounts_password_pam_dcredit.sh | 93 - ...nt_rule_accounts_password_pam_dictcheck.sh | 43 - ...ontent_rule_accounts_password_pam_difok.sh | 93 - ...tent_rule_accounts_password_pam_lcredit.sh | 93 - ...le_accounts_password_pam_maxclassrepeat.sh | 93 - ...nt_rule_accounts_password_pam_maxrepeat.sh | 93 - ...ent_rule_accounts_password_pam_minclass.sh | 93 - ...ntent_rule_accounts_password_pam_minlen.sh | 93 - ...tent_rule_accounts_password_pam_ocredit.sh | 93 - ...rd_pam_pwhistory_remember_password_auth.sh | 48 - ...word_pam_pwhistory_remember_system_auth.sh | 48 - ...tent_rule_accounts_password_pam_ucredit.sh | 93 - ...ule_accounts_password_pam_unix_remember.sh | 18 - ...nt_rule_accounts_passwords_pam_faillock.sh | 25 - ...le_accounts_passwords_pam_faillock_deny.sh | 78 - ...counts_passwords_pam_faillock_deny_root.sh | 42 - ...ccounts_passwords_pam_faillock_interval.sh | 78 - ...unts_passwords_pam_faillock_unlock_time.sh | 78 - ....content_rule_accounts_umask_etc_bashrc.sh | 16 - ...ntent_rule_accounts_umask_etc_csh_cshrc.sh | 12 - ...tent_rule_accounts_umask_etc_login_defs.sh | 93 - ...content_rule_accounts_umask_etc_profile.sh | 12 - ...sgproject.content_rule_banner_etc_issue.sh | 16 - ...ct.content_rule_configure_crypto_policy.sh | 27 - ...t_rule_configure_kerberos_crypto_policy.sh | 7 - ...nt_rule_configure_openssl_crypto_policy.sh | 27 - ...nt_rule_configure_usbguard_auditbackend.sh | 17 - ...ontent_rule_coredump_disable_backtraces.sh | 17 - ...t.content_rule_coredump_disable_storage.sh | 17 - ...ent_rule_disable_ctrlaltdel_burstaction.sh | 91 - ...ct.content_rule_disable_users_coredumps.sh | 20 - ...ect.content_rule_display_login_attempts.sh | 73 - ...ent_rule_ensure_gpgcheck_local_packages.sh | 91 - ...t_rule_file_groupowner_var_log_messages.sh | 9 - ...ile_groupownership_system_commands_dirs.sh | 11 - ...ontent_rule_file_owner_var_log_messages.sh | 9 - ...content_rule_kernel_module_atm_disabled.sh | 3 - ...content_rule_kernel_module_can_disabled.sh | 2 - ...tent_rule_kernel_module_cramfs_disabled.sh | 2 - ...le_kernel_module_firewire-core_disabled.sh | 2 - ...ontent_rule_kernel_module_sctp_disabled.sh | 2 - ...ontent_rule_kernel_module_tipc_disabled.sh | 2 - ...project.content_rule_no_empty_passwords.sh | 6 - ...content_rule_openssl_use_strong_entropy.sh | 35 - ..._rule_package_crypto-policies_installed.sh | 8 - ...content_rule_package_iptables_installed.sh | 8 - ...ontent_rule_package_rng-tools_installed.sh | 10 - ...ect.content_rule_package_sudo_installed.sh | 8 - ...content_rule_package_usbguard_installed.sh | 10 - ...tent_rule_sudo_require_reauthentication.sh | 37 - ...ct.content_rule_sudoers_validate_passwd.sh | 40 - package.json | 4 +- packages/chronos/package.json | 4 +- packages/client/components/ActionMeeting.tsx | 2 +- .../components/ActionMeetingAgendaItems.tsx | 2 +- .../components/ActionMeetingFirstCall.tsx | 2 +- .../components/ActionMeetingLastCall.tsx | 2 +- .../components/ActionMeetingSidebar.tsx | 8 +- .../components/ActionMeetingUpdates.tsx | 2 +- .../ActionSidebarAgendaItemsSection.tsx | 2 +- .../ActionSidebarPhaseListItemChildren.tsx | 2 +- .../components/ActivityLibrary/AISearch.tsx | 2 +- .../ActivityLibrary/ActivityCard.tsx | 2 +- .../ActivityDetails/ActivityDetails.tsx | 8 +- .../ActivityDetailsCategoryBadge.tsx | 4 +- .../components/DetailsBadge.tsx | 2 +- .../components/IntegrationsTip.tsx | 6 +- .../ActivityDetailsSidebar.tsx | 36 +- .../ActivityLibrary/ActivityGrid.tsx | 13 +- .../ActivityLibrary/ActivityLibrary.tsx | 12 +- .../ActivityLibrary/ActivityLibraryCard.tsx | 14 - .../ActivityLibraryCardDescription.tsx | 6 +- .../ActivityLibrary/ActivityLibraryRoutes.tsx | 6 +- .../ActivityLibrary/CreateActivityCard.tsx | 17 +- .../CreateNewActivity/CreateNewActivity.tsx | 36 +- .../ActivityLibrary/ScheduleMeetingButton.tsx | 12 +- .../components/ActivityLibrary/SearchBar.tsx | 2 +- .../ActivityLibrary/TeamPickerModal.tsx | 2 +- packages/client/components/AddTeamDialog.tsx | 32 +- .../client/components/AddTeamDialogRoot.tsx | 6 +- .../components/AddTeamMemberAvatarButton.tsx | 2 +- .../client/components/AddToAzureMenuItem.tsx | 2 +- .../client/components/AddToGitLabMenuItem.tsx | 2 +- .../AdhocTeamMultiSelect.tsx | 6 +- packages/client/components/AnalyticsPage.tsx | 4 +- .../client/components/ArchiveTaskRoot.tsx | 2 +- .../client/components/ArchiveTaskUserRoot.tsx | 2 +- .../AzureDevOpsFieldDimensionDropdown.tsx | 2 +- .../components/AzureDevOpsFieldMenu.tsx | 2 +- .../AzureDevOpsScopingSearchBar.tsx | 2 +- .../AzureDevOpsScopingSearchFilterMenu.tsx | 2 +- .../AzureDevOpsScopingSearchInput.tsx | 2 +- .../AzureDevOpsScopingSearchResultsRoot.tsx | 2 +- .../components/BillingLeaderActionMenu.tsx | 4 +- .../client/components/BillingLeaderMenu.tsx | 2 +- .../components/BottomControlBarReady.tsx | 6 +- .../components/BottomControlBarTips.tsx | 4 +- .../client/components/BottomNavIconLabel.tsx | 2 +- packages/client/components/Checkbox.tsx | 2 +- .../DashFilterToggle/DashFilterToggle.tsx | 2 +- .../components/DashNavList/DashNavList.tsx | 6 +- packages/client/components/DashTopBar.tsx | 2 +- packages/client/components/Dashboard.tsx | 8 +- .../components/Dashboard/DashSidebar.tsx | 2 +- .../Dashboard/MobileDashSidebar.tsx | 2 +- .../DashboardAvatars/DashboardAvatars.tsx | 8 +- .../DashboardAvatars/TeamMemberAvatarMenu.tsx | 2 +- packages/client/components/DashboardRoot.tsx | 2 +- .../client/components/DeleteTeamDialog.tsx | 14 +- .../client/components/DemoMeetingCard.tsx | 2 +- .../client/components/DemoMeetingRoot.tsx | 2 +- .../components/DiscussPhaseReflectionGrid.tsx | 2 +- .../client/components/DiscussionMentioned.tsx | 4 +- .../client/components/DiscussionThread.tsx | 4 +- .../components/DiscussionThreadList.tsx | 4 +- ...scussionThreadListEmptyTranscriptState.tsx | 2 +- .../components/DiscussionThreadRoot.tsx | 2 +- .../client/components/DropdownToggleV2.tsx | 2 +- packages/client/components/DueDatePicker.tsx | 2 +- packages/client/components/DueDateToggle.tsx | 2 +- .../client/components/EditableOrgName.tsx | 2 +- .../EditingStatus/EditingStatus.tsx | 2 +- .../client/components/EditorInputWrapper.tsx | 2 +- .../client/components/EmailNotifications.tsx | 2 +- .../components/EstimateDimensionColumn.tsx | 4 +- .../client/components/EstimatePhaseArea.tsx | 2 +- .../EstimatePhaseDiscussionDrawer.tsx | 2 +- .../EventTypeFilterMenuItemLabel.tsx | 8 +- .../client/components/FacilitatorMenu.tsx | 2 +- .../GitHubFieldDimensionDropdown.tsx | 2 +- .../client/components/GitHubFieldMenu.tsx | 2 +- .../components/GitHubRepoSearchFilterMenu.tsx | 6 +- .../components/GitHubScopingSearchBar.tsx | 2 +- .../GitHubScopingSearchFilterMenu.tsx | 2 +- .../GitHubScopingSearchFilterMenuRoot.tsx | 4 +- .../GitHubScopingSearchFilterToggle.tsx | 2 +- .../GitHubScopingSearchHistoryToggle.tsx | 2 +- .../components/GitHubScopingSearchResults.tsx | 8 +- .../GitHubScopingSearchResultsRoot.tsx | 2 +- .../GitHubScopingSelectAllIssues.tsx | 2 +- .../GitLabFieldDimensionDropdown.tsx | 2 +- .../client/components/GitLabFieldMenu.tsx | 2 +- .../GitLabScopingSearchFilterMenu.tsx | 4 +- .../GitLabScopingSearchFilterMenuRoot.tsx | 4 +- .../GitLabScopingSearchFilterToggle.tsx | 2 +- .../components/GitLabScopingSearchResults.tsx | 6 +- .../GitLabScopingSearchResultsRoot.tsx | 2 +- .../GitLabScopingSelectAllIssues.tsx | 2 +- .../components/GoogleMeetProviderLogo.tsx | 2 +- packages/client/components/GroupingKanban.tsx | 4 +- .../components/GroupingKanbanColumn.tsx | 6 +- packages/client/components/IconLabel.tsx | 2 +- packages/client/components/Insights.tsx | 2 +- packages/client/components/InsightsCharts.tsx | 12 +- .../client/components/InsightsDomainNudge.tsx | 4 +- .../client/components/InsightsDomainPanel.tsx | 2 +- packages/client/components/InsightsRoot.tsx | 2 +- .../components/InvitationLinkDialog.tsx | 2 +- .../components/InvitationLinkErrorExpired.tsx | 2 +- .../components/InviteTeamMemberAvatar.tsx | 2 +- .../components/JiraFieldDimensionDropdown.tsx | 2 +- packages/client/components/JiraFieldMenu.tsx | 4 +- .../JiraScopingSearchCurrentFilters.tsx | 2 +- .../JiraScopingSearchFilterMenuRoot.tsx | 2 +- .../JiraScopingSearchFilterToggle.tsx | 2 +- .../components/JiraScopingSearchResults.tsx | 6 +- .../JiraScopingSearchResultsRoot.tsx | 2 +- .../components/JiraScopingSelectAllIssues.tsx | 2 +- .../JiraServerFieldDimensionDropdown.tsx | 2 +- .../client/components/JiraServerFieldMenu.tsx | 2 +- .../JiraServerScopingSearchFilterMenuRoot.tsx | 2 +- .../JiraServerScopingSearchFilterToggle.tsx | 2 +- .../JiraServerScopingSearchResults.tsx | 6 +- .../JiraServerScopingSearchResultsRoot.tsx | 2 +- .../components/KudosReceivedNotification.tsx | 6 +- .../components/LimitExceededWarning.tsx | 2 +- .../components/MassInvitationTokenLink.tsx | 4 +- .../MassInvitationTokenLinkRoot.tsx | 2 +- packages/client/components/MeetingCard.tsx | 6 +- .../components/MeetingCardOptionsMenu.tsx | 4 +- .../components/MeetingCardOptionsMenuRoot.tsx | 4 +- .../client/components/MeetingControlBar.tsx | 4 +- .../MeetingHelp/TeamHealthHelpMenu.tsx | 4 +- .../components/MeetingLockedOverlay.tsx | 2 +- packages/client/components/MeetingOptions.tsx | 8 +- packages/client/components/MeetingRoot.tsx | 4 +- .../client/components/MeetingSelector.tsx | 4 +- .../client/components/MeetingSeriesRoot.tsx | 4 +- .../components/MeetingStageTimeLimitEnd.tsx | 2 +- packages/client/components/MeetingTopBar.tsx | 2 +- packages/client/components/MeetingsDash.tsx | 4 +- .../client/components/MeetingsDashEmpty.tsx | 2 +- .../client/components/MeetingsDashHeader.tsx | 8 +- packages/client/components/Mentioned.tsx | 10 +- .../components/MicrosoftOAuthButtonBlock.tsx | 6 +- .../components/MyDashboardTasksAndHeader.tsx | 2 +- .../components/MyDashboardTasksRoot.tsx | 6 +- .../client/components/MyDashboardTimeline.tsx | 4 +- .../components/MyDashboardTimelineRoot.tsx | 6 +- .../client/components/NewAzureIssueInput.tsx | 4 +- .../client/components/NewGitHubIssueInput.tsx | 6 +- .../client/components/NewGitLabIssueInput.tsx | 4 +- .../client/components/NewJiraIssueInput.tsx | 4 +- .../client/components/NewMeetingActions.tsx | 2 +- .../NewMeetingActionsCurrentMeetings.tsx | 2 +- .../client/components/NewMeetingCheckIn.tsx | 2 +- .../client/components/NewMeetingSettings.tsx | 42 - .../components/NewMeetingSettingsAction.tsx | 27 - .../components/NewMeetingSettingsPoker.tsx | 34 - .../NewMeetingSettingsRetrospective.tsx | 38 - ...ewMeetingSettingsRetrospectiveSettings.tsx | 96 - .../NewMeetingSettingsTeamPrompt.tsx | 24 - .../NewMeetingSettingsToggleTeamHealth.tsx | 4 +- .../NewMeetingSettingsToggleTranscription.tsx | 2 +- ...NewMeetingSettingsUpgradeForTeamHealth.tsx | 8 +- .../client/components/NewMeetingSidebar.tsx | 2 +- .../NewMeetingSidebarPhaseListItem.tsx | 2 +- .../NewMeetingSidebarUpgradeBlock.tsx | 2 +- .../components/NewMeetingTeamPicker.tsx | 8 +- .../client/components/NewTeamOrgDropdown.tsx | 2 +- .../components/NotificationDropdown.tsx | 10 +- .../client/components/NotificationPicker.tsx | 2 +- .../client/components/NotificationRow.tsx | 2 +- .../components/NotificationTemplate.tsx | 2 +- .../components/NullableTask/NullableTask.tsx | 2 +- .../client/components/OrgAdminActionMenu.tsx | 6 +- .../PalettePicker/PalettePicker.tsx | 2 +- .../ParabolScopingSearchFilterMenu.tsx | 2 +- .../ParabolScopingSearchResultItem.tsx | 2 +- .../ParabolScopingSearchResults.tsx | 4 +- .../ParabolScopingSearchResultsRoot.tsx | 4 +- .../ParabolScopingSelectAllTasks.tsx | 2 +- .../client/components/PasswordResetLink.tsx | 2 +- .../client/components/PaymentRejected.tsx | 2 +- .../PinnedSnackbarNotifications.tsx | 6 +- packages/client/components/PokerCard.tsx | 2 +- packages/client/components/PokerCardDeck.tsx | 2 +- .../PokerDimensionFinalScorePicker.tsx | 2 +- .../components/PokerDimensionValueControl.tsx | 2 +- .../client/components/PokerDiscussVoting.tsx | 10 +- .../PokerEstimateHeaderCardParabol.tsx | 2 +- .../client/components/PokerEstimatePhase.tsx | 2 +- .../client/components/PokerMeetingSidebar.tsx | 2 +- .../PokerSidebarEstimateSection.tsx | 2 +- .../PokerSidebarPhaseListItemChildren.tsx | 2 +- packages/client/components/PokerVotingRow.tsx | 4 +- .../components/Poll/EditablePollOption.tsx | 2 +- .../components/Poll/EditablePollTitle.tsx | 2 +- packages/client/components/Poll/Poll.tsx | 2 +- packages/client/components/PrivateRoutes.tsx | 2 +- .../components/PromoteToBillingLeader.tsx | 2 +- .../PromptToJoinOrgNotification.tsx | 6 +- .../Recurrence/EndRecurringMeetingModal.tsx | 6 +- .../Recurrence/RecurrenceSettings.tsx | 2 +- .../UpdateRecurrenceSettingsModal.tsx | 4 +- .../components/ReflectionCard/ColorBadge.tsx | 4 +- .../ReflectionCard/ReactjiCount.tsx | 4 +- .../ReflectionCard/ReactjiSection.tsx | 2 +- .../ReflectionCard/ReflectionCard.tsx | 6 +- .../components/ReflectionEditorWrapper.tsx | 4 +- .../DraggableReflectionCard.tsx | 2 +- .../ReflectionGroup/ReflectionGroup.tsx | 4 +- .../ReflectionGroupTitleEditor.tsx | 4 +- .../ReflectionGroup/RemoteReflection.tsx | 10 +- .../useSpotlightReflectionGroup.ts | 2 +- .../components/ReflectionGroupHeader.tsx | 4 +- .../components/ReflectionGroupVoting.tsx | 4 +- .../RequestToJoinOrgNotification.tsx | 4 +- .../client/components/ResponseMentioned.tsx | 6 +- .../client/components/ResponseReplied.tsx | 4 +- .../client/components/RetroDiscussPhase.tsx | 8 +- .../RetroDiscussionThreadHeader.tsx | 12 +- packages/client/components/RetroDrawer.tsx | 6 +- .../components/RetroDrawerTemplateCard.tsx | 57 +- .../client/components/RetroGroupPhase.tsx | 22 +- .../client/components/RetroMeetingSidebar.tsx | 4 +- .../RetroReflectPhase/PhaseItemColumn.tsx | 2 +- .../RetroReflectPhase/PhaseItemEditor.tsx | 10 +- .../RetroReflectPhase/ReflectionStack.tsx | 2 +- .../RetroReflectPhase/RetroReflectPhase.tsx | 4 +- .../components/RetroSidebarDiscussSection.tsx | 8 +- .../RetroSidebarPhaseListItemChildren.tsx | 2 +- .../client/components/RetroVoteMetaHeader.tsx | 2 +- .../ReviewRequestToJoinOrgModal.tsx | 12 +- .../components/ReviewRequestToJoinOrgRoot.tsx | 6 +- packages/client/components/ScheduleDialog.tsx | 44 +- packages/client/components/ScopePhase.tsx | 2 +- packages/client/components/ScopePhaseArea.tsx | 4 +- .../ScopePhaseAreaAddAzureDevOps.tsx | 2 +- .../components/ScopePhaseAreaAddGitHub.tsx | 2 +- .../components/ScopePhaseAreaAddGitLab.tsx | 2 +- .../components/ScopePhaseAreaAddJira.tsx | 6 +- .../ScopePhaseAreaAddJiraServer.tsx | 2 +- .../components/ScopePhaseAreaGitHub.tsx | 2 +- .../client/components/ScopingSearchInput.tsx | 4 +- .../components/ScopingSearchResultItem.tsx | 2 +- .../components/SelectMeetingDropdown.tsx | 2 +- .../components/SelectMeetingDropdownItem.tsx | 2 +- .../components/SelectSharingScopeDropdown.tsx | 2 +- .../client/components/ShareTopicModal.tsx | 28 +- packages/client/components/ShareTopicRoot.tsx | 4 +- .../components/ShareTopicRouterRoot.tsx | 6 +- packages/client/components/SpotlightModal.tsx | 2 +- .../client/components/SpotlightResults.tsx | 2 +- .../client/components/SpotlightSearchBar.tsx | 2 +- .../components/SpotlightSourceGroup.tsx | 2 +- .../client/components/StageTimerControl.tsx | 2 +- .../client/components/StageTimerDisplay.tsx | 2 +- .../client/components/StageTimerModal.tsx | 4 +- .../components/StageTimerModalEditTimeEnd.tsx | 4 +- .../StageTimerModalEditTimeLimit.tsx | 2 +- .../components/StageTimerModalEndTime.tsx | 4 +- .../StageTimerModalEndTimeSlackToggle.tsx | 4 +- .../components/StageTimerModalTimeLimit.tsx | 2 +- .../client/components/StandardHubUserMenu.tsx | 2 +- .../SubmittedForgotPasswordPage.tsx | 2 +- .../components/SuggestMentionableUsers.tsx | 2 +- .../SuggestMentionableUsersRoot.tsx | 4 +- .../SuggestedActionCreateNewTeam.tsx | 2 +- .../SuggestedActionInviteYourTeam.tsx | 2 +- .../SuggestedActionTryActionMeeting.tsx | 2 +- .../SuggestedActionTryRetroMeeting.tsx | 2 +- .../components/SuggestedActionTryTheDemo.tsx | 2 +- packages/client/components/Tag/TierTag.tsx | 2 +- .../components/TaskColumns/TaskColumns.tsx | 8 +- .../components/TaskEditor/CommentEditor.tsx | 2 +- .../components/TaskEditor/TaskEditor.tsx | 2 +- .../components/TaskEditor/useSuggestions.tsx | 2 +- .../components/TaskFooterIntegrateMenu.tsx | 12 +- .../TaskFooterIntegrateMenuList.tsx | 4 +- .../TaskFooterIntegrateMenuRoot.tsx | 8 +- .../TaskFooterIntegrateMenuSignup.tsx | 2 +- .../client/components/TaskIntegrationLink.tsx | 2 +- .../components/TaskIntegrationMenuItem.tsx | 2 +- packages/client/components/TaskInvolves.tsx | 2 +- packages/client/components/TaskWatermark.tsx | 2 +- .../components/TeamDashTeamMemberMenu.tsx | 2 +- packages/client/components/TeamFilterMenu.tsx | 8 +- packages/client/components/TeamHealth.tsx | 18 +- .../components/TeamInvitationDialog.tsx | 2 +- .../components/TeamInvitationEmailSignin.tsx | 4 +- .../TeamInvitationErrorAccepted.tsx | 2 +- .../components/TeamInvitationErrorExpired.tsx | 2 +- .../TeamInvitationGoogleCreateAccount.tsx | 4 +- .../components/TeamInvitationGoogleSignin.tsx | 2 +- .../components/TeamInvitationNotification.tsx | 2 +- .../client/components/TeamInvitationRoot.tsx | 2 +- .../TeamPrompt/TeamPromptDrawer.tsx | 8 +- .../TeamPrompt/TeamPromptEditablePrompt.tsx | 2 +- .../TeamPrompt/TeamPromptOptions.tsx | 2 +- .../TeamPrompt/TeamPromptOptionsMenu.tsx | 6 +- .../TeamPrompt/TeamPromptResponseEmojis.tsx | 2 +- .../TeamPrompt/TeamPromptTopBar.tsx | 12 +- .../TeamPrompt/TeamPromptWorkDrawer.tsx | 18 +- .../TeamPrompt/WorkDrawer/GCalEventCard.tsx | 16 +- .../WorkDrawer/GCalIntegrationPanel.tsx | 8 +- .../WorkDrawer/GCalIntegrationResults.tsx | 8 +- .../WorkDrawer/GCalIntegrationResultsRoot.tsx | 6 +- .../WorkDrawer/GitHubIntegrationPanel.tsx | 10 +- .../WorkDrawer/GitHubIntegrationResults.tsx | 8 +- .../GitHubIntegrationResultsRoot.tsx | 4 +- .../WorkDrawer/GitHubObjectCard.tsx | 22 +- .../WorkDrawer/GitHubRepoFilterBar.tsx | 13 +- .../WorkDrawer/JiraIntegrationPanel.tsx | 6 +- .../WorkDrawer/JiraIntegrationResults.tsx | 8 +- .../WorkDrawer/JiraIntegrationResultsRoot.tsx | 4 +- .../TeamPrompt/WorkDrawer/JiraObjectCard.tsx | 14 +- .../WorkDrawer/ParabolTasksPanel.tsx | 14 +- .../WorkDrawer/ParabolTasksResults.tsx | 8 +- .../WorkDrawer/ParabolTasksResultsRoot.tsx | 6 +- .../client/components/TeamPromptMeeting.tsx | 2 +- .../TeamsLimitExceededNotification.tsx | 4 +- .../TeamsLimitReminderNotification.tsx | 4 +- .../client/components/ThreadedCommentBase.tsx | 8 +- .../components/ThreadedCommentFooter.tsx | 2 +- .../components/ThreadedCommentHeader.tsx | 8 +- .../client/components/ThreadedItemReply.tsx | 6 +- .../client/components/ThreadedPollBase.tsx | 2 +- .../client/components/ThreadedTaskBase.tsx | 4 +- packages/client/components/TimelineEvent.tsx | 2 +- .../client/components/TimelineEventCard.tsx | 2 +- .../TimelineEventCompletedActionMeeting.tsx | 4 +- .../TimelineEventCompletedRetroMeeting.tsx | 4 +- .../components/TimelineEventJoinedParabol.tsx | 2 +- .../components/TimelineEventPokerComplete.tsx | 6 +- .../components/TimelineEventTeamCreated.tsx | 2 +- .../TimelineEventTeamPromptComplete.tsx | 4 +- .../components/TimelineEventTypeIcon.tsx | 2 +- .../components/TimelineEventTypeMenu.tsx | 4 +- .../client/components/TimelineFeedList.tsx | 2 +- packages/client/components/TimelineHeader.tsx | 12 +- .../components/TimelineHistoryLockedCard.tsx | 4 +- .../components/TimelinePriorityTasks.tsx | 2 +- .../client/components/TimelineRightDrawer.tsx | 2 +- .../components/TimelineSuggestedAction.tsx | 2 +- .../client/components/TopBarNotifications.tsx | 2 +- packages/client/components/TopBarSearch.tsx | 4 +- .../components/UserDashTeamMemberMenu.tsx | 6 +- .../client/components/ViewerNotOnTeam.tsx | 2 +- .../client/components/ViewerNotOnTeamRoot.tsx | 6 +- .../client/components/VoteSettingsMenu.tsx | 2 +- .../promptResponse/PromptResponseEditor.tsx | 2 +- .../client/components/useSetTaskEstimate.ts | 8 +- packages/client/containers/Signout/signout.ts | 2 +- .../containers/TaskCard/DraggableTask.tsx | 2 +- .../hooks/useAnimatedSpotlightSource.ts | 2 +- packages/client/hooks/useClientSideTrack.ts | 2 +- .../hooks/useDraggableReflectionCard.tsx | 4 +- packages/client/hooks/useEndMeetingHotkey.ts | 2 +- packages/client/hooks/useGotoStageId.ts | 2 +- packages/client/hooks/useInitialSafeRoute.ts | 2 +- packages/client/hooks/useIsIntegrated.ts | 2 +- packages/client/hooks/useMeeting.ts | 2 +- .../client/hooks/useNewFeatureSnackbar.ts | 2 +- packages/client/hooks/useQueryLoaderNow.tsx | 4 +- .../client/hooks/useSnacksForNewMeetings.ts | 2 +- .../hooks/useSpotlightSimulatedDrag.tsx | 4 +- packages/client/hooks/useSubColumns.ts | 2 +- .../modules/demo/ClientGraphQLServer.ts | 12 +- .../modules/demo/DemoGenericMeetingStage.ts | 2 +- .../modules/demo/handleCompletedDemoStage.ts | 2 +- packages/client/modules/demo/initBotScript.ts | 2 +- packages/client/modules/demo/initDB.ts | 2 +- .../EmailNotificationPicker.tsx | 2 +- .../EmailNotifications/EmailTaskInvolves.tsx | 2 +- .../components/NotificationSummaryEmail.tsx | 2 +- .../components/SummaryEmail/ExportToCSV.tsx | 2 +- .../EmailReflectionCard.tsx | 2 +- .../MeetingSummaryEmail/EmailTaskCard.tsx | 4 +- .../MeetingSummaryEmail/ExportAllTasks.tsx | 22 +- .../ExportAllTasksMenu.tsx | 8 +- .../ExportAllTasksMenuRoot.tsx | 8 +- .../MeetingMemberTaskSummaryList.tsx | 2 +- .../MeetingMembersWithoutTasks.tsx | 6 +- .../MeetingSummaryEmail/QuickStats.tsx | 2 +- .../MeetingSummaryEmail/RetroTopic.tsx | 4 +- .../MeetingSummaryEmail/RetroTopics.tsx | 2 +- .../MeetingSummaryEmail/ShareTopic.tsx | 6 +- .../SummaryAvatarHeader.tsx | 2 +- .../MeetingSummaryEmail/SummaryHeader.tsx | 2 +- .../SummaryPokerStories.tsx | 2 +- .../MeetingSummaryEmail/SummarySheet.tsx | 22 +- .../TaskSummarySection.tsx | 2 +- .../MeetingSummaryEmail/TeamHealthSummary.tsx | 4 +- .../WholeMeetingSummaryResult.tsx | 4 +- .../MeetingSummaryEmail/makePokerStats.ts | 2 +- .../makeTeamPromptStats.ts | 2 +- .../invoice/components/Invoice/Invoice.tsx | 2 +- .../InvoiceLineItemDetails.tsx | 4 +- .../invoice/containers/InvoiceRoot.tsx | 2 +- ...ActionMeetingUpdatesPromptTeamHelpText.tsx | 2 +- .../components/AddNewPokerTemplate.tsx | 110 - .../components/AddNewReflectTemplate.tsx | 109 - .../components/AddPokerTemplateDimension.tsx | 2 +- .../meeting/components/AddTemplatePrompt.tsx | 2 +- .../components/CustomTemplateUpgradeMsg.tsx | 4 +- .../components/EditableTemplateDimension.tsx | 2 +- .../components/EditableTemplatePrompt.tsx | 2 +- .../EditableTemplatePromptColor.tsx | 4 +- .../components/EditableTemplateScaleName.tsx | 2 +- .../EditableTemplateScaleValueColor.tsx | 2 +- .../EditableTemplateScaleValueLabel.tsx | 6 +- .../MeetingAvatarGroup/NewMeetingAvatar.tsx | 2 +- .../NewMeetingAvatarGroup.tsx | 2 +- .../NewCheckInQuestion.tsx | 16 +- .../components/NewMeetingCheckInGreeting.tsx | 4 +- .../NewTemplateScaleValueLabelInput.tsx | 10 +- .../components/PokerTemplateDetails.tsx | 174 -- .../meeting/components/PokerTemplateItem.tsx | 109 - .../meeting/components/PokerTemplateList.tsx | 195 -- .../components/PokerTemplateListOrg.tsx | 118 - .../components/PokerTemplateListOrgRoot.tsx | 24 - .../components/PokerTemplateListPublic.tsx | 71 - .../PokerTemplateListPublicRoot.tsx | 26 - .../components/PokerTemplateListTeam.tsx | 114 - .../meeting/components/PokerTemplateModal.tsx | 108 - .../components/PokerTemplatePicker.tsx | 70 - .../components/PokerTemplateScaleDetails.tsx | 4 +- .../components/PokerTemplateScalePicker.tsx | 2 +- .../components/ReflectTemplateDetails.tsx | 189 -- .../components/ReflectTemplateItem.tsx | 111 - .../components/ReflectTemplateList.tsx | 240 -- .../components/ReflectTemplateListOrg.tsx | 134 - .../components/ReflectTemplateListOrgRoot.tsx | 25 - .../components/ReflectTemplateListPublic.tsx | 104 - .../ReflectTemplateListPublicRoot.tsx | 28 - .../components/ReflectTemplateListTeam.tsx | 137 - .../components/ReflectTemplateModal.tsx | 102 - .../components/ReflectTemplateSearchBar.tsx | 139 - .../meeting/components/RemoveTemplate.tsx | 2 +- .../components/RetroTemplatePicker.tsx | 71 - .../meeting/components/ScaleActions.tsx | 2 +- .../components/ScaleDropdownMenuItem.tsx | 4 +- .../components/ScaleValuePalettePicker.tsx | 2 +- .../components/SelectScaleDropdown.tsx | 2 +- .../meeting/components/SelectTemplate.tsx | 115 - .../components/TemplateDimensionItem.tsx | 4 +- .../components/TemplateDimensionList.tsx | 2 +- .../meeting/components/TemplatePromptItem.tsx | 4 +- .../meeting/components/TemplatePromptList.tsx | 2 +- .../components/TemplateScaleValueItem.tsx | 4 +- .../meeting/components/TemplateSharing.tsx | 2 +- packages/client/modules/newTeam/NewTeam.tsx | 2 +- .../components/NewTeamForm/NewTeamForm.tsx | 4 +- .../containers/NewTeamForm/NewTeamRoot.tsx | 2 +- .../components/OutcomeCard/OutcomeCard.tsx | 6 +- .../TaskFooterTeamAssigneeMenu.tsx | 6 +- .../TaskFooterUserAssigneeMenu.tsx | 8 +- .../OutcomeCardFooter/TaskFooter.tsx | 2 +- .../TaskFooterTagMenuToggle.tsx | 2 +- .../TaskFooterTeamAssignee.tsx | 2 +- .../TaskFooterUserAssignee.tsx | 2 +- .../TaskFooterTagMenu.tsx | 2 +- .../TaskFooterTagMenuStatusItem.tsx | 2 +- .../TaskFooterUserAssigneeMenuRoot.tsx | 8 +- .../OutcomeCard/OutcomeCardContainer.tsx | 4 +- .../summary/components/NewMeetingSummary.tsx | 4 +- .../components/NewMeetingSummaryRoot.tsx | 6 +- .../team/components/NewTeamOrgPicker.tsx | 2 +- .../components/AgendaInput/AgendaInput.tsx | 2 +- .../AgendaListAndInput/AgendaListAndInput.tsx | 6 +- .../ArchiveTeam/ArchiveOrganizationForm.tsx | 2 +- .../ArchiveTeam/ArchiveTeamForm.tsx | 2 +- .../EditTeamName/EditableTeamName.tsx | 2 +- .../LeaveTeamModal/LeaveTeamModal.tsx | 2 +- .../PromoteTeamMemberModal.tsx | 2 +- .../components/ProviderList/ProviderList.tsx | 6 +- .../ProviderRow/AtlassianProviderRow.tsx | 2 +- .../ProviderRow/AzureDevOpsProviderRow.tsx | 2 +- .../ProviderRow/GcalProviderRow.tsx | 12 +- .../ProviderRow/GitHubProviderRow.tsx | 2 +- .../ProviderRow/GitLabProviderRow.tsx | 2 +- .../ProviderRow/JiraServerProviderRow.tsx | 2 +- .../components/ProviderRow/MSTeamsPanel.tsx | 4 +- .../ProviderRow/MattermostPanel.tsx | 4 +- .../ProviderRow/SlackChannelPicker.tsx | 2 +- .../ProviderRow/SlackNotificationList.tsx | 8 +- .../ProviderRow/SlackNotificationRow.tsx | 8 +- .../ProviderRow/SlackProviderRow.tsx | 2 +- .../RemoveTeamMemberModal.tsx | 2 +- .../TaskColumn/ArchiveAllDoneTasksModal.tsx | 6 +- .../components/TaskColumn/TaskColumn.tsx | 6 +- .../TaskColumn/TaskColumnAddTask.tsx | 2 +- .../teamDashboard/components/Team/Team.tsx | 2 +- .../components/TeamArchive/TeamArchive.tsx | 8 +- .../TeamDashActivityTab.tsx | 4 +- .../TeamDashHeader/TeamDashHeader.tsx | 2 +- .../TeamDashInsights/TeamDashInsights.tsx | 2 +- .../TeamDashInsights/TeamInsightsCard.tsx | 11 +- .../TopRetroTemplatesCard.tsx | 4 +- .../components/TeamDashMain/TeamDashMain.tsx | 8 +- .../components/TeamDashMain/TeamDrawer.tsx | 2 +- .../components/TeamDashMainRoot.tsx | 8 +- .../TeamDashTasksTab/TeamDashTasksTab.tsx | 8 +- .../teamDashboard/components/TeamRoot.tsx | 4 +- .../components/TeamSettings/TeamSettings.tsx | 2 +- .../components/TeamSettingsRoot.tsx | 6 +- .../UnpaidTeamModal/UnpaidTeamModal.tsx | 6 +- .../containers/Team/TeamContainer.tsx | 2 +- .../TeamColumns/TeamColumnsContainer.tsx | 2 +- .../TeamIntegrationsRoot.tsx | 2 +- .../TeamTasksHeaderContainer.tsx | 2 +- .../UnpaidTeamModal/UnpaidTeamModalRoot.tsx | 4 +- .../CreditCardModal/CreditCardForm.tsx | 2 +- .../components/GcalModal/DateTimePickers.tsx | 8 +- .../components/GcalModal/GcalModal.tsx | 28 +- .../components/GcalModal/GcalSettings.tsx | 10 +- .../GcalModal/VideoConferencing.tsx | 12 +- .../GcalModal/VideoConferencingMenu.tsx | 6 +- .../OrgAuthentication/OrgAuthentication.tsx | 4 +- .../components/OrgBilling/BillingForm.tsx | 22 +- .../components/OrgBilling/BillingLeaders.tsx | 16 +- .../components/OrgBilling/DowngradeModal.tsx | 21 +- .../OrgBilling/NewBillingLeaderInput.tsx | 4 +- .../OrgBilling/OrgBillingDangerZone.tsx | 2 +- .../OrgBilling/OrgBillingInvoices.tsx | 2 +- .../components/OrgBilling/OrgDetails.tsx | 10 +- .../components/OrgBilling/OrgPlan.tsx | 14 +- .../components/OrgBilling/OrgPlanDrawer.tsx | 16 +- .../OrgBilling/OrgPlanDrawerContent.tsx | 4 +- .../components/OrgBilling/OrgPlans.tsx | 20 +- .../OrgBilling/OrgPlansAndBilling.tsx | 14 +- .../OrgBilling/OrgPlansAndBillingHeading.tsx | 2 +- .../OrgBilling/OrgPlansAndBillingRoot.tsx | 2 +- .../components/OrgBilling/OrgStats.tsx | 2 +- .../components/OrgBilling/Organization.tsx | 4 +- .../components/OrgBilling/PaymentDetails.tsx | 10 +- .../components/OrgBilling/UpdatePayment.tsx | 10 +- .../OrgTeamMembers/OrgTeamMemberMenu.tsx | 8 +- .../OrgTeamMembers/OrgTeamMembers.tsx | 16 +- .../OrgTeamMembers/OrgTeamMembersMenu.tsx | 2 +- .../OrgTeamMembers/OrgTeamMembersRoot.tsx | 2 +- .../components/OrgTeams/OrgTeams.tsx | 4 +- .../components/OrgTeams/OrgTeamsRow.tsx | 8 +- .../components/Organization/OrgNav.tsx | 2 +- .../Organizations/Organizations.tsx | 2 +- .../userDashboard/components/UserProfile.tsx | 2 +- .../components/UserProfileRoot.tsx | 2 +- .../UserTasksHeader/UserTasksHeader.tsx | 10 +- .../containers/OrgBilling/OrgBillingRoot.tsx | 2 +- .../Organization/OrganizationRoot.tsx | 4 +- .../Organizations/OrganizationsRoot.tsx | 6 +- .../UserColumns/UserColumnsContainer.tsx | 2 +- .../mutations/AcceptTeamInvitationMutation.ts | 6 +- .../client/mutations/AddAgendaItemMutation.ts | 4 +- .../mutations/AddAtlassianAuthMutation.ts | 2 +- .../client/mutations/AddCommentMutation.ts | 4 +- .../client/mutations/AddGitHubAuthMutation.ts | 2 +- .../AddIntegrationProviderMutation.ts | 2 +- packages/client/mutations/AddOrgMutation.ts | 6 +- .../AddPokerTemplateDimensionMutation.ts | 4 +- .../mutations/AddPokerTemplateMutation.ts | 5 +- .../AddPokerTemplateScaleMutation.ts | 4 +- .../AddPokerTemplateScaleValueMutation.ts | 2 +- .../AddReactjiToReactableMutation.ts | 2 +- .../mutations/AddReflectTemplateMutation.ts | 5 +- .../AddReflectTemplatePromptMutation.ts | 4 +- .../client/mutations/AddSlackAuthMutation.ts | 2 +- .../AddTeamMemberIntegrationAuthMutation.ts | 2 +- packages/client/mutations/AddTeamMutation.ts | 6 +- .../mutations/AddTranscriptionBotMutation.ts | 2 +- .../mutations/ArchiveOrganizationMutation.ts | 4 +- .../client/mutations/ArchiveTeamMutation.ts | 6 +- .../mutations/ArchiveTimelineEventMutation.ts | 4 +- .../client/mutations/AutogroupMutation.ts | 2 +- .../mutations/BatchArchiveTasksMutation.ts | 6 +- .../mutations/ChangeTaskTeamMutation.ts | 2 +- .../mutations/CreateImposterTokenMutation.ts | 2 +- .../mutations/CreateMassInvitationMutation.ts | 2 +- .../CreateOAuth1AuthorizeUrlMutation.ts | 2 +- .../client/mutations/CreatePollMutation.ts | 2 +- .../mutations/CreateReflectionMutation.ts | 4 +- .../CreateStripeSubscriptionMutation.ts | 2 +- .../CreateTaskIntegrationMutation.ts | 4 +- .../client/mutations/CreateTaskMutation.ts | 6 +- .../client/mutations/DeleteCommentMutation.ts | 4 +- .../client/mutations/DeleteUserMutation.ts | 2 +- .../mutations/DenyPushInvitationMutation.ts | 2 +- .../mutations/DismissNewFeatureMutation.ts | 2 +- .../DismissSuggestedActionMutation.ts | 2 +- .../mutations/DowngradeToStarterMutation.ts | 2 +- .../mutations/DragDiscussionTopicMutation.ts | 2 +- .../mutations/DragEstimatingTaskMutation.ts | 2 +- .../mutations/EditCommentingMutation.ts | 2 +- .../mutations/EditReflectionMutation.ts | 2 +- packages/client/mutations/EditTaskMutation.ts | 4 +- .../mutations/EmailPasswordResetMutation.ts | 2 +- .../client/mutations/EndCheckInMutation.ts | 4 +- .../mutations/EndRetrospectiveMutation.ts | 4 +- .../mutations/EndSprintPokerMutation.ts | 4 +- .../client/mutations/EndTeamPromptMutation.ts | 4 +- .../mutations/FlagReadyToAdvanceMutation.ts | 2 +- .../GetTemplateSuggestionMutation.ts | 2 +- .../mutations/InvalidateSessionsMutation.ts | 2 +- .../client/mutations/InviteToTeamMutation.ts | 4 +- .../client/mutations/JoinMeetingMutation.ts | 2 +- .../mutations/LoginWithGoogleMutation.ts | 2 +- .../mutations/LoginWithMicrosoftMutation.ts | 2 +- .../mutations/LoginWithPasswordMutation.ts | 2 +- .../MovePokerTemplateDimensionMutation.ts | 2 +- .../MovePokerTemplateScaleValueMutation.ts | 2 +- .../MoveReflectTemplatePromptMutation.ts | 2 +- .../mutations/NavigateMeetingMutation.ts | 2 +- .../mutations/OldUpdateCreditCardMutation.ts | 2 +- .../mutations/OldUpgradeToTeamTierMutation.ts | 2 +- packages/client/mutations/PayLaterMutation.ts | 2 +- .../PersistGitHubSearchQueryMutation.ts | 2 +- .../PersistJiraSearchQueryMutation.ts | 2 +- .../PersistJiraServerSearchQueryMutation.ts | 2 +- .../PokerAnnounceDeckHoverMutation.ts | 4 +- .../mutations/PokerResetDimensionMutation.ts | 2 +- .../PromoteNewMeetingFacilitatorMutation.ts | 2 +- .../mutations/PromoteToTeamLeadMutation.ts | 2 +- .../mutations/PushInvitationMutation.ts | 2 +- ...TemplatePromptUpdateDescriptionMutation.ts | 2 +- ...tTemplatePromptUpdateGroupColorMutation.ts | 2 +- .../mutations/RemoveAgendaItemMutation.ts | 2 +- .../mutations/RemoveAtlassianAuthMutation.ts | 2 +- .../mutations/RemoveGitHubAuthMutation.ts | 2 +- .../RemoveIntegrationProviderMutation.ts | 2 +- .../RemoveJiraServerSearchQueryMutation.ts | 2 +- .../client/mutations/RemoveOrgUserMutation.ts | 8 +- .../RemovePokerTemplateDimensionMutation.ts | 2 +- .../mutations/RemovePokerTemplateMutation.ts | 11 +- .../RemovePokerTemplateScaleMutation.ts | 2 +- .../RemovePokerTemplateScaleValueMutation.ts | 2 +- .../RemoveReflectTemplateMutation.ts | 2 +- .../RemoveReflectTemplatePromptMutation.ts | 2 +- .../mutations/RemoveReflectionMutation.ts | 2 +- .../mutations/RemoveSlackAuthMutation.ts | 2 +- ...RemoveTeamMemberIntegrationAuthMutation.ts | 2 +- .../mutations/RemoveTeamMemberMutation.ts | 8 +- .../client/mutations/RenameMeetingMutation.ts | 2 +- .../mutations/RequestToJoinDomainMutation.ts | 2 +- .../client/mutations/ResetPasswordMutation.ts | 2 +- .../ResetReflectionGroupsMutation.ts | 2 +- .../ResetRetroMeetingToGroupStageMutation.ts | 2 +- .../RevealTeamHealthVotesMutation.ts | 2 +- .../mutations/SelectTemplateMutation.ts | 2 +- .../SetDefaultSlackChannelMutation.ts | 2 +- .../mutations/SetMeetingSettingsMutation.ts | 2 +- .../mutations/SetOrgUserRoleMutation.ts | 4 +- .../client/mutations/SetPhaseFocusMutation.ts | 2 +- .../mutations/SetPokerSpectateMutation.ts | 2 +- .../mutations/SetSlackNotificationMutation.ts | 2 +- .../client/mutations/SetStageTimerMutation.ts | 2 +- .../mutations/SetTaskEstimateMutation.ts | 2 +- .../mutations/SetTaskHighlightMutation.ts | 2 +- .../mutations/SetTeamHealthVoteMutation.ts | 2 +- .../mutations/SignUpWithPasswordMutation.ts | 2 +- .../client/mutations/StartCheckInMutation.ts | 2 +- .../StartDraggingReflectionMutation.ts | 2 +- .../mutations/StartSprintPokerMutation.ts | 2 +- .../mutations/StartTeamPromptMutation.ts | 2 +- .../mutations/ToggleSummaryEmailMutation.ts | 2 +- .../mutations/ToggleTeamDrawerMutation.ts | 2 +- .../mutations/UpdateAgendaItemMutation.ts | 2 +- .../mutations/UpdateAutoJoinMutation.ts | 2 +- ...UpdateAzureDevOpsDimensionFieldMutation.ts | 6 +- .../mutations/UpdateCommentContentMutation.ts | 2 +- .../mutations/UpdateCreditCardMutation.ts | 2 +- .../mutations/UpdateFeatureFlagMutation.ts | 2 +- .../UpdateGitHubDimensionFieldMutation.ts | 4 +- .../UpdateGitLabDimensionFieldMutation.ts | 4 +- .../UpdateIntegrationProviderMutation.ts | 2 +- .../UpdateJiraDimensionFieldMutation.ts | 6 +- .../UpdateJiraServerDimensionFieldMutation.ts | 2 +- .../mutations/UpdateMeetingPromptMutation.ts | 2 +- .../UpdateMeetingTemplateMutation.ts | 2 +- .../UpdateNewCheckInQuestionMutation.ts | 2 +- .../client/mutations/UpdateOrgMutation.ts | 2 +- .../mutations/UpdatePokerScopeMutation.ts | 4 +- ...datePokerTemplateDimensionScaleMutation.ts | 2 +- .../UpdatePokerTemplateScaleValueMutation.ts | 2 +- .../UpdatePokerTemplateScopeMutation.ts | 27 +- .../UpdateRecurrenceSettingsMutation.ts | 2 +- .../UpdateReflectTemplateScopeMutation.ts | 12 +- .../UpdateReflectionContentMutation.ts | 2 +- .../UpdateReflectionGroupTitleMutation.ts | 2 +- .../mutations/UpdateRetroMaxVotesMutation.ts | 2 +- .../mutations/UpdateTaskDueDateMutation.ts | 2 +- .../client/mutations/UpdateTaskMutation.ts | 4 +- .../mutations/UpdateTeamNameMutation.ts | 2 +- .../UpdateTemplateCategoryMutation.ts | 2 +- .../mutations/UpdateUserProfileMutation.ts | 2 +- .../mutations/UploadOrgImageMutation.ts | 2 +- .../mutations/UploadUserImageMutation.ts | 2 +- .../UpsertTeamPromptResponseMutation.ts | 4 +- .../client/mutations/VerifyEmailMutation.ts | 2 +- .../mutations/VoteForPokerStoryMutation.ts | 2 +- .../VoteForReflectionGroupMutation.ts | 2 +- .../connections/getPokerTemplateOrgConn.ts | 13 - .../connections/getPokerTemplatePublicConn.ts | 10 - .../handlers/handleAuthenticationRedirect.ts | 2 +- .../handlers/handleAzureCreateIssue.ts | 2 +- .../handlers/handleGitHubCreateIssue.ts | 2 +- .../handlers/handleGitLabCreateIssue.ts | 2 +- .../handleMovePokerTemplateDimension.ts | 4 +- .../handlers/handleRemovePokerTemplate.ts | 20 +- .../mutations/handlers/handleRemoveTasks.ts | 2 +- .../toasts/mapDiscussionMentionedToToast.ts | 6 +- .../toasts/mapKudosReceivedToToast.ts | 4 +- .../mutations/toasts/mapMentionedToToast.ts | 2 +- .../toasts/mapPromptToJoinOrgToToast.ts | 4 +- .../toasts/mapRequestToJoinOrgToToast.ts | 4 +- .../toasts/mapResponseMentionedToToast.ts | 4 +- .../toasts/mapResponseRepliedToToast.ts | 2 +- .../toasts/mapTeamsLimitExceededToToast.ts | 4 +- .../toasts/mapTeamsLimitReminderToToast.ts | 4 +- .../mutations/toasts/popInvolvementToast.ts | 2 +- .../mutations/toasts/popNotificationToast.ts | 12 +- .../toasts/updateNotificationToast.ts | 2 +- .../useAcceptRequestToJoinDomainMutation.ts | 2 +- .../client/mutations/useShareTopicMutation.ts | 2 +- packages/client/package.json | 5 +- .../subscriptions/MeetingSubscription.ts | 8 +- .../subscriptions/OrganizationSubscription.ts | 10 +- .../client/subscriptions/TeamSubscription.ts | 6 +- .../ui/AlertDialog/AlertDialogAction.tsx | 2 +- .../ui/AlertDialog/AlertDialogCancel.tsx | 2 +- .../ui/AlertDialog/AlertDialogDescription.tsx | 2 +- .../ui/AlertDialog/AlertDialogFooter.tsx | 2 +- .../ui/AlertDialog/AlertDialogHeader.tsx | 2 +- .../ui/AlertDialog/AlertDialogOverlay.tsx | 2 +- .../ui/AlertDialog/AlertDialogTitle.tsx | 2 +- packages/client/ui/Avatar/AvatarFallback.tsx | 2 +- packages/client/ui/Avatar/AvatarImage.tsx | 2 +- packages/client/ui/Button/Button.tsx | 2 +- packages/client/ui/Chip/Chip.tsx | 2 +- packages/client/ui/Dialog/Dialog.tsx | 2 +- packages/client/ui/Dialog/DialogClose.tsx | 2 +- packages/client/ui/Dialog/DialogContent.tsx | 4 +- .../client/ui/Dialog/DialogDescription.tsx | 2 +- packages/client/ui/Dialog/DialogOverlay.tsx | 2 +- packages/client/ui/Dialog/DialogTitle.tsx | 2 +- packages/client/ui/Select/SelectContent.tsx | 2 +- packages/client/ui/Select/SelectItem.tsx | 4 +- packages/client/ui/Select/SelectTrigger.tsx | 4 +- packages/client/utils/GcalClientManager.ts | 2 +- packages/client/utils/SendClientSideEvent.ts | 2 +- packages/client/utils/date/relativeDate.ts | 2 +- .../client/utils/getTeamHealthVoteColor.ts | 2 +- .../client/utils/handleSuccessfulLogin.ts | 4 +- .../client/utils/relay/setActiveTemplate.ts | 2 +- .../client/utils/useTemplateDescription.ts | 2 +- packages/embedder/package.json | 2 +- packages/gql-executor/package.json | 6 +- packages/integration-tests/package.json | 2 +- packages/server/__tests__/setup.ts | 2 +- .../server/billing/helpers/adjustUserCount.ts | 6 +- .../server/billing/helpers/generateInvoice.ts | 2 +- .../helpers/removeTeamsLimitObjects.ts | 2 +- .../helpers/updateSubscriptionQuantity.ts | 4 +- .../20220602164119-fixRetroTemplates.ts | 4 +- packages/server/database/rethinkDriver.ts | 6 +- .../server/database/types/TeamHealthPhase.ts | 2 +- .../database/types/scheduleTeamLimitsJobs.ts | 2 +- packages/server/dataloader/RedisCache.ts | 2 +- .../server/dataloader/atlassianLoaders.ts | 8 +- .../server/dataloader/azureDevOpsLoaders.ts | 2 +- .../dataloader/foreignKeyLoaderMaker.ts | 2 +- .../dataloader/primaryKeyLoaderMakers.ts | 6 +- .../dataloader/rethinkPrimaryKeyLoader.ts | 2 +- packages/server/email/MailManagerDebug.ts | 2 +- .../email/newMeetingSummaryEmailCreator.tsx | 2 +- .../email/notificationSummaryCreator.tsx | 2 +- .../server/fileStorage/getFileStoreManager.ts | 2 +- packages/server/graphql/ResponseStream.ts | 2 +- .../server/graphql/mutations/addAgendaItem.ts | 2 +- .../graphql/mutations/addAtlassianAuth.ts | 2 +- .../server/graphql/mutations/addGitHubAuth.ts | 2 +- packages/server/graphql/mutations/addOrg.ts | 2 +- .../mutations/addPokerTemplateScale.ts | 2 +- .../server/graphql/mutations/addSlackAuth.ts | 2 +- packages/server/graphql/mutations/addTeam.ts | 4 +- .../mutations/addTeamMemberIntegrationAuth.ts | 4 +- .../graphql/mutations/archiveOrganization.ts | 2 +- .../server/graphql/mutations/archiveTeam.ts | 2 +- .../server/graphql/mutations/createPoll.ts | 2 +- .../graphql/mutations/createReflection.ts | 6 +- .../graphql/mutations/downgradeToStarter.ts | 2 +- .../server/graphql/mutations/endCheckIn.ts | 2 +- .../graphql/mutations/endSprintPoker.ts | 4 +- .../helpers/activatePrevSlackAuth.ts | 2 +- .../graphql/mutations/helpers/attemptLogin.ts | 2 +- .../mutations/helpers/bootstrapNewUser.ts | 12 +- .../mutations/helpers/createGcalEvent.ts | 6 +- .../helpers/createNewMeetingPhases.ts | 2 +- .../mutations/helpers/gatherInsights.ts | 2 +- .../mutations/helpers/generateGroups.ts | 10 +- .../helpers/generateStandupMeetingSummary.ts | 4 +- .../mutations/helpers/getCCFromCustomer.ts | 2 +- .../helpers/getReflectionEntities.ts | 2 +- .../mutations/helpers/inviteToTeamHelper.ts | 20 +- .../helpers/notifications/MSTeamsNotifier.ts | 6 +- .../notifications/MattermostNotifier.ts | 10 +- .../helpers/notifications/SlackNotifier.ts | 20 +- .../helpers/notifications/getSummaryText.ts | 2 +- .../mutations/helpers/removeFromOrg.ts | 4 +- .../mutations/helpers/removeScheduledJobs.ts | 2 +- .../mutations/helpers/removeTeamMember.ts | 2 +- .../mutations/helpers/safeEndTeamPrompt.ts | 8 +- .../mutations/helpers/validateScaleValue.ts | 2 +- .../server/graphql/mutations/joinMeeting.ts | 2 +- .../server/graphql/mutations/moveTeamToOrg.ts | 4 +- .../graphql/mutations/navigateMeeting.ts | 2 +- packages/server/graphql/mutations/payLater.ts | 2 +- .../server/graphql/mutations/resetPassword.ts | 2 +- .../graphql/mutations/selectTemplate.ts | 2 +- .../mutations/setDefaultSlackChannel.ts | 2 +- .../server/graphql/mutations/setStageTimer.ts | 4 +- .../graphql/mutations/setTaskEstimate.ts | 4 +- .../updateAzureDevOpsDimensionField.ts | 2 +- .../mutations/updateGitHubDimensionField.ts | 2 +- .../mutations/updateIntegrationProvider.ts | 2 +- .../graphql/mutations/updatePokerScope.ts | 2 +- .../mutations/updateReflectionContent.ts | 2 +- .../mutations/updateReflectionGroupTitle.ts | 2 +- .../graphql/mutations/updateTaskDueDate.ts | 2 +- .../graphql/mutations/updateTeamName.ts | 2 +- .../graphql/mutations/updateTemplateScope.ts | 2 +- .../nestedSchema/nestGitLabEndpoint.ts | 4 +- .../private/mutations/autopauseUsers.ts | 2 +- .../mutations/checkRethinkPgEquality.ts | 47 +- .../private/mutations/connectSocket.ts | 2 +- .../mutations/draftEnterpriseInvoice.ts | 4 +- .../private/mutations/processRecurrence.ts | 16 +- .../private/mutations/runScheduledJobs.ts | 8 +- .../mutations/sendBatchNotificationEmails.ts | 2 +- .../mutations/sendUpcomingInvoiceEmails.ts | 2 +- .../private/mutations/stripeFailPayment.ts | 2 +- .../private/mutations/upgradeToTeamTier.ts | 2 +- .../mutations/acceptRequestToJoinDomain.ts | 26 +- .../public/mutations/acceptTeamInvitation.ts | 2 +- .../public/mutations/addPokerTemplate.ts | 4 +- .../public/mutations/addReflectTemplate.ts | 12 +- .../public/mutations/batchArchiveTasks.ts | 6 +- .../__tests__/getKudosUserIdsFromJson.test.ts | 2 +- .../public/mutations/loginWithPassword.ts | 2 +- .../public/mutations/modifyCheckInQuestion.ts | 4 +- .../public/mutations/requestToJoinDomain.ts | 12 +- .../public/mutations/revealTeamHealthVotes.ts | 6 +- .../public/mutations/setOrgUserRole.ts | 4 +- .../public/mutations/setTeamHealthVote.ts | 12 +- .../graphql/public/mutations/shareTopic.ts | 4 +- .../public/mutations/signUpWithPassword.ts | 2 +- .../public/mutations/startRetrospective.ts | 8 +- .../public/mutations/startTeamPrompt.ts | 6 +- .../mutations/updateGitLabDimensionField.ts | 2 +- .../mutations/updateRecurrenceSettings.ts | 6 +- .../mutations/updateTemplateCategory.ts | 2 +- .../mutations/upsertTeamPromptResponse.ts | 6 +- .../types/AddReactjiToReactableSuccess.ts | 2 +- .../public/types/CreateGcalEventInput.ts | 6 +- .../graphql/public/types/DomainJoinRequest.ts | 6 +- .../graphql/public/types/GcalIntegration.ts | 2 +- .../public/types/NotifyRequestToJoinOrg.ts | 2 +- .../graphql/public/types/Organization.ts | 2 +- .../types/ResetReflectionGroupsSuccess.ts | 2 +- .../public/types/RetrospectiveMeeting.ts | 2 +- .../public/types/SetOrgUserRoleSuccess.ts | 2 +- packages/server/graphql/public/types/Team.ts | 2 +- .../graphql/public/types/TeamHealthPhase.ts | 2 +- .../graphql/public/types/TeamHealthStage.ts | 6 +- .../graphql/public/types/TeamPromptMeeting.ts | 4 +- .../graphql/public/types/TopRetroTemplate.ts | 2 +- .../types/UpsertTeamPromptResponseSuccess.ts | 2 +- packages/server/graphql/public/types/User.ts | 4 +- .../helpers/getActiveTeamCountByTeamIds.ts | 2 +- .../queries/helpers/fetchGitHubRepos.ts | 2 +- .../queries/helpers/fetchGitLabProjects.ts | 2 +- .../queries/helpers/makeUpcomingInvoice.ts | 4 +- .../helpers/resolveSelectedTemplate.ts | 2 +- packages/server/graphql/rootMutation.ts | 2 +- packages/server/graphql/rootTypes.ts | 2 +- packages/server/graphql/traceGraphQL.ts | 6 +- .../types/AddIntegrationProviderPayload.ts | 2 +- .../types/AddReactjiToReflectionPayload.ts | 2 +- .../AddTeamMemberIntegrationAuthPayload.ts | 2 +- .../types/ArchiveTimelineEventPayload.ts | 2 +- packages/server/graphql/types/AuthIdentity.ts | 2 +- .../types/CreateMassInvitationPayload.ts | 2 +- packages/server/graphql/types/Discussion.ts | 2 +- .../types/DragEstimatingTaskPayload.ts | 2 +- .../server/graphql/types/EndCheckInPayload.ts | 2 +- .../graphql/types/EndRetrospectivePayload.ts | 2 +- .../graphql/types/EndSprintPokerPayload.ts | 2 +- .../graphql/types/EndTeamPromptPayload.ts | 2 +- .../types/FlagReadyToAdvancePayload.ts | 2 +- .../server/graphql/types/JiraRemoteProject.ts | 2 +- .../graphql/types/JoinMeetingPayload.ts | 2 +- .../MovePokerTemplateScaleValuePayload.ts | 2 +- .../server/graphql/types/NewMeetingStage.ts | 2 +- packages/server/graphql/types/Organization.ts | 2 +- .../server/graphql/types/OrganizationUser.ts | 2 +- .../types/PokerAnnounceDeckHoverPayload.ts | 2 +- packages/server/graphql/types/PokerMeeting.ts | 2 +- .../graphql/types/PokerMeetingSettings.ts | 2 +- packages/server/graphql/types/Reactable.ts | 2 +- .../types/RemoveIntegrationProviderPayload.ts | 2 +- .../RemoveTeamMemberIntegrationAuthPayload.ts | 2 +- .../graphql/types/RenameMeetingPayload.ts | 2 +- .../types/RetrospectiveMeetingSettings.ts | 2 +- .../graphql/types/SetAppLocationPayload.ts | 2 +- .../types/SetDefaultSlackChannelPayload.ts | 2 +- .../graphql/types/SetPokerSpectatePayload.ts | 2 +- .../graphql/types/SetTaskEstimatePayload.ts | 2 +- .../graphql/types/SetTaskHighlightPayload.ts | 2 +- .../graphql/types/StartSprintPokerPayload.ts | 2 +- .../graphql/types/TeamMeetingSettings.ts | 6 +- .../graphql/types/TeamMemberIntegrations.ts | 2 +- .../graphql/types/ToggleTeamDrawerPayload.ts | 2 +- .../UpdateAzureDevOpsDimensionFieldPayload.ts | 2 +- .../UpdateGitHubDimensionFieldPayload.ts | 2 +- .../types/UpdateIntegrationProviderPayload.ts | 2 +- .../graphql/types/UpdatePokerScopePayload.ts | 2 +- .../types/UpdateRetroMaxVotesPayload.ts | 2 +- .../types/UpdateTemplateScopePayload.ts | 2 +- packages/server/graphql/types/User.ts | 4 +- packages/server/package.json | 6 +- .../1614030642692_refs-for-meetings.ts | 2 +- .../migrations/1614361628531_github-auth.ts | 2 +- .../migrations/1623102903842_discuss.ts | 2 +- .../1625576993065_addAtlassianAuthTable.ts | 2 +- .../1631553388387_add-template-teams-users.ts | 2 +- ...29261909_mattermostToIntegrationsTables.ts | 2 +- .../1654861495450_migrateSecureDomain.ts | 2 +- .../1677272969994_meetingTemplatesMove.ts | 2 +- .../migrations/1694191002164_migrateSAML.ts | 2 +- .../1695293482618_addFreemailDomain.ts | 2 +- .../1708127504000_updateEmbeddingMetadata.ts | 6 +- .../1709927835000_moveScheduledJob.ts | 2 +- .../1712075131388_retroReflectionGroups2.ts | 107 + .../postgres/queries/updateUserTiers.ts | 2 +- packages/server/postgres/utils/checkEqBase.ts | 18 +- .../postgres/utils/rethinkEqualityFns.ts | 8 + .../socketHelpers/sendEncodedMessage.ts | 2 +- .../server/utils/AtlassianServerManager.ts | 8 +- .../server/utils/AzureDevOpsServerManager.ts | 2 +- packages/server/utils/OpenAIServerManager.ts | 4 +- packages/server/utils/PubSubPromise.ts | 4 +- .../server/utils/RecallAIServerManager.ts | 2 +- packages/server/utils/StaticServer.ts | 2 +- .../utils/__tests__/RedisLockQueue.test.ts | 4 +- packages/server/utils/authorization.ts | 5 +- packages/server/utils/getGraphQLExecutor.ts | 2 +- packages/server/utils/getPhase.ts | 2 +- packages/server/utils/isPhaseAvailable.ts | 4 +- .../utils/isRequestToJoinDomainAllowed.ts | 6 +- packages/server/utils/sendPromptToJoinOrg.ts | 4 +- packages/server/utils/serverHealthChecker.ts | 2 +- packages/server/utils/updateGQLSchema.ts | 2 +- scripts/webpack/dev.client.config.js | 10 +- yarn.lock | 2478 ++++++++++------- 1029 files changed, 3588 insertions(+), 8352 deletions(-) delete mode 100644 docker/images/parabol-ubi/cloudbuild.yml delete mode 100644 docker/images/parabol-ubi/docker-compose.yml delete mode 100644 docker/images/parabol-ubi/dockerfiles/parabol.dockerfile delete mode 100644 docker/images/parabol-ubi/environments/legacy-build delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh delete mode 100644 packages/client/components/ActivityLibrary/ActivityLibraryCard.tsx delete mode 100644 packages/client/components/NewMeetingSettings.tsx delete mode 100644 packages/client/components/NewMeetingSettingsAction.tsx delete mode 100644 packages/client/components/NewMeetingSettingsPoker.tsx delete mode 100644 packages/client/components/NewMeetingSettingsRetrospective.tsx delete mode 100644 packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx delete mode 100644 packages/client/components/NewMeetingSettingsTeamPrompt.tsx delete mode 100644 packages/client/modules/meeting/components/AddNewPokerTemplate.tsx delete mode 100644 packages/client/modules/meeting/components/AddNewReflectTemplate.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplateDetails.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplateItem.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplateList.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListOrg.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListPublic.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListTeam.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplateModal.tsx delete mode 100644 packages/client/modules/meeting/components/PokerTemplatePicker.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateDetails.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateItem.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateList.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateModal.tsx delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateSearchBar.tsx delete mode 100644 packages/client/modules/meeting/components/RetroTemplatePicker.tsx delete mode 100644 packages/client/modules/meeting/components/SelectTemplate.tsx delete mode 100644 packages/client/mutations/connections/getPokerTemplateOrgConn.ts delete mode 100644 packages/client/mutations/connections/getPokerTemplatePublicConn.ts create mode 100644 packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts diff --git a/.github/workflows/ironbank.yml b/.github/workflows/ironbank.yml index c60df2b134f..ce69988b2b1 100644 --- a/.github/workflows/ironbank.yml +++ b/.github/workflows/ironbank.yml @@ -50,10 +50,10 @@ jobs: run: | docker cp temp-container:/home/node/parabol/dist ./dist docker cp temp-container:/home/node/parabol/build ./build - docker cp temp-container:/home/node/tools/ip-to-server_id ./tools/ip-to-server_id + docker cp temp-container:/home/node/tools/ip-to-server_id ./ip-to-server_id - name: Zip the files - run: zip -r ${{ github.event.inputs.version_number }}.zip dist build + run: zip -r ${{ github.event.inputs.version_number }}.zip dist build ip-to-server_id - name: Set up AWS Credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.prettierrc b/.prettierrc index fd7689d2027..da740c62717 100644 --- a/.prettierrc +++ b/.prettierrc @@ -14,5 +14,5 @@ } } ], - "plugins": ["prettier-plugin-tailwindcss"] + "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"] } diff --git a/.release-please-manifest.json b/.release-please-manifest.json index bb6937b0fd0..2b5d525691a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "7.27.0" + ".": "7.27.2" } diff --git a/CHANGELOG.md b/CHANGELOG.md index cdd40c2dd68..862ce334349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,33 @@ This project adheres to [Semantic Versioning](http://semver.org/). This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/). +## [7.27.2](https://github.com/ParabolInc/parabol/compare/v7.27.1...v7.27.2) (2024-04-17) + + +### Fixed + +* change retro group schema to allow for rethinkdb table migration ([#9653](https://github.com/ParabolInc/parabol/issues/9653)) ([0092d0b](https://github.com/ParabolInc/parabol/commit/0092d0baf6852e820384ae114f59e23294fed0e9)) + +## [7.27.1](https://github.com/ParabolInc/parabol/compare/v7.27.0...v7.27.1) (2024-04-16) + + +### Fixed + +* add prettier-plugin-organize-imports ([#9637](https://github.com/ParabolInc/parabol/issues/9637)) ([7d1086d](https://github.com/ParabolInc/parabol/commit/7d1086d4c1e5b0466617b007bb96c6642b4d5015)) +* margin spacing on hover ([#9635](https://github.com/ParabolInc/parabol/issues/9635)) ([4f25cba](https://github.com/ParabolInc/parabol/commit/4f25cba7393f28bb2f0269db1b1916e9792df4a7)) +* Migrate webpack dev server settings to v5 ([#9644](https://github.com/ParabolInc/parabol/issues/9644)) ([a21f1d0](https://github.com/ParabolInc/parabol/commit/a21f1d0895aaf987299104891e2b9c2e343a1635)) +* vuln patch for undici ([#9622](https://github.com/ParabolInc/parabol/issues/9622)) ([c2a3a43](https://github.com/ParabolInc/parabol/commit/c2a3a4300c94da8c3dcf5edc33c2e2b38df8686f)) + + +### Changed + +* add ip-to-server script dir to zip file ([#9645](https://github.com/ParabolInc/parabol/issues/9645)) ([19a6689](https://github.com/ParabolInc/parabol/commit/19a66898f841905b801161a9576385d6480d631e)) +* **docker:** delete all files used by old PPMIs and old Docker images ([#9648](https://github.com/ParabolInc/parabol/issues/9648)) ([a01cf2b](https://github.com/ParabolInc/parabol/commit/a01cf2bd2324fe62fa4af3044f06c94d6f14b087)) +* fix ironbank action file copy ([#9638](https://github.com/ParabolInc/parabol/issues/9638)) ([e3635ee](https://github.com/ParabolInc/parabol/commit/e3635ee335f59c1be0ca43c254a15e126e6e24d5)) +* Improve Activity Library focus and hover states ([#9626](https://github.com/ParabolInc/parabol/issues/9626)) ([6f1c1d9](https://github.com/ParabolInc/parabol/commit/6f1c1d9378536bd212032c84e0f35e074cca0941)) +* migration reflection groups to pg ([#9514](https://github.com/ParabolInc/parabol/issues/9514)) ([ddb4244](https://github.com/ParabolInc/parabol/commit/ddb424480b7bb45c0aaae65afb0264c7b9a30091)) +* Remove old template editing logic ([#9627](https://github.com/ParabolInc/parabol/issues/9627)) ([8552d43](https://github.com/ParabolInc/parabol/commit/8552d43e63fa1cf548da54460c49947d5772ae61)) + ## [7.27.0](https://github.com/ParabolInc/parabol/compare/v7.26.0...v7.27.0) (2024-04-11) diff --git a/docker/images/parabol-ubi/cloudbuild.yml b/docker/images/parabol-ubi/cloudbuild.yml deleted file mode 100644 index 1ba32c91d96..00000000000 --- a/docker/images/parabol-ubi/cloudbuild.yml +++ /dev/null @@ -1,17 +0,0 @@ -steps: -- name: 'docker/compose:1.29.2' - args: ['up', '-d'] - env: - - '_REDIS_VERSION=$_REDIS_VERSION' - - '_RETHINKDB_VERSION=$_RETHINKDB_VERSION' - - '_POSTGRES_VERSION=$_POSTGRES_VERSION' -- name: 'gcr.io/cloud-builders/docker' - args: [ 'build', '--network=cloudbuild', '-t', 'gcr.io/prbl-prod/parabol/parabol-ubi:$_APP_VERSION', '-f', './dockerfiles/parabol.dockerfile', '--build-arg','_PARABOL_GIT_REF=$_PARABOL_GIT_REF', '--build-arg','_NODE_VERSION=$_NODE_VERSION', '.' ] - env: - - '_NODE_VERSION=$_NODE_VERSION' -images: -- 'gcr.io/prbl-prod/parabol/parabol-ubi:$_APP_VERSION' -options: - logging: CLOUD_LOGGING_ONLY - machineType: 'E2_HIGHCPU_32' -timeout: 3600s \ No newline at end of file diff --git a/docker/images/parabol-ubi/docker-compose.yml b/docker/images/parabol-ubi/docker-compose.yml deleted file mode 100644 index 40651aceb39..00000000000 --- a/docker/images/parabol-ubi/docker-compose.yml +++ /dev/null @@ -1,30 +0,0 @@ -version: '3' -services: - redis: - image: redis:$_REDIS_VERSION - network_mode: cloudbuild - container_name: redis - expose: - - 6379 - rethinkdb: - image: rethinkdb:$_RETHINKDB_VERSION - network_mode: cloudbuild - container_name: rethinkdb - expose: - - 8080 - - 29015 - - 28015 - postgres: - image: postgres:$_POSTGRES_VERSION - network_mode: cloudbuild - container_name: postgres - environment: - - POSTGRES_USER=tempuser - - POSTGRES_PASSWORD=temppassword - - POSTGRES_DB=tempdb - expose: - - 5432 -networks: - default: - external: - name: cloudbuild \ No newline at end of file diff --git a/docker/images/parabol-ubi/dockerfiles/parabol.dockerfile b/docker/images/parabol-ubi/dockerfiles/parabol.dockerfile deleted file mode 100644 index 2688d19ee8d..00000000000 --- a/docker/images/parabol-ubi/dockerfiles/parabol.dockerfile +++ /dev/null @@ -1,118 +0,0 @@ -# DO NOT DELETE. Legacy docker file for versions still in use. Delete only when all Parabol instances are using the newest docker image. -ARG _NODE_VERSION=${_NODE_VERSION} -#base build for dev deps -FROM node:${_NODE_VERSION} as base - -ARG _PARABOL_GIT_REF=${_PARABOL_GIT_REF} -ARG _BUILD_ENV_PATH=environments/legacy-build -ENV NPM_CONFIG_PREFIX=/home/node/.npm-global - -WORKDIR /home/node - -ADD ${_BUILD_ENV_PATH} ./.env - -RUN git clone https://github.com/ParabolInc/parabol.git -b ${_PARABOL_GIT_REF} --depth 1 && \ - cd parabol && \ - rm -rf .git/ && \ - mv /home/node/.env ./.env && \ - mkdir -p /home/node/parabol/node_modules && \ - mkdir -p /home/node/.npm-global && \ - apt update -y && \ - apt install systemtap -y && \ - NODE_OPTIONS=--max-old-space-size=20480 && \ - yarn install --frozen-lockfile && \ - yarn cache clean && \ - yarn db:migrate && \ - yarn pg:migrate up && \ - yarn pg:build && \ - yarn build && \ - chown -R node:1000 /home/node/parabol - -#final image - copies in parabol build and applies all security configurations to container -FROM redhat/ubi9:9.2 - -ENV HOME=/home/node \ - USER=node - -RUN groupadd -g 1000 node && \ - useradd -r -u 1000 -m -s /sbin/nologin -g node node - -COPY --from=base /usr/local/bin /usr/local/bin -COPY --from=base /usr/local/include /usr/local/include -COPY --from=base /usr/local/share/man /usr/local/share/man -COPY --from=base /usr/local/share/doc /usr/local/share/doc -COPY --from=base /usr/share/systemtap /usr/local/share/systemtap -COPY --from=base /usr/local/lib/node_modules /usr/local/lib/node_modules -COPY --from=base /opt /opt -COPY --from=base /home/node/parabol/ ${HOME}/parabol -RUN rm -rf ${HOME}/parabol/.env -COPY entrypoints/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh -COPY security /security - -COPY ./tools/ip-to-server_id /home/node/tools/ip-to-server_id - -RUN echo Update packages and install security patches && \ - sed -i "s/enabled=1/enabled=0/" /etc/dnf/plugins/subscription-manager.conf && \ - echo "exclude=filesystem-*" >> /etc/dnf/dnf.conf && \ - chmod +x /security/*.sh && \ - dnf repolist && \ - dnf update -y && \ - echo "* hard maxlogins 10" > /etc/security/limits.d/maxlogins.conf && \ - /security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh && \ - /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh && \ - /security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh && \ - /security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh && \ - /security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh && \ - /security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh && \ - /security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh && \ - /security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh && \ - /security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh && \ - /security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh && \ - /security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh && \ - /security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh && \ - /security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh && \ - /security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh && \ - /security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh && \ - /security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh && \ - dnf clean all && \ - rm -rf /security/ /var/cache/dnf/ /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???* && \ - chmod 755 /usr/local/bin/docker-entrypoint.sh && \ - chmod g-s /opt/yarn-v*/bin /opt/yarn-v*/lib && \ - chgrp -R root /opt/yarn-v* && \ - chgrp root /opt/yarn-v*/lib/* /opt/yarn-v*/bin/* /opt/yarn-v*/* && \ - mkdir -p /home/node/parabol/self-hosted && \ - chown node:node /home/node/parabol/self-hosted - - -WORKDIR ${HOME}/parabol/ -USER 1000 - -EXPOSE 3000 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/docker/images/parabol-ubi/environments/legacy-build b/docker/images/parabol-ubi/environments/legacy-build deleted file mode 100644 index d3defd290e1..00000000000 --- a/docker/images/parabol-ubi/environments/legacy-build +++ /dev/null @@ -1,54 +0,0 @@ -ATLASSIAN_CLIENT_ID='' -ATLASSIAN_CLIENT_SECRET='' -AWS_ACCESS_KEY_ID='' -AWS_REGION='' -AWS_S3_BUCKET='' -AWS_SECRET_ACCESS_KEY='' -CDN_BASE_URL='' -FILE_STORE_PROVIDER='local' -GITHUB_CLIENT_ID='' -GITHUB_CLIENT_SECRET='' -GITHUB_WEBHOOK_SECRET='' -GITLAB_CLIENT_ID='' -GITLAB_CLIENT_SECRET='' -GOOGLE_CLOUD_CLIENT_EMAIL='' -GOOGLE_CLOUD_PRIVATE_KEY='' -GOOGLE_CLOUD_PRIVATE_KEY_ID='' -GOOGLE_OAUTH_CLIENT_ID='' -GOOGLE_OAUTH_CLIENT_SECRET='' -GOOGLE_TAG_MANAGER_CONTAINER_ID='' -GRAPHQL_HOST='' -GRAPHQL_PROTOCOL='' -HOST='' -INVITATION_SHORTLINK='' -MAIL_PROVIDER='' -MAIL_GOOGLE_USER='' -MAIL_GOOGLE_PASS='' -MAILGUN_API_KEY='' -MAILGUN_DOMAIN='' -MAILGUN_PUBLIC_KEY='' -MAIL_FROM='' -NODE_ENV='production' -NODE_EXTRA_CA_CERTS='' -PROTO='https' -PGADMIN_DEFAULT_EMAIL='' -PGADMIN_DEFAULT_PASSWORD='' -PGSSLMODE='' -PORT='' -POSTGRES_PASSWORD='temppassword' -POSTGRES_USER='tempuser' -POSTGRES_DB='tempdb' -POSTGRES_HOST='postgres' -POSTGRES_PORT='5432' -REDIS_URL='redis://redis:6379' -RETHINKDB_SSL='' -RETHINKDB_URL='rethinkdb://rethinkdb:28015/actionProduction' -SENTRY_DSN='' -SERVER_ID='' -SERVER_SECRET='FAKE_VALUE' -SLACK_CLIENT_ID='' -SLACK_CLIENT_SECRET='' -STRIPE_PUBLISHABLE_KEY='' -STRIPE_SECRET_KEY='' -STRIPE_WEBHOOK_SECRET='' -HUBSPOT_API_KEY='' diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh deleted file mode 100755 index 4723b62c1c9..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q shadow-utils; then - - -var_account_disable_post_pw_expiration="35" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/default/useradd' '^INACTIVE' "$var_account_disable_post_pw_expiration" 'CCE-80954-1' '%s=%s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh deleted file mode 100755 index 1c48d0c935d..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q shadow-utils; then - - - -# Set variables -var_accounts_fail_delay="4" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/login.defs' '^FAIL_DELAY' "$var_accounts_fail_delay" 'CCE-84037-1' '%s %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh deleted file mode 100755 index 57c685ff97e..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_accounts_max_concurrent_login_sessions="10" - - - -if grep -q '^[^#]*\' /etc/security/limits.d/*.conf; then - sed -i "/^[^#]*\/ s/maxlogins.*/maxlogins $var_accounts_max_concurrent_login_sessions/" /etc/security/limits.d/*.conf -elif grep -q '^[^#]*\' /etc/security/limits.conf; then - sed -i "/^[^#]*\/ s/maxlogins.*/maxlogins $var_accounts_max_concurrent_login_sessions/" /etc/security/limits.conf -else - echo "* hard maxlogins $var_accounts_max_concurrent_login_sessions" >> /etc/security/limits.conf -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh deleted file mode 100755 index ee8858697d1..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q shadow-utils; then - - -var_accounts_maximum_age_login_defs="60" - - - -grep -q ^PASS_MAX_DAYS /etc/login.defs && \ - sed -i "s/PASS_MAX_DAYS.*/PASS_MAX_DAYS $var_accounts_maximum_age_login_defs/g" /etc/login.defs -if ! [ $? -eq 0 ]; then - echo "PASS_MAX_DAYS $var_accounts_maximum_age_login_defs" >> /etc/login.defs -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh deleted file mode 100755 index ad5419f5e8b..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q shadow-utils; then - - -var_accounts_minimum_age_login_defs="1" - - - -grep -q ^PASS_MIN_DAYS /etc/login.defs && \ - sed -i "s/PASS_MIN_DAYS.*/PASS_MIN_DAYS $var_accounts_minimum_age_login_defs/g" /etc/login.defs -if ! [ $? -eq 0 ]; then - echo "PASS_MIN_DAYS $var_accounts_minimum_age_login_defs" >> /etc/login.defs -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh deleted file mode 100755 index 5e794e5eafc..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512'") - -(>&2 echo "FIX FOR THIS RULE 'xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512' IS MISSING!") - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh deleted file mode 100755 index ed174d4ac12..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q shadow-utils; then - - -var_accounts_password_minlen_login_defs="15" - - - -grep -q ^PASS_MIN_LEN /etc/login.defs && \ -sed -i "s/PASS_MIN_LEN.*/PASS_MIN_LEN\t$var_accounts_password_minlen_login_defs/g" /etc/login.defs -if ! [ $? -eq 0 ] -then - echo -e "PASS_MIN_LEN\t$var_accounts_password_minlen_login_defs" >> /etc/login.defs -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh deleted file mode 100755 index 6354fc6c7ab..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_dcredit="-1" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/security/pwquality.conf' '^dcredit' $var_password_pam_dcredit 'CCE-80653-9' '%s = %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh deleted file mode 100755 index 5267cfe1794..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh +++ /dev/null @@ -1,43 +0,0 @@ -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_dictcheck="1" - - - -# Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. -# Otherwise, regular sed command will do. -sed_command=('sed' '-i') -if test -L "/etc/security/pwquality.conf"; then - sed_command+=('--follow-symlinks') -fi - -# If the cce arg is empty, CCE is not assigned. -if [ -z "CCE-86233-4" ]; then - cce="CCE" -else - cce="CCE-86233-4" -fi - -# Strip any search characters in the key arg so that the key can be replaced without -# adding any search characters to the config file. -stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "^dictcheck") - -# shellcheck disable=SC2059 -printf -v formatted_output "%s = %s" "$stripped_key" "$var_password_pam_dictcheck" - -# If the key exists, change it. Otherwise, add it to the config_file. -# We search for the key string followed by a word boundary (matched by \>), -# so if we search for 'setting', 'setting2' won't match. -if LC_ALL=C grep -q -m 1 -i -e "^dictcheck\\>" "/etc/security/pwquality.conf"; then - "${sed_command[@]}" "s/^dictcheck\\>.*/$formatted_output/gi" "/etc/security/pwquality.conf" -else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "/etc/security/pwquality.conf" >> "/etc/security/pwquality.conf" - printf '%s\n' "$formatted_output" >> "/etc/security/pwquality.conf" -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh deleted file mode 100755 index 60370f10b87..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_difok'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_difok="8" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/security/pwquality.conf' '^difok' $var_password_pam_difok 'CCE-80654-7' '%s = %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh deleted file mode 100755 index d7913195c80..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_lcredit="-1" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/security/pwquality.conf' '^lcredit' $var_password_pam_lcredit 'CCE-80655-4' '%s = %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh deleted file mode 100755 index aa1efc1002a..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_maxclassrepeat="4" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/security/pwquality.conf' '^maxclassrepeat' $var_password_pam_maxclassrepeat 'CCE-81034-1' '%s = %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh deleted file mode 100755 index 970e780f2a0..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_maxrepeat="3" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/security/pwquality.conf' '^maxrepeat' $var_password_pam_maxrepeat 'CCE-82066-2' '%s = %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh deleted file mode 100755 index 80113e1bc09..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_minclass="4" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/security/pwquality.conf' '^minclass' $var_password_pam_minclass 'CCE-82046-4' '%s = %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh deleted file mode 100755 index 10fd7a99b5b..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_minlen="15" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/security/pwquality.conf' '^minlen' $var_password_pam_minlen 'CCE-80656-2' '%s = %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh deleted file mode 100755 index 36e295f5539..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_ocredit="-1" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/security/pwquality.conf' '^ocredit' $var_password_pam_ocredit 'CCE-80663-8' '%s = %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh deleted file mode 100755 index 4587873627d..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_remember="5" - -var_password_pam_remember_control_flag="required" - - - -pamFile="/etc/pam.d/password-auth" -# control required is for rhel8, while requisite is for other distros -CONTROL=${var_password_pam_remember_control_flag} - -if [ ! -f $pamFile ]; then - continue -fi - -# is 'password required|requisite pam_pwhistory.so' here? -if grep -q "^password.*pam_pwhistory.so.*" $pamFile; then - # is the remember option set? - option=$(sed -rn 's/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\2/p' $pamFile) - if [[ -z $option ]]; then - # option is not set, append to module - sed -i --follow-symlinks "/pam_pwhistory.so/ s/$/ remember=$var_password_pam_remember/" - else - # option is set, replace value - sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$var_password_pam_remember\3/" $pamFile - fi - # ensure corect control is being used per os requirement - if ! grep -q "^password.*$CONTROL.*pam_pwhistory.so.*" $pamFile; then - #replace incorrect value - sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$CONTROL\3/" $pamFile - fi -else - # no 'password required|requisite pam_pwhistory.so', add it - sed -i --follow-symlinks "/^password.*pam_unix.so.*/i password $CONTROL pam_pwhistory.so use_authtok remember=$var_password_pam_remember" $pamFile -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh deleted file mode 100755 index 399cc9bf4b9..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_remember="5" - -var_password_pam_remember_control_flag="required" - - - -pamFile="/etc/pam.d/system-auth" -# control required is for rhel8, while requisite is for other distros -CONTROL=${var_password_pam_remember_control_flag} - -if [ ! -f $pamFile ]; then - continue -fi - -# is 'password required|requisite pam_pwhistory.so' here? -if grep -q "^password.*pam_pwhistory.so.*" $pamFile; then - # is the remember option set? - option=$(sed -rn 's/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\2/p' $pamFile) - if [[ -z $option ]]; then - # option is not set, append to module - sed -i --follow-symlinks "/pam_pwhistory.so/ s/$/ remember=$var_password_pam_remember/" - else - # option is set, replace value - sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$var_password_pam_remember\3/" $pamFile - fi - # ensure corect control is being used per os requirement - if ! grep -q "^password.*$CONTROL.*pam_pwhistory.so.*" $pamFile; then - #replace incorrect value - sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$CONTROL\3/" $pamFile - fi -else - # no 'password required|requisite pam_pwhistory.so', add it - sed -i --follow-symlinks "/^password.*pam_unix.so.*/i password $CONTROL pam_pwhistory.so use_authtok remember=$var_password_pam_remember" $pamFile -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh deleted file mode 100755 index 3b81606b8b4..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - - -var_password_pam_ucredit="-1" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/security/pwquality.conf' '^ucredit' $var_password_pam_ucredit 'CCE-80665-3' '%s = %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh deleted file mode 100755 index 28686ba4d22..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember'") - -var_password_pam_unix_remember="5" - -AUTH_FILES[0]="/etc/pam.d/system-auth" -AUTH_FILES[1]="/etc/pam.d/password-auth" - -for pamFile in "${AUTH_FILES[@]}" -do - if grep -q "remember=" $pamFile; then - sed -i --follow-symlinks "s/\(^password.*sufficient.*pam_unix.so.*\)\(\(remember *= *\)[^ $]*\)/\1remember=$var_password_pam_unix_remember/" $pamFile - else - sed -i --follow-symlinks "/^password[[:space:]]\+sufficient[[:space:]]\+pam_unix.so/ s/$/ remember=$var_password_pam_unix_remember/" $pamFile - fi -done diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh deleted file mode 100755 index 914fff33156..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh +++ /dev/null @@ -1,25 +0,0 @@ -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - -AUTH_FILES=("/etc/pam.d/system-auth" "/etc/pam.d/password-auth") - -for pam_file in "${AUTH_FILES[@]}" -do - # is auth required pam_faillock.so preauth present? - if ! grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*$' "$pam_file" ; then - sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/i auth required pam_faillock.so preauth silent' "$pam_file" - fi - - # is auth default pam_faillock.so authfail present? - if ! grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*$' "$pam_file" ; then - sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/a auth [success=ok new_authtok_reqd=ok ignore=ignore default=bad] pam_faillock.so authfail' "$pam_file" - fi - - if ! grep -qE '^\s*account\s+required\s+pam_faillock\.so.*$' "$pam_file" ; then - sed -E -i --follow-symlinks '/^\s*account\s*required\s*pam_unix.so/i account required pam_faillock.so' "$pam_file" - fi -done - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh deleted file mode 100755 index 64b35a0da96..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - -var_accounts_passwords_pam_faillock_deny='3' - - -if [ -f /usr/sbin/authconfig ]; then - authconfig --enablefaillock --update -elif [ -f /usr/bin/authselect ]; then - if authselect check; then - authselect enable-feature with-faillock - authselect apply-changes - else - echo " -authselect integrity check failed. Remediation aborted! -This remediation could not be applied because the authselect profile is not intact. -It is not recommended to manually edit the PAM files when authselect is available -In cases where the default authselect profile does not cover a specific demand, a custom authselect profile is recommended." - false - fi -fi - -FAILLOCK_CONF="/etc/security/faillock.conf" -if [ -f $FAILLOCK_CONF ]; then - if $(grep -q '^\s*deny\s*=' $FAILLOCK_CONF); then - sed -i --follow-symlinks "s/^\s*\(deny\s*\)=.*$/\1 = $var_accounts_passwords_pam_faillock_deny/g" $FAILLOCK_CONF - else - echo "deny = $var_accounts_passwords_pam_faillock_deny" >> $FAILLOCK_CONF - fi -else - AUTH_FILES=("/etc/pam.d/system-auth" "/etc/pam.d/password-auth") - -for pam_file in "${AUTH_FILES[@]}" -do - # is auth required pam_faillock.so preauth present? - if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*$' "$pam_file" ; then - # is the option set? - if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*'"deny"'=([0-9]*).*$' "$pam_file" ; then - # just change the value of option to a correct value - sed -i --follow-symlinks 's/\(^auth.*required.*pam_faillock.so.*preauth.*silent.*\)\('"deny"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_deny"'/' "$pam_file" - # the option is not set. - else - # append the option - sed -i --follow-symlinks '/^auth.*required.*pam_faillock.so.*preauth.*silent.*/ s/$/ '"deny"'='"$var_accounts_passwords_pam_faillock_deny"'/' "$pam_file" - fi - # auth required pam_faillock.so preauth is not present, insert the whole line - else - sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/i auth required pam_faillock.so preauth silent '"deny"'='"$var_accounts_passwords_pam_faillock_deny" "$pam_file" - fi - # is auth default pam_faillock.so authfail present? - if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*$' "$pam_file" ; then - # is the option set? - if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*'"deny"'=([0-9]*).*$' "$pam_file" ; then - # just change the value of option to a correct value - sed -i --follow-symlinks 's/\(^auth.*[default=die].*pam_faillock.so.*authfail.*\)\('"deny"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_deny"'/' "$pam_file" - # the option is not set. - else - # append the option - sed -i --follow-symlinks '/^auth.*[default=die].*pam_faillock.so.*authfail.*/ s/$/ '"deny"'='"$var_accounts_passwords_pam_faillock_deny"'/' "$pam_file" - fi - # auth default pam_faillock.so authfail is not present, insert the whole line - else - sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/a auth [default=die] pam_faillock.so authfail '"deny"'='"$var_accounts_passwords_pam_faillock_deny" "$pam_file" - fi - if ! grep -qE '^\s*account\s+required\s+pam_faillock\.so.*$' "$pam_file" ; then - sed -E -i --follow-symlinks '/^\s*account\s*required\s*pam_unix.so/i account required pam_faillock.so' "$pam_file" - fi -done -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh deleted file mode 100755 index 374c546fb06..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - -if [ -f /usr/sbin/authconfig ]; then - authconfig --enablefaillock --update -elif [ -f /usr/bin/authselect ]; then - if authselect check; then - authselect enable-feature with-faillock - authselect apply-changes - else - echo " -authselect integrity check failed. Remediation aborted! -This remediation could not be applied because the authselect profile is not intact. -It is not recommended to manually edit the PAM files when authselect is available -In cases where the default authselect profile does not cover a specific demand, a custom authselect profile is recommended." - false - fi -fi - -FAILLOCK_CONF="/etc/security/faillock.conf" -if [ -f $FAILLOCK_CONF ]; then - if [ ! $(grep -q '^\s*even_deny_root' $FAILLOCK_CONF) ]; then - echo "even_deny_root" >> $FAILLOCK_CONF - fi -else - SYSTEM_AUTH="/etc/pam.d/system-auth" - PASSWORD_AUTH="/etc/pam.d/password-auth" - for file in $SYSTEM_AUTH $PASSWORD_AUTH; do - if ! grep -q "^auth.*pam_faillock.so \(preauth silent\|authfail\).*even_deny_root" $file; then - sed -i --follow-symlinks 's/\(pam_faillock.so \(preauth silent\|authfail\).*\)$/\1 even_deny_root/g' $file - fi - done -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh deleted file mode 100755 index 12eeb916ca9..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - -var_accounts_passwords_pam_faillock_fail_interval='900' - - -if [ -f /usr/sbin/authconfig ]; then - authconfig --enablefaillock --update -elif [ -f /usr/bin/authselect ]; then - if authselect check; then - authselect enable-feature with-faillock - authselect apply-changes - else - echo " -authselect integrity check failed. Remediation aborted! -This remediation could not be applied because the authselect profile is not intact. -It is not recommended to manually edit the PAM files when authselect is available -In cases where the default authselect profile does not cover a specific demand, a custom authselect profile is recommended." - false - fi -fi - -FAILLOCK_CONF="/etc/security/faillock.conf" -if [ -f $FAILLOCK_CONF ]; then - if $(grep -q '^\s*fail_interval\s*=' $FAILLOCK_CONF); then - sed -i --follow-symlinks "s/^\s*\(fail_interval\s*\)=.*$/\1 = $var_accounts_passwords_pam_faillock_fail_interval/g" $FAILLOCK_CONF - else - echo "fail_interval = $var_accounts_passwords_pam_faillock_fail_interval" >> $FAILLOCK_CONF - fi -else - AUTH_FILES=("/etc/pam.d/system-auth" "/etc/pam.d/password-auth") - -for pam_file in "${AUTH_FILES[@]}" -do - # is auth required pam_faillock.so preauth present? - if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*$' "$pam_file" ; then - # is the option set? - if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*'"fail_interval"'=([0-9]*).*$' "$pam_file" ; then - # just change the value of option to a correct value - sed -i --follow-symlinks 's/\(^auth.*required.*pam_faillock.so.*preauth.*silent.*\)\('"fail_interval"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_fail_interval"'/' "$pam_file" - # the option is not set. - else - # append the option - sed -i --follow-symlinks '/^auth.*required.*pam_faillock.so.*preauth.*silent.*/ s/$/ '"fail_interval"'='"$var_accounts_passwords_pam_faillock_fail_interval"'/' "$pam_file" - fi - # auth required pam_faillock.so preauth is not present, insert the whole line - else - sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/i auth required pam_faillock.so preauth silent '"fail_interval"'='"$var_accounts_passwords_pam_faillock_fail_interval" "$pam_file" - fi - # is auth default pam_faillock.so authfail present? - if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*$' "$pam_file" ; then - # is the option set? - if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*'"fail_interval"'=([0-9]*).*$' "$pam_file" ; then - # just change the value of option to a correct value - sed -i --follow-symlinks 's/\(^auth.*[default=die].*pam_faillock.so.*authfail.*\)\('"fail_interval"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_fail_interval"'/' "$pam_file" - # the option is not set. - else - # append the option - sed -i --follow-symlinks '/^auth.*[default=die].*pam_faillock.so.*authfail.*/ s/$/ '"fail_interval"'='"$var_accounts_passwords_pam_faillock_fail_interval"'/' "$pam_file" - fi - # auth default pam_faillock.so authfail is not present, insert the whole line - else - sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/a auth [default=die] pam_faillock.so authfail '"fail_interval"'='"$var_accounts_passwords_pam_faillock_fail_interval" "$pam_file" - fi - if ! grep -qE '^\s*account\s+required\s+pam_faillock\.so.*$' "$pam_file" ; then - sed -E -i --follow-symlinks '/^\s*account\s*required\s*pam_unix.so/i account required pam_faillock.so' "$pam_file" - fi -done -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh deleted file mode 100755 index e373b26c49d..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - -var_accounts_passwords_pam_faillock_unlock_time='0' - - -if [ -f /usr/sbin/authconfig ]; then - authconfig --enablefaillock --update -elif [ -f /usr/bin/authselect ]; then - if authselect check; then - authselect enable-feature with-faillock - authselect apply-changes - else - echo " -authselect integrity check failed. Remediation aborted! -This remediation could not be applied because the authselect profile is not intact. -It is not recommended to manually edit the PAM files when authselect is available -In cases where the default authselect profile does not cover a specific demand, a custom authselect profile is recommended." - false - fi -fi - -FAILLOCK_CONF="/etc/security/faillock.conf" -if [ -f $FAILLOCK_CONF ]; then - if $(grep -q '^\s*unlock_time\s*=' $FAILLOCK_CONF); then - sed -i --follow-symlinks "s/^\s*\(unlock_time\s*\)=.*$/\1 = $var_accounts_passwords_pam_faillock_unlock_time/g" $FAILLOCK_CONF - else - echo "unlock_time = $var_accounts_passwords_pam_faillock_unlock_time" >> $FAILLOCK_CONF - fi -else - AUTH_FILES=("/etc/pam.d/system-auth" "/etc/pam.d/password-auth") - -for pam_file in "${AUTH_FILES[@]}" -do - # is auth required pam_faillock.so preauth present? - if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*$' "$pam_file" ; then - # is the option set? - if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*'"unlock_time"'=([0-9]*).*$' "$pam_file" ; then - # just change the value of option to a correct value - sed -i --follow-symlinks 's/\(^auth.*required.*pam_faillock.so.*preauth.*silent.*\)\('"unlock_time"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_unlock_time"'/' "$pam_file" - # the option is not set. - else - # append the option - sed -i --follow-symlinks '/^auth.*required.*pam_faillock.so.*preauth.*silent.*/ s/$/ '"unlock_time"'='"$var_accounts_passwords_pam_faillock_unlock_time"'/' "$pam_file" - fi - # auth required pam_faillock.so preauth is not present, insert the whole line - else - sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/i auth required pam_faillock.so preauth silent '"unlock_time"'='"$var_accounts_passwords_pam_faillock_unlock_time" "$pam_file" - fi - # is auth default pam_faillock.so authfail present? - if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*$' "$pam_file" ; then - # is the option set? - if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*'"unlock_time"'=([0-9]*).*$' "$pam_file" ; then - # just change the value of option to a correct value - sed -i --follow-symlinks 's/\(^auth.*[default=die].*pam_faillock.so.*authfail.*\)\('"unlock_time"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_unlock_time"'/' "$pam_file" - # the option is not set. - else - # append the option - sed -i --follow-symlinks '/^auth.*[default=die].*pam_faillock.so.*authfail.*/ s/$/ '"unlock_time"'='"$var_accounts_passwords_pam_faillock_unlock_time"'/' "$pam_file" - fi - # auth default pam_faillock.so authfail is not present, insert the whole line - else - sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/a auth [default=die] pam_faillock.so authfail '"unlock_time"'='"$var_accounts_passwords_pam_faillock_unlock_time" "$pam_file" - fi - if ! grep -qE '^\s*account\s+required\s+pam_faillock\.so.*$' "$pam_file" ; then - sed -E -i --follow-symlinks '/^\s*account\s*required\s*pam_unix.so/i account required pam_faillock.so' "$pam_file" - fi -done -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh deleted file mode 100755 index c1ed6b04660..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc'") - - -var_accounts_user_umask="077" - - - -grep -q umask /etc/bashrc && \ - sed -i "s/umask.*/umask $var_accounts_user_umask/g" /etc/bashrc -if ! [ $? -eq 0 ]; then - echo "umask $var_accounts_user_umask" >> /etc/bashrc -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh deleted file mode 100755 index 3c5083cf84b..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc'") - -var_accounts_user_umask='077' - -grep -q umask /etc/csh.cshrc && \ - sed -i "s/umask.*/umask $var_accounts_user_umask/g" /etc/csh.cshrc -if ! [ $? -eq 0 ]; then - echo "umask $var_accounts_user_umask" >> /etc/csh.cshrc -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh deleted file mode 100755 index ea460bd249f..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q shadow-utils; then - - -var_accounts_user_umask="077" -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/login.defs' '^UMASK' "$var_accounts_user_umask" 'CCE-82888-9' '%s %s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh deleted file mode 100755 index 2b0f4e8c501..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile'") - -var_accounts_user_umask='077' - -grep -q umask /etc/profile && \ - sed -i "s/umask.*/umask $var_accounts_user_umask/g" /etc/profile -if ! [ $? -eq 0 ]; then - echo "umask $var_accounts_user_umask" >> /etc/profile -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh deleted file mode 100755 index cac66fc1767..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_banner_etc_issue'") - -login_banner_text="(^You[\s\n]+are[\s\n]+accessing[\s\n]+a[\s\n]+U.S.[\s\n]+Government[\s\n]+\(USG\)[\s\n]+Information[\s\n]+System[\s\n]+\(IS\)[\s\n]+that[\s\n]+is[\s\n]+provided[\s\n]+for[\s\n]+USG-authorized[\s\n]+use[\s\n]+only.[\s\n]*By[\s\n]+using[\s\n]+this[\s\n]+IS[\s\n]+\(which[\s\n]+includes[\s\n]+any[\s\n]+device[\s\n]+attached[\s\n]+to[\s\n]+this[\s\n]+IS\),[\s\n]+you[\s\n]+consent[\s\n]+to[\s\n]+the[\s\n]+following[\s\n]+conditions\:(\\n)*(\n)*-[\s\n]*The[\s\n]+USG[\s\n]+routinely[\s\n]+intercepts[\s\n]+and[\s\n]+monitors[\s\n]+communications[\s\n]+on[\s\n]+this[\s\n]+IS[\s\n]+for[\s\n]+purposes[\s\n]+including,[\s\n]+but[\s\n]+not[\s\n]+limited[\s\n]+to,[\s\n]+penetration[\s\n]+testing,[\s\n]+COMSEC[\s\n]+monitoring,[\s\n]+network[\s\n]+operations[\s\n]+and[\s\n]+defense,[\s\n]+personnel[\s\n]+misconduct[\s\n]+\(PM\),[\s\n]+law[\s\n]+enforcement[\s\n]+\(LE\),[\s\n]+and[\s\n]+counterintelligence[\s\n]+\(CI\)[\s\n]+investigations.(\\n)*(\n)*-[\s\n]*At[\s\n]+any[\s\n]+time,[\s\n]+the[\s\n]+USG[\s\n]+may[\s\n]+inspect[\s\n]+and[\s\n]+seize[\s\n]+data[\s\n]+stored[\s\n]+on[\s\n]+this[\s\n]+IS.(\\n)*(\n)*-[\s\n]*Communications[\s\n]+using,[\s\n]+or[\s\n]+data[\s\n]+stored[\s\n]+on,[\s\n]+this[\s\n]+IS[\s\n]+are[\s\n]+not[\s\n]+private,[\s\n]+are[\s\n]+subject[\s\n]+to[\s\n]+routine[\s\n]+monitoring,[\s\n]+interception,[\s\n]+and[\s\n]+search,[\s\n]+and[\s\n]+may[\s\n]+be[\s\n]+disclosed[\s\n]+or[\s\n]+used[\s\n]+for[\s\n]+any[\s\n]+USG-authorized[\s\n]+purpose.(\\n)*(\n)*-[\s\n]*This[\s\n]+IS[\s\n]+includes[\s\n]+security[\s\n]+measures[\s\n]+\(e.g.,[\s\n]+authentication[\s\n]+and[\s\n]+access[\s\n]+controls\)[\s\n]+to[\s\n]+protect[\s\n]+USG[\s\n]+interests--not[\s\n]+for[\s\n]+your[\s\n]+personal[\s\n]+benefit[\s\n]+or[\s\n]+privacy.(\\n)*(\n)*-[\s\n]*Notwithstanding[\s\n]+the[\s\n]+above,[\s\n]+using[\s\n]+this[\s\n]+IS[\s\n]+does[\s\n]+not[\s\n]+constitute[\s\n]+consent[\s\n]+to[\s\n]+PM,[\s\n]+LE[\s\n]+or[\s\n]+CI[\s\n]+investigative[\s\n]+searching[\s\n]+or[\s\n]+monitoring[\s\n]+of[\s\n]+the[\s\n]+content[\s\n]+of[\s\n]+privileged[\s\n]+communications,[\s\n]+or[\s\n]+work[\s\n]+product,[\s\n]+related[\s\n]+to[\s\n]+personal[\s\n]+representation[\s\n]+or[\s\n]+services[\s\n]+by[\s\n]+attorneys,[\s\n]+psychotherapists,[\s\n]+or[\s\n]+clergy,[\s\n]+and[\s\n]+their[\s\n]+assistants.[\s\n]+Such[\s\n]+communications[\s\n]+and[\s\n]+work[\s\n]+product[\s\n]+are[\s\n]+private[\s\n]+and[\s\n]+confidential.[\s\n]+See[\s\n]+User[\s\n]+Agreement[\s\n]+for[\s\n]+details.$|^I\'ve[\s\n]+read[\s\n]+\&[\s\n]+consent[\s\n]+to[\s\n]+terms[\s\n]+in[\s\n]+IS[\s\n]+user[\s\n]+agreem\'t$)" - -# There was a regular-expression matching various banners, needs to be expanded -expanded=$(echo "$login_banner_text" | sed 's/(\\\\\x27)\*/\\\x27/g;s/(\\\x27)\*//g;s/(\^\(.*\)\$|.*$/\1/g;s/\[\\s\\n\][+*]/ /g;s/\\//g;s/[^-]- /\n\n-/g;s/(n)\**//g') -formatted=$(echo "$expanded" | fold -sw 80) - -cat </etc/issue -$formatted -EOF - -printf "\n" >> /etc/issue diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh deleted file mode 100755 index ffc9df011c8..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_configure_crypto_policy'") - - -# include remediation functions library - -var_system_crypto_policy="FIPS" - - - -stderr_of_call=$(update-crypto-policies --set ${var_system_crypto_policy} 2>&1 > /dev/null) -rc=$? - -if test "$rc" = 127; then - echo "$stderr_of_call" >&2 - echo "Make sure that the script is installed on the remediated system." >&2 - echo "See output of the 'dnf provides update-crypto-policies' command" >&2 - echo "to see what package to (re)install" >&2 - - false # end with an error code -elif test "$rc" != 0; then - echo "Error invoking the update-crypto-policies script: $stderr_of_call" >&2 - false # end with an error code -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh deleted file mode 100755 index ae51972a936..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy'") - -rm -f /etc/krb5.conf.d/crypto-policies -ln -s /etc/crypto-policies/back-ends/krb5.config /etc/krb5.conf.d/crypto-policies diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh deleted file mode 100755 index 4836e373bae..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy'") - -OPENSSL_CRYPTO_POLICY_SECTION='[ crypto_policy ]' -OPENSSL_CRYPTO_POLICY_SECTION_REGEX='\[\s*crypto_policy\s*\]' -OPENSSL_CRYPTO_POLICY_INCLUSION='.include /etc/crypto-policies/back-ends/opensslcnf.config' -OPENSSL_CRYPTO_POLICY_INCLUSION_REGEX='^\s*\.include\s*/etc/crypto-policies/back-ends/opensslcnf.config$' - -function remediate_openssl_crypto_policy() { - CONFIG_FILE="/etc/pki/tls/openssl.cnf" - if test -f "$CONFIG_FILE"; then - if ! grep -q "^\\s*$OPENSSL_CRYPTO_POLICY_SECTION_REGEX" "$CONFIG_FILE"; then - printf '\n%s\n\n%s' "$OPENSSL_CRYPTO_POLICY_SECTION" "$OPENSSL_CRYPTO_POLICY_INCLUSION" >> "$CONFIG_FILE" - return 0 - elif ! grep -q "$OPENSSL_CRYPTO_POLICY_INCLUSION_REGEX" "$CONFIG_FILE"; then - sed -i "s|$OPENSSL_CRYPTO_POLICY_SECTION_REGEX|&\\n\\n$OPENSSL_CRYPTO_POLICY_INCLUSION\\n|" "$CONFIG_FILE" - return 0 - fi - else - echo "Aborting remediation as '$CONFIG_FILE' was not even found." >&2 - return 1 - fi -} - -remediate_openssl_crypto_policy diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh deleted file mode 100755 index e5359044ac7..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend'") - -if [ -e "/etc/usbguard/usbguard-daemon.conf" ] ; then - - LC_ALL=C sed -i "/^\s*AuditBackend=/d" "/etc/usbguard/usbguard-daemon.conf" -else - touch "/etc/usbguard/usbguard-daemon.conf" -fi -cp "/etc/usbguard/usbguard-daemon.conf" "/etc/usbguard/usbguard-daemon.conf.bak" -# Insert at the end of the file -printf '%s\n' "AuditBackend=LinuxAudit" >> "/etc/usbguard/usbguard-daemon.conf" -# Clean up after ourselves. -rm "/etc/usbguard/usbguard-daemon.conf.bak" - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh deleted file mode 100755 index 87e5bdc325b..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_coredump_disable_backtraces'") - -if [ -e "/etc/systemd/coredump.conf" ] ; then - - LC_ALL=C sed -i "/^\s*ProcessSizeMax\s*=\s*/Id" "/etc/systemd/coredump.conf" -else - touch "/etc/systemd/coredump.conf" -fi -cp "/etc/systemd/coredump.conf" "/etc/systemd/coredump.conf.bak" -# Insert at the end of the file -printf '%s\n' "ProcessSizeMax=0" >> "/etc/systemd/coredump.conf" -# Clean up after ourselves. -rm "/etc/systemd/coredump.conf.bak" - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh deleted file mode 100755 index f0af8c7d1dd..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_coredump_disable_storage'") - -if [ -e "/etc/systemd/coredump.conf" ] ; then - - LC_ALL=C sed -i "/^\s*Storage\s*=\s*/Id" "/etc/systemd/coredump.conf" -else - touch "/etc/systemd/coredump.conf" -fi -cp "/etc/systemd/coredump.conf" "/etc/systemd/coredump.conf.bak" -# Insert at the end of the file -printf '%s\n' "Storage=none" >> "/etc/systemd/coredump.conf" -# Clean up after ourselves. -rm "/etc/systemd/coredump.conf.bak" - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh deleted file mode 100755 index 63c48fb3623..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q systemd; then - -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/systemd/system.conf' '^CtrlAltDelBurstAction=' 'none' 'CCE-80784-2' '%s=%s' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh deleted file mode 100755 index a5d2240323e..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_disable_users_coredumps'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - -SECURITY_LIMITS_FILE="/etc/security/limits.conf" - -if grep -qE '\*\s+hard\s+core' $SECURITY_LIMITS_FILE; then - sed -ri 's/(hard\s+core\s+)[[:digit:]]+/\1 0/' $SECURITY_LIMITS_FILE -else - echo "* hard core 0" >> $SECURITY_LIMITS_FILE -fi - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh deleted file mode 100755 index cb7a7652c5a..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_display_login_attempts'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q pam; then - -function ensure_pam_module_options { - if [ $# -lt 7 ] || [ $# -gt 8 ] ; then - echo "$0 requires seven or eight arguments" >&2 - exit 1 - fi - local _pamFile="$1" _type="$2" _control="$3" _module="$4" _option="$5" _valueRegex="$6" _defaultValue="$7" - local _remove_argument="" - if [ $# -eq 8 ] ; then - _remove_argument="$8" - # convert it to lowercase - _remove_argument=${_remove_argument,,} - fi - - # make sure that we have a line like this in ${_pamFile} (additional options are left as-is): - # ${_type} ${_control} ${_module} ${_option}=${_valueRegex} - - if ! [ -e "$_pamFile" ] ; then - echo "$_pamFile doesn't exist" >&2 - exit 1 - fi - - # if remove argument only - if [ "${_remove_argument}" = "yes" -o "${_remove_argument}" = "true" ] ; then - sed --follow-symlinks -i -E -e "s/^(\\s*${_type}\\s+\\S+\\s+${_module}(\\s.+)?)\\s${_option}(=\\S+)?/\\1/" "${_pamFile}" - exit 0 - fi - - # non-empty values need to be preceded by an equals sign - [ -n "${_valueRegex}" ] && _valueRegex="=${_valueRegex}" - # add an equals sign to non-empty values - [ -n "${_defaultValue}" ] && _defaultValue="=${_defaultValue}" - - # fix 'type' if it's wrong - if grep -q -P "^\\s*(?"'!'"${_type}\\s)[[:alnum:]]+\\s+[[:alnum:]]+\\s+${_module}" < "${_pamFile}" ; then - sed --follow-symlinks -i -E -e "s/^(\\s*)[[:alnum:]]+(\\s+[[:alnum:]]+\\s+${_module})/\\1${_type}\\2/" "${_pamFile}" - fi - - # fix 'control' if it's wrong - if grep -q -P "^\\s*${_type}\\s+(?"'!'"${_control})[[:alnum:]]+\\s+${_module}" < "${_pamFile}" ; then - sed --follow-symlinks -i -E -e "s/^(\\s*${_type}\\s+)[[:alnum:]]+(\\s+${_module})/\\1${_control}\\2/" "${_pamFile}" - fi - - # fix the value for 'option' if one exists but does not match '_valueRegex' - if grep -q -P "^\\s*${_type}\\s+${_control}\\s+${_module}(\\s.+)?\\s+${_option}(?"'!'"${_valueRegex}(\\s|\$))" < "${_pamFile}" ; then - sed --follow-symlinks -i -E -e "s/^(\\s*${_type}\\s+${_control}\\s+${_module}(\\s.+)?\\s)${_option}=[^[:space:]]*/\\1${_option}${_defaultValue}/" "${_pamFile}" - - # add 'option=default' if option is not set - elif grep -q -E "^\\s*${_type}\\s+${_control}\\s+${_module}" < "${_pamFile}" && - grep -E "^\\s*${_type}\\s+${_control}\\s+${_module}" < "${_pamFile}" | grep -q -E -v "\\s${_option}(=|\\s|\$)" ; then - - sed --follow-symlinks -i -E -e "s/^(\\s*${_type}\\s+${_control}\\s+${_module}[^\\n]*)/\\1 ${_option}${_defaultValue}/" "${_pamFile}" - # add a new entry if none exists - elif ! grep -q -P "^\\s*${_type}\\s+${_control}\\s+${_module}(\\s.+)?\\s+${_option}${_valueRegex}(\\s|\$)" < "${_pamFile}" ; then - echo "${_type} ${_control} ${_module} ${_option}${_defaultValue}" >> "${_pamFile}" - fi -} -ensure_pam_module_options '/etc/pam.d/postlogin' 'session' 'required' 'pam_lastlog.so' 'showfailed' "" "" - -# remove 'silent' option -sed -i --follow-symlinks -E -e 's/^([^#]+pam_lastlog\.so[^#]*)\ssilent/\1/' '/etc/pam.d/postlogin' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh deleted file mode 100755 index 83cae433b4e..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages'") - -# Remediation is applicable only in certain platforms -if rpm --quiet -q yum; then - -# Function to replace configuration setting in config file or add the configuration setting if -# it does not exist. -# -# Expects arguments: -# -# config_file: Configuration file that will be modified -# key: Configuration option to change -# value: Value of the configuration option to change -# cce: The CCE identifier or '@CCENUM@' if no CCE identifier exists -# format: The printf-like format string that will be given stripped key and value as arguments, -# so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =) -# -# Optional arugments: -# -# format: Optional argument to specify the format of how key/value should be -# modified/appended in the configuration file. The default is key = value. -# -# Example Call(s): -# -# With default format of 'key = value': -# replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@' -# -# With custom key/value format: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s' -# -# With a variable: -# replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s' -# -function replace_or_append { - local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option='' - local config_file=$1 - local key=$2 - local value=$3 - local cce=$4 - local format=$5 - - if [ "$case_insensitive_mode" = yes ]; then - sed_case_insensitive_option="i" - grep_case_insensitive_option="-i" - fi - [ -n "$format" ] || format="$default_format" - # Check sanity of the input - [ $# -ge "3" ] || { echo "Usage: replace_or_append [] [printf-like format, default is '$default_format']" >&2; exit 1; } - - # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed. - # Otherwise, regular sed command will do. - sed_command=('sed' '-i') - if test -L "$config_file"; then - sed_command+=('--follow-symlinks') - fi - - # Test that the cce arg is not empty or does not equal @CCENUM@. - # If @CCENUM@ exists, it means that there is no CCE assigned. - if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then - cce="${cce}" - else - cce="CCE" - fi - - # Strip any search characters in the key arg so that the key can be replaced without - # adding any search characters to the config file. - stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key") - - # shellcheck disable=SC2059 - printf -v formatted_output "$format" "$stripped_key" "$value" - - # If the key exists, change it. Otherwise, add it to the config_file. - # We search for the key string followed by a word boundary (matched by \>), - # so if we search for 'setting', 'setting2' won't match. - if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then - "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file" - else - # \n is precaution for case where file ends without trailing newline - printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file" - printf '%s\n' "$formatted_output" >> "$config_file" - fi -} -replace_or_append '/etc/yum.conf' '^localpkg_gpgcheck' '1' 'CCE-80791-7' - -else - >&2 echo 'Remediation is not applicable, nothing was done' -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh deleted file mode 100755 index 987dd0e7063..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages'") - - - -chgrp 0 /var/log/messages - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh deleted file mode 100755 index 6542b2e74a2..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs'") - - -for SYSCMDFILES in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin -do - find -L $SYSCMDFILES \! -group root -type f -exec chgrp root '{}' \; -done - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh deleted file mode 100755 index e579359e520..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_file_owner_var_log_messages'") - - - -chown 0 /var/log/messages - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh deleted file mode 100755 index ac7a70a4c12..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh +++ /dev/null @@ -1,3 +0,0 @@ -touch /etc/modprobe.d/blacklist.conf -echo "install atm /bin/true" >> /etc/modprobe.d/blacklist.conf -echo "blacklist atm" >> /etc/modprobe.d/blacklist.conf diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh deleted file mode 100755 index 71b0848f11c..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh +++ /dev/null @@ -1,2 +0,0 @@ -echo "install can /bin/true" >> /etc/modprobe.d/blacklist.conf -echo "blacklist can" >> /etc/modprobe.d/blacklist.conf diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh deleted file mode 100755 index 49745c5a50d..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh +++ /dev/null @@ -1,2 +0,0 @@ -echo "install cramfs /bin/true" >> /etc/modprobe.d/blacklist.conf -echo "blacklist cramfs" >> /etc/modprobe.d/blacklist.conf diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh deleted file mode 100755 index 7347678924b..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh +++ /dev/null @@ -1,2 +0,0 @@ -echo "install firewire-core /bin/true" >> /etc/modprobe.d/blacklist.conf -echo "blacklist firewire-core" >> /etc/modprobe.d/blacklist.conf diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh deleted file mode 100755 index 14e72551b88..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh +++ /dev/null @@ -1,2 +0,0 @@ -echo "install sctp /bin/true" >> /etc/modprobe.d/blacklist.conf -echo "blacklist sctp" >> /etc/modprobe.d/blacklist.conf diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh deleted file mode 100755 index e5bac79988a..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh +++ /dev/null @@ -1,2 +0,0 @@ -echo "install tipc /bin/true" >> /etc/modprobe.d/blacklist.conf -echo "blacklist tipc" >> /etc/modprobe.d/blacklist.conf diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh deleted file mode 100755 index 37bbac9c375..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_no_empty_passwords'") -sed --follow-symlinks -i 's/\//g' /etc/pam.d/system-auth -sed --follow-symlinks -i 's/\//g' /etc/pam.d/password-auth diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh deleted file mode 100755 index 7122b9855f4..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy'") - -cat > /etc/profile.d/openssl-rand.sh <<- 'EOM' -# provide a default -rand /dev/random option to openssl commands that -# support it - -# written inefficiently for maximum shell compatibility -openssl() -( - openssl_bin=/usr/bin/openssl - - case "$*" in - # if user specified -rand, honor it - *\ -rand\ *|*\ -help*) exec $openssl_bin "$@" ;; - esac - - cmds=`$openssl_bin list -digest-commands -cipher-commands | tr '\n' ' '` - for i in `$openssl_bin list -commands`; do - if $openssl_bin list -options "$i" | grep -q '^rand '; then - cmds=" $i $cmds" - fi - done - - case "$cmds" in - *\ "$1"\ *) - cmd="$1"; shift - exec $openssl_bin "$cmd" -rand /dev/random "$@" ;; - esac - - exec $openssl_bin "$@" -) -EOM diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh deleted file mode 100755 index ed77897d4ff..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_crypto-policies_installed'") - -if ! rpm -q --quiet "crypto-policies" ; then - dnf install -y "crypto-policies" -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh deleted file mode 100755 index 8ac78de0f9e..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_iptables_installed'") - -if ! rpm -q --quiet "iptables" ; then - dnf install -y "iptables" -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh deleted file mode 100755 index e3e6e90c173..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_rng-tools_installed'") - - -if ! rpm -q --quiet "rng-tools" ; then - yum install -y "rng-tools" -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh deleted file mode 100755 index 6b216782441..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_sudo_installed'") - -if ! rpm -q --quiet "sudo" ; then - dnf install -y "sudo" -fi diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh deleted file mode 100755 index dcc8b170c93..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_usbguard_installed'") - - -if ! rpm -q --quiet "usbguard" ; then - yum install -y "usbguard" -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh deleted file mode 100755 index 07c1fd8950a..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_sudo_require_reauthentication'") - - - -var_sudo_timestamp_timeout="0" - - - -if /usr/sbin/visudo -qcf /etc/sudoers; then - cp /etc/sudoers /etc/sudoers.bak - if ! grep -P '^[\s]*Defaults.*\btimestamp_timeout=[-]?\w+\b\b.*$' /etc/sudoers; then - # sudoers file doesn't define Option timestamp_timeout - echo "Defaults timestamp_timeout=${var_sudo_timestamp_timeout}" >> /etc/sudoers - else - # sudoers file defines Option timestamp_timeout, remediate if appropriate value is not set - if ! grep -P "^[\s]*Defaults.*\btimestamp_timeout=${var_sudo_timestamp_timeout}\b.*$" /etc/sudoers; then - - sed -Ei "s/(^[\s]*Defaults.*\btimestamp_timeout=)[-]?\w+(\b.*$)/\1${var_sudo_timestamp_timeout}\2/" /etc/sudoers - fi - fi - - # Check validity of sudoers and cleanup bak - if /usr/sbin/visudo -qcf /etc/sudoers; then - rm -f /etc/sudoers.bak - else - echo "Fail to validate remediated /etc/sudoers, reverting to original file." - mv /etc/sudoers.bak /etc/sudoers - false - fi -else - echo "Skipping remediation, /etc/sudoers failed to validate" - false -fi - diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh deleted file mode 100755 index 721dbd4c157..00000000000 --- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -set -e - -(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_sudoers_validate_passwd'") - - -if [ -e "/etc/sudoers" ] ; then - - LC_ALL=C sed -i "/Defaults !targetpw/d" "/etc/sudoers" -else - touch "/etc/sudoers" -fi -cp "/etc/sudoers" "/etc/sudoers.bak" -# Insert at the end of the file -printf '%s\n' "Defaults !targetpw" >> "/etc/sudoers" -# Clean up after ourselves. -rm "/etc/sudoers.bak" -if [ -e "/etc/sudoers" ] ; then - - LC_ALL=C sed -i "/Defaults !rootpw/d" "/etc/sudoers" -else - touch "/etc/sudoers" -fi -cp "/etc/sudoers" "/etc/sudoers.bak" -# Insert at the end of the file -printf '%s\n' "Defaults !rootpw" >> "/etc/sudoers" -# Clean up after ourselves. -rm "/etc/sudoers.bak" -if [ -e "/etc/sudoers" ] ; then - - LC_ALL=C sed -i "/Defaults !runaspw/d" "/etc/sudoers" -else - touch "/etc/sudoers" -fi -cp "/etc/sudoers" "/etc/sudoers.bak" -# Insert at the end of the file -printf '%s\n' "Defaults !runaspw" >> "/etc/sudoers" -# Clean up after ourselves. -rm "/etc/sudoers.bak" - diff --git a/package.json b/package.json index 37d92af280a..bb23d7072d8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "An open-source app for building smarter, more agile teams.", "author": "Parabol Inc. (http://github.com/ParabolInc)", "license": "AGPL-3.0", - "version": "7.27.0", + "version": "7.27.2", "repository": { "type": "git", "url": "https://github.com/ParabolInc/parabol" @@ -78,7 +78,7 @@ "devDependencies": { "@babel/core": "^7.20.12", "@babel/preset-env": "7.18.6", - "@datadog/datadog-ci": "^2.22.1", + "@datadog/datadog-ci": "^2.33.0", "@graphql-codegen/add": "^5.0.0", "@graphql-codegen/cli": "^5.0.0", "@graphql-codegen/typescript": "^4.0.1", diff --git a/packages/chronos/package.json b/packages/chronos/package.json index 436bf0a45d2..f87e1ea864e 100644 --- a/packages/chronos/package.json +++ b/packages/chronos/package.json @@ -1,6 +1,6 @@ { "name": "chronos", - "version": "7.27.0", + "version": "7.27.2", "description": "A cron job scheduler", "author": "Matt Krick ", "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme", @@ -25,6 +25,6 @@ }, "dependencies": { "cron": "^2.3.1", - "parabol-server": "7.27.0" + "parabol-server": "7.27.2" } } diff --git a/packages/client/components/ActionMeeting.tsx b/packages/client/components/ActionMeeting.tsx index 35452b1556c..9ec5ad872ca 100644 --- a/packages/client/components/ActionMeeting.tsx +++ b/packages/client/components/ActionMeeting.tsx @@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro' import React, {ReactElement, Suspense, useEffect} from 'react' import {useFragment} from 'react-relay' import {ActionMeeting_meeting$key} from '~/__generated__/ActionMeeting_meeting.graphql' +import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql' import useMeeting from '../hooks/useMeeting' import NewMeetingAvatarGroup from '../modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup' import lazyPreload, {LazyExoticPreload} from '../utils/lazyPreload' -import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql' import ActionMeetingSidebar from './ActionMeetingSidebar' import MeetingArea from './MeetingArea' import MeetingControlBar from './MeetingControlBar' diff --git a/packages/client/components/ActionMeetingAgendaItems.tsx b/packages/client/components/ActionMeetingAgendaItems.tsx index 36c16750fd3..0650fd1c732 100644 --- a/packages/client/components/ActionMeetingAgendaItems.tsx +++ b/packages/client/components/ActionMeetingAgendaItems.tsx @@ -2,8 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useRef} from 'react' import {useFragment} from 'react-relay' -import useBreakpoint from '~/hooks/useBreakpoint' import {ActionMeetingAgendaItems_meeting$key} from '~/__generated__/ActionMeetingAgendaItems_meeting.graphql' +import useBreakpoint from '~/hooks/useBreakpoint' import EditorHelpModalContainer from '../containers/EditorHelpModalContainer/EditorHelpModalContainer' import MeetingCopy from '../modules/meeting/components/MeetingCopy/MeetingCopy' import MeetingPhaseHeading from '../modules/meeting/components/MeetingPhaseHeading/MeetingPhaseHeading' diff --git a/packages/client/components/ActionMeetingFirstCall.tsx b/packages/client/components/ActionMeetingFirstCall.tsx index e13f6310b52..0b52fd29098 100644 --- a/packages/client/components/ActionMeetingFirstCall.tsx +++ b/packages/client/components/ActionMeetingFirstCall.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {ActionMeetingFirstCall_meeting$key} from '../__generated__/ActionMeetingFirstCall_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import AgendaShortcutHint from '../modules/meeting/components/AgendaShortcutHint/AgendaShortcutHint' import MeetingCopy from '../modules/meeting/components/MeetingCopy/MeetingCopy' @@ -9,7 +10,6 @@ import MeetingFacilitationHint from '../modules/meeting/components/MeetingFacili import MeetingPhaseHeading from '../modules/meeting/components/MeetingPhaseHeading/MeetingPhaseHeading' import {AGENDA_ITEMS, AGENDA_ITEM_LABEL} from '../utils/constants' import {phaseLabelLookup} from '../utils/meetings/lookups' -import {ActionMeetingFirstCall_meeting$key} from '../__generated__/ActionMeetingFirstCall_meeting.graphql' import {ActionMeetingPhaseProps} from './ActionMeeting' import MeetingContent from './MeetingContent' import MeetingHeaderAndPhase from './MeetingHeaderAndPhase' diff --git a/packages/client/components/ActionMeetingLastCall.tsx b/packages/client/components/ActionMeetingLastCall.tsx index 34526fe2a6f..787adec1056 100644 --- a/packages/client/components/ActionMeetingLastCall.tsx +++ b/packages/client/components/ActionMeetingLastCall.tsx @@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import EndCheckInMutation from '~/mutations/EndCheckInMutation' +import {ActionMeetingLastCall_meeting$key} from '../__generated__/ActionMeetingLastCall_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import useRouter from '../hooks/useRouter' @@ -13,7 +14,6 @@ import MeetingPhaseHeading from '../modules/meeting/components/MeetingPhaseHeadi import {AGENDA_ITEM_LABEL} from '../utils/constants' import {phaseLabelLookup} from '../utils/meetings/lookups' import plural from '../utils/plural' -import {ActionMeetingLastCall_meeting$key} from '../__generated__/ActionMeetingLastCall_meeting.graphql' import {ActionMeetingPhaseProps} from './ActionMeeting' import ErrorBoundary from './ErrorBoundary' import MeetingContent from './MeetingContent' diff --git a/packages/client/components/ActionMeetingSidebar.tsx b/packages/client/components/ActionMeetingSidebar.tsx index a2f5328e77e..c91e69301c0 100644 --- a/packages/client/components/ActionMeetingSidebar.tsx +++ b/packages/client/components/ActionMeetingSidebar.tsx @@ -1,14 +1,14 @@ import graphql from 'babel-plugin-relay/macro' import React, {Fragment} from 'react' import {useFragment} from 'react-relay' -import useAtmosphere from '../hooks/useAtmosphere' -import useGotoStageId from '../hooks/useGotoStageId' -import getSidebarItemStage from '../utils/getSidebarItemStage' -import findStageById from '../utils/meetings/findStageById' import { ActionMeetingSidebar_meeting$key, NewMeetingPhaseTypeEnum } from '../__generated__/ActionMeetingSidebar_meeting.graphql' +import useAtmosphere from '../hooks/useAtmosphere' +import useGotoStageId from '../hooks/useGotoStageId' +import getSidebarItemStage from '../utils/getSidebarItemStage' +import findStageById from '../utils/meetings/findStageById' import ActionSidebarPhaseListItemChildren from './ActionSidebarPhaseListItemChildren' import MeetingNavList from './MeetingNavList' import NewMeetingSidebar from './NewMeetingSidebar' diff --git a/packages/client/components/ActionMeetingUpdates.tsx b/packages/client/components/ActionMeetingUpdates.tsx index 40270c6e178..1e980031ff2 100644 --- a/packages/client/components/ActionMeetingUpdates.tsx +++ b/packages/client/components/ActionMeetingUpdates.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {useFragment} from 'react-relay' +import {ActionMeetingUpdates_meeting$key} from '../__generated__/ActionMeetingUpdates_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import isTaskPrivate from '../utils/isTaskPrivate' import toTeamMemberId from '../utils/relay/toTeamMemberId' -import {ActionMeetingUpdates_meeting$key} from '../__generated__/ActionMeetingUpdates_meeting.graphql' import {ActionMeetingPhaseProps} from './ActionMeeting' import ActionMeetingUpdatesPrompt from './ActionMeetingUpdatesPrompt' import MeetingContent from './MeetingContent' diff --git a/packages/client/components/ActionSidebarAgendaItemsSection.tsx b/packages/client/components/ActionSidebarAgendaItemsSection.tsx index 1115b32f8cb..b8507dc7eab 100644 --- a/packages/client/components/ActionSidebarAgendaItemsSection.tsx +++ b/packages/client/components/ActionSidebarAgendaItemsSection.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {ActionSidebarAgendaItemsSection_meeting$key} from '../__generated__/ActionSidebarAgendaItemsSection_meeting.graphql' import useGotoStageId from '../hooks/useGotoStageId' import AgendaListAndInput from '../modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput' -import {ActionSidebarAgendaItemsSection_meeting$key} from '../__generated__/ActionSidebarAgendaItemsSection_meeting.graphql' import MeetingSidebarPhaseItemChild from './MeetingSidebarPhaseItemChild' const StyledRoot = styled(MeetingSidebarPhaseItemChild)({ diff --git a/packages/client/components/ActionSidebarPhaseListItemChildren.tsx b/packages/client/components/ActionSidebarPhaseListItemChildren.tsx index f43e9afff43..5e516423f30 100644 --- a/packages/client/components/ActionSidebarPhaseListItemChildren.tsx +++ b/packages/client/components/ActionSidebarPhaseListItemChildren.tsx @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {ActionSidebarPhaseListItemChildren_meeting$key} from '~/__generated__/ActionSidebarPhaseListItemChildren_meeting.graphql' -import useGotoStageId from '../hooks/useGotoStageId' import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionSidebarAgendaItemsSection_meeting.graphql' +import useGotoStageId from '../hooks/useGotoStageId' import ActionSidebarAgendaItemsSection from './ActionSidebarAgendaItemsSection' import MeetingSidebarTeamMemberStageItems from './MeetingSidebarTeamMemberStageItems' diff --git a/packages/client/components/ActivityLibrary/AISearch.tsx b/packages/client/components/ActivityLibrary/AISearch.tsx index 34584ce67cc..46dd650ede4 100644 --- a/packages/client/components/ActivityLibrary/AISearch.tsx +++ b/packages/client/components/ActivityLibrary/AISearch.tsx @@ -1,8 +1,8 @@ import React, {useState} from 'react' +import {GetTemplateSuggestionMutation$data} from '../../__generated__/GetTemplateSuggestionMutation.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import useMutationProps from '../../hooks/useMutationProps' import GetTemplateSuggestionMutation from '../../mutations/GetTemplateSuggestionMutation' -import {GetTemplateSuggestionMutation$data} from '../../__generated__/GetTemplateSuggestionMutation.graphql' import LoadingComponent from '../LoadingComponent/LoadingComponent' import StyledError from '../StyledError' import ActivityGrid from './ActivityGrid' diff --git a/packages/client/components/ActivityLibrary/ActivityCard.tsx b/packages/client/components/ActivityLibrary/ActivityCard.tsx index e0ccdbdf51d..724e791960b 100644 --- a/packages/client/components/ActivityLibrary/ActivityCard.tsx +++ b/packages/client/components/ActivityLibrary/ActivityCard.tsx @@ -94,7 +94,7 @@ export const ActivityCard = (props: ActivityCardProps) => { return (
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx index 7f1706645c2..dcafb56236f 100644 --- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx +++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx @@ -5,14 +5,14 @@ import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import {Redirect, useHistory} from 'react-router' import {Link} from 'react-router-dom' import {ActivityDetailsQuery} from '~/__generated__/ActivityDetailsQuery.graphql' +import useAtmosphere from '../../../hooks/useAtmosphere' import EditableTemplateName from '../../../modules/meeting/components/EditableTemplateName' +import SendClientSideEvent from '../../../utils/SendClientSideEvent' import IconLabel from '../../IconLabel' import {ActivityCard, ActivityCardImage} from '../ActivityCard' import ActivityDetailsSidebar from '../ActivityDetailsSidebar' -import {CategoryID, CATEGORY_THEMES, QUICK_START_CATEGORY_ID} from '../Categories' +import {CATEGORY_THEMES, CategoryID, QUICK_START_CATEGORY_ID} from '../Categories' import {TemplateDetails} from './TemplateDetails' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import useAtmosphere from '../../../hooks/useAtmosphere' graphql` fragment ActivityDetails_template on MeetingTemplate { @@ -29,8 +29,6 @@ graphql` ...TemplateDetails_activity ...ActivityDetailsBadges_template ...ActivityDetailsSidebar_template - ...ReflectTemplateDetailsTemplate @relay(mask: false) - ...PokerTemplateDetailsTemplate @relay(mask: false) ...useTemplateDescription_template } ` diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx index 194c0b882f4..e593c4c79b5 100644 --- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx +++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx @@ -5,10 +5,10 @@ import clsx from 'clsx' import React from 'react' import {useFragment} from 'react-relay' import {ActivityDetailsCategoryBadge_template$key} from '~/__generated__/ActivityDetailsCategoryBadge_template.graphql' +import useTemplateCategoryMutation from '../../../mutations/UpdateTemplateCategoryMutation' import PlainButton from '../../PlainButton/PlainButton' -import ActivityDetailsBadge from './ActivityDetailsBadge' import {CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CategoryID, MAIN_CATEGORIES} from '../Categories' -import useTemplateCategoryMutation from '../../../mutations/UpdateTemplateCategoryMutation' +import ActivityDetailsBadge from './ActivityDetailsBadge' interface Props { isEditing: boolean diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx index 140cbf0ccbf..48509a1bb24 100644 --- a/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx +++ b/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx @@ -1,5 +1,5 @@ -import React from 'react' import clsx from 'clsx' +import React from 'react' interface DetailsBadgeProps { className?: string diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx index 8846fa39b19..e0cec9c4116 100644 --- a/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx +++ b/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx @@ -1,10 +1,10 @@ +import clsx from 'clsx' import React from 'react' +import AzureDevOpsSVG from '../../../AzureDevOpsSVG' import GitHubSVG from '../../../GitHubSVG' -import JiraSVG from '../../../JiraSVG' import GitLabSVG from '../../../GitLabSVG' -import AzureDevOpsSVG from '../../../AzureDevOpsSVG' +import JiraSVG from '../../../JiraSVG' import JiraServerSVG from '../../../JiraServerSVG' -import clsx from 'clsx' interface Props { className?: string diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx index 0fbe9cfab1a..880b12f59c0 100644 --- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx +++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx @@ -1,40 +1,40 @@ import {LockOpen} from '@mui/icons-material' +import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown' +import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp' import graphql from 'babel-plugin-relay/macro' import clsx from 'clsx' -import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp' -import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown' -import React, {useState, useEffect, useRef} from 'react' +import React, {useEffect, useRef, useState} from 'react' import {useFragment} from 'react-relay' -import StartSprintPokerMutation from '~/mutations/StartSprintPokerMutation' import {useHistory} from 'react-router' -import StartRetrospectiveMutation from '~/mutations/StartRetrospectiveMutation' -import UpdateReflectTemplateScopeMutation from '~/mutations/UpdateReflectTemplateScopeMutation' +import {ActivityDetailsSidebar_teams$key} from '~/__generated__/ActivityDetailsSidebar_teams.graphql' import {ActivityDetailsSidebar_template$key} from '~/__generated__/ActivityDetailsSidebar_template.graphql' import {ActivityDetailsSidebar_viewer$key} from '~/__generated__/ActivityDetailsSidebar_viewer.graphql' -import {ActivityDetailsSidebar_teams$key} from '~/__generated__/ActivityDetailsSidebar_teams.graphql' +import StartRetrospectiveMutation from '~/mutations/StartRetrospectiveMutation' +import StartSprintPokerMutation from '~/mutations/StartSprintPokerMutation' +import UpdateReflectTemplateScopeMutation from '~/mutations/UpdateReflectTemplateScopeMutation' +import {MeetingTypeEnum} from '../../__generated__/ActivityDetailsQuery.graphql' +import { + CreateGcalEventInput, + RecurrenceSettingsInput +} from '../../__generated__/StartRetrospectiveMutation.graphql' import useAtmosphere from '../../hooks/useAtmosphere' +import useBreakpoint from '../../hooks/useBreakpoint' import {MenuPosition} from '../../hooks/useCoords' import useMutationProps from '../../hooks/useMutationProps' import SelectTemplateMutation from '../../mutations/SelectTemplateMutation' import StartCheckInMutation from '../../mutations/StartCheckInMutation' import StartTeamPromptMutation from '../../mutations/StartTeamPromptMutation' import {PALETTE} from '../../styles/paletteV3' -import { - CreateGcalEventInput, - RecurrenceSettingsInput -} from '../../__generated__/StartRetrospectiveMutation.graphql' +import {Breakpoint} from '../../types/constEnums' import sortByTier from '../../utils/sortByTier' -import {MeetingTypeEnum} from '../../__generated__/ActivityDetailsQuery.graphql' -import NewMeetingSettingsToggleAnonymity from '../NewMeetingSettingsToggleAnonymity' -import NewMeetingSettingsToggleTeamHealth from '../NewMeetingSettingsToggleTeamHealth' -import NewMeetingSettingsToggleCheckIn from '../NewMeetingSettingsToggleCheckIn' -import StyledError from '../StyledError' import FlatPrimaryButton from '../FlatPrimaryButton' import NewMeetingActionsCurrentMeetings from '../NewMeetingActionsCurrentMeetings' +import NewMeetingSettingsToggleAnonymity from '../NewMeetingSettingsToggleAnonymity' +import NewMeetingSettingsToggleCheckIn from '../NewMeetingSettingsToggleCheckIn' +import NewMeetingSettingsToggleTeamHealth from '../NewMeetingSettingsToggleTeamHealth' import NewMeetingTeamPicker from '../NewMeetingTeamPicker' +import StyledError from '../StyledError' import ScheduleMeetingButton from './ScheduleMeetingButton' -import useBreakpoint from '../../hooks/useBreakpoint' -import {Breakpoint} from '../../types/constEnums' interface Props { selectedTemplateRef: ActivityDetailsSidebar_template$key diff --git a/packages/client/components/ActivityLibrary/ActivityGrid.tsx b/packages/client/components/ActivityLibrary/ActivityGrid.tsx index fca5f6c3524..5892e37aca8 100644 --- a/packages/client/components/ActivityLibrary/ActivityGrid.tsx +++ b/packages/client/components/ActivityLibrary/ActivityGrid.tsx @@ -1,11 +1,10 @@ import React from 'react' +import {Link} from 'react-router-dom' import {ActivityBadge} from './ActivityBadge' -import {ActivityCardImage} from './ActivityCard' +import {ActivityCard, ActivityCardImage} from './ActivityCard' import {Template} from './ActivityLibrary' -import {ActivityLibraryCard} from './ActivityLibraryCard' -import {Link} from 'react-router-dom' -import {CategoryID, CATEGORY_THEMES} from './Categories' import {ActivityLibraryCardDescription} from './ActivityLibraryCardDescription' +import {CATEGORY_THEMES, CategoryID} from './Categories' interface ActivityGridProps { templates: Template[] @@ -23,9 +22,9 @@ const ActivityGrid = ({templates, selectedCategory}: ActivityGridProps) => { pathname: `/activity-library/details/${template.id}`, state: {prevCategory: selectedCategory} }} - className='flex focus:rounded-md focus:outline-primary' + className='flex rounded-2xl hover:bg-slate-100 focus:outline-sky-500' > - { className='hidden group-hover/card:flex' templateRef={template} /> - + ) })} diff --git a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx index 7cac76e9adc..5ee39ff1bd7 100644 --- a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx +++ b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx @@ -5,28 +5,28 @@ import React, {Fragment, useEffect, useMemo} from 'react' import {PreloadedQuery, commitLocalUpdate, usePreloadedQuery} from 'react-relay' import {Redirect} from 'react-router' import {Link} from 'react-router-dom' +import {useDebounce} from 'use-debounce' import {ActivityLibraryQuery} from '~/__generated__/ActivityLibraryQuery.graphql' import {ActivityLibrary_template$data} from '~/__generated__/ActivityLibrary_template.graphql' import {ActivityLibrary_templateSearchDocument$data} from '~/__generated__/ActivityLibrary_templateSearchDocument.graphql' import halloweenRetrospectiveTemplate from '../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png' +import useAtmosphere from '../../hooks/useAtmosphere' import useRouter from '../../hooks/useRouter' import useSearchFilter from '../../hooks/useSearchFilter' import logoMarkPurple from '../../styles/theme/images/brand/mark-color.svg' +import SendClientSideEvent from '../../utils/SendClientSideEvent' import IconLabel from '../IconLabel' +import AISearch from './AISearch' +import ActivityGrid from './ActivityGrid' import { - CategoryID, CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CUSTOM_CATEGORY_ID, + CategoryID, QUICK_START_CATEGORY_ID } from './Categories' import CreateActivityCard from './CreateActivityCard' import SearchBar from './SearchBar' -import useAtmosphere from '../../hooks/useAtmosphere' -import AISearch from './AISearch' -import SendClientSideEvent from '../../utils/SendClientSideEvent' -import {useDebounce} from 'use-debounce' -import ActivityGrid from './ActivityGrid' graphql` fragment ActivityLibrary_templateSearchDocument on MeetingTemplate { diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryCard.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryCard.tsx deleted file mode 100644 index 55055d77d94..00000000000 --- a/packages/client/components/ActivityLibrary/ActivityLibraryCard.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import clsx from 'clsx' -import React from 'react' -import {ActivityCard, ActivityCardProps} from './ActivityCard' - -export const ActivityLibraryCard = (props: ActivityCardProps) => { - const {className, ...rest} = props - - return ( - - ) -} diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx index e9927587efe..412d8543c1b 100644 --- a/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx +++ b/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx @@ -1,10 +1,10 @@ +import * as ScrollArea from '@radix-ui/react-scroll-area' import graphql from 'babel-plugin-relay/macro' import clsx from 'clsx' -import * as ScrollArea from '@radix-ui/react-scroll-area' import React from 'react' import { - ActivityLibraryCardDescription_template$key, - ActivityLibraryCardDescription_template$data + ActivityLibraryCardDescription_template$data, + ActivityLibraryCardDescription_template$key } from '~/__generated__/ActivityLibraryCardDescription_template.graphql' import {Comment, LinearScale, Update} from '@mui/icons-material' diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx index 41b2cb290e5..e191e20929d 100644 --- a/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx +++ b/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx @@ -1,10 +1,10 @@ import React, {lazy} from 'react' -import TeamSubscription from '../../subscriptions/TeamSubscription' +import {Route, Switch, useRouteMatch} from 'react-router' import useSubscription from '../../hooks/useSubscription' -import TaskSubscription from '../../subscriptions/TaskSubscription' import NotificationSubscription from '../../subscriptions/NotificationSubscription' import OrganizationSubscription from '../../subscriptions/OrganizationSubscription' -import {Route, Switch, useRouteMatch} from 'react-router' +import TaskSubscription from '../../subscriptions/TaskSubscription' +import TeamSubscription from '../../subscriptions/TeamSubscription' const ActivityDetailsRoute = lazy( () => import(/* webpackChunkName: 'ActivityDetails' */ './ActivityDetails/ActivityDetailsRoute') diff --git a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx index ea574d4cf1c..fbe52650e94 100644 --- a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx +++ b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx @@ -1,10 +1,10 @@ -import React from 'react' -import {ActivityLibraryCard} from './ActivityLibraryCard' -import {ActivityBadge} from './ActivityBadge' import {Add as AddIcon} from '@mui/icons-material' import clsx from 'clsx' +import React from 'react' import {Link} from 'react-router-dom' -import {CATEGORY_THEMES, CATEGORY_ID_TO_NAME, AllCategoryID} from './Categories' +import {ActivityBadge} from './ActivityBadge' +import {ActivityCard} from './ActivityCard' +import {AllCategoryID, CATEGORY_ID_TO_NAME, CATEGORY_THEMES} from './Categories' interface Props { className?: string @@ -15,8 +15,11 @@ const CreateActivityCard = (props: Props) => { const {category, className} = props return ( - - + Premium} @@ -27,7 +30,7 @@ const CreateActivityCard = (props: Props) => {
Create Custom {category !== 'recommended' ? CATEGORY_ID_TO_NAME[category] : ''} Activity - + ) } diff --git a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx index f105e0e1aab..8017e115b63 100644 --- a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx +++ b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx @@ -1,29 +1,29 @@ -import React, {ComponentPropsWithoutRef, useState} from 'react' -import {PreloadedQuery, usePreloadedQuery} from 'react-relay' -import graphql from 'babel-plugin-relay/macro' import * as RadioGroup from '@radix-ui/react-radio-group' +import graphql from 'babel-plugin-relay/macro' import clsx from 'clsx' +import React, {ComponentPropsWithoutRef, useState} from 'react' +import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {useHistory} from 'react-router' import {Link} from 'react-router-dom' -import newTemplate from '../../../../../static/images/illustrations/newTemplate.png' -import estimatedEffortTemplate from '../../../../../static/images/illustrations/estimatedEffortTemplate.png' import {CreateNewActivityQuery} from '~/__generated__/CreateNewActivityQuery.graphql' -import {ActivityCard, ActivityCardImage} from '../ActivityCard' -import {ActivityBadge} from '../ActivityBadge' -import IconLabel from '../../IconLabel' -import NewMeetingTeamPicker from '../../NewMeetingTeamPicker' -import sortByTier from '../../../utils/sortByTier' -import {useHistory} from 'react-router' +import estimatedEffortTemplate from '../../../../../static/images/illustrations/estimatedEffortTemplate.png' +import newTemplate from '../../../../../static/images/illustrations/newTemplate.png' +import {AddPokerTemplateMutation$data} from '../../../__generated__/AddPokerTemplateMutation.graphql' import {AddReflectTemplateMutation$data} from '../../../__generated__/AddReflectTemplateMutation.graphql' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' -import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation' import useRouter from '../../../hooks/useRouter' -import {CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CategoryID, DEFAULT_CARD_THEME} from '../Categories' -import BaseButton from '../../BaseButton' import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation' -import {AddPokerTemplateMutation$data} from '../../../__generated__/AddPokerTemplateMutation.graphql' -import RaisedButton from '../../RaisedButton' +import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation' import SendClientSideEvent from '../../../utils/SendClientSideEvent' +import sortByTier from '../../../utils/sortByTier' +import BaseButton from '../../BaseButton' +import IconLabel from '../../IconLabel' +import NewMeetingTeamPicker from '../../NewMeetingTeamPicker' +import RaisedButton from '../../RaisedButton' +import {ActivityBadge} from '../ActivityBadge' +import {ActivityCard, ActivityCardImage} from '../ActivityCard' +import {CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CategoryID, DEFAULT_CARD_THEME} from '../Categories' const Bold = (props: ComponentPropsWithoutRef<'span'>) => { const {children, className, ...rest} = props @@ -245,11 +245,11 @@ export const CreateNewActivity = (props: Props) => { return ( void diff --git a/packages/client/components/AddTeamMemberAvatarButton.tsx b/packages/client/components/AddTeamMemberAvatarButton.tsx index 2f3a95a24cf..8aeacbd0fa4 100644 --- a/packages/client/components/AddTeamMemberAvatarButton.tsx +++ b/packages/client/components/AddTeamMemberAvatarButton.tsx @@ -4,13 +4,13 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' +import {AddTeamMemberAvatarButton_teamMembers$key} from '../__generated__/AddTeamMemberAvatarButton_teamMembers.graphql' import {MenuPosition} from '../hooks/useCoords' import useModal from '../hooks/useModal' import useTooltip from '../hooks/useTooltip' import {meetingAvatarMediaQueries} from '../styles/meeting' import isDemoRoute from '../utils/isDemoRoute' import lazyPreload from '../utils/lazyPreload' -import {AddTeamMemberAvatarButton_teamMembers$key} from '../__generated__/AddTeamMemberAvatarButton_teamMembers.graphql' import OutlinedButton from './OutlinedButton' interface Props { diff --git a/packages/client/components/AddToAzureMenuItem.tsx b/packages/client/components/AddToAzureMenuItem.tsx index 1bffc1f650c..76fe597cac9 100644 --- a/packages/client/components/AddToAzureMenuItem.tsx +++ b/packages/client/components/AddToAzureMenuItem.tsx @@ -2,11 +2,11 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {forwardRef} from 'react' import {useFragment} from 'react-relay' +import {AddToAzureMenuItem_AzureIntegration$key} from '../__generated__/AddToAzureMenuItem_AzureIntegration.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuMutationProps} from '../hooks/useMutationProps' import {ICON_SIZE} from '../styles/typographyV2' import AzureDevOpsClientManager from '../utils/AzureDevOpsClientManager' -import {AddToAzureMenuItem_AzureIntegration$key} from '../__generated__/AddToAzureMenuItem_AzureIntegration.graphql' import AzureDevOpsSVG from './AzureDevOpsSVG' import MenuItem from './MenuItem' import MenuItemComponentAvatar from './MenuItemComponentAvatar' diff --git a/packages/client/components/AddToGitLabMenuItem.tsx b/packages/client/components/AddToGitLabMenuItem.tsx index 7b06b07addb..2cc793f704a 100644 --- a/packages/client/components/AddToGitLabMenuItem.tsx +++ b/packages/client/components/AddToGitLabMenuItem.tsx @@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro' import React, {forwardRef} from 'react' import {useFragment} from 'react-relay' import GitLabClientManager from '~/utils/GitLabClientManager' +import {AddToGitLabMenuItem_GitLabIntegration$key} from '../__generated__/AddToGitLabMenuItem_GitLabIntegration.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps, {MenuMutationProps} from '../hooks/useMutationProps' import {ICON_SIZE} from '../styles/typographyV2' -import {AddToGitLabMenuItem_GitLabIntegration$key} from '../__generated__/AddToGitLabMenuItem_GitLabIntegration.graphql' import GitLabSVG from './GitLabSVG' import MenuItem from './MenuItem' import MenuItemComponentAvatar from './MenuItemComponentAvatar' diff --git a/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx b/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx index 2f1a92fb107..ffb6e8585cd 100644 --- a/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx +++ b/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx @@ -1,11 +1,11 @@ +import {useAutocomplete} from '@mui/base/AutocompleteUnstyled' +import CheckIcon from '@mui/icons-material/Check' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {useAutocomplete} from '@mui/base/AutocompleteUnstyled' -import CheckIcon from '@mui/icons-material/Check' -import {AdhocTeamMultiSelect_viewer$key} from '../../__generated__/AdhocTeamMultiSelect_viewer.graphql' import {Send as SendIcon} from '@mui/icons-material' +import {AdhocTeamMultiSelect_viewer$key} from '../../__generated__/AdhocTeamMultiSelect_viewer.graphql' import {Chip} from '../../ui/Chip/Chip' import {emailRegex} from '../../validation/regex' diff --git a/packages/client/components/AnalyticsPage.tsx b/packages/client/components/AnalyticsPage.tsx index dee92c85291..9a6478fed22 100644 --- a/packages/client/components/AnalyticsPage.tsx +++ b/packages/client/components/AnalyticsPage.tsx @@ -1,14 +1,14 @@ +import * as amplitude from '@amplitude/analytics-browser' import {datadogRum} from '@datadog/browser-rum' import * as Sentry from '@sentry/browser' import graphql from 'babel-plugin-relay/macro' import {useEffect} from 'react' import ReactGA from 'react-ga4' +import {AnalyticsPageQuery} from '~/__generated__/AnalyticsPageQuery.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import {LocalStorageKey} from '~/types/constEnums' import safeIdentify from '~/utils/safeIdentify' -import {AnalyticsPageQuery} from '~/__generated__/AnalyticsPageQuery.graphql' import getContentGroup from '../utils/getContentGroup' -import * as amplitude from '@amplitude/analytics-browser' const query = graphql` query AnalyticsPageQuery { diff --git a/packages/client/components/ArchiveTaskRoot.tsx b/packages/client/components/ArchiveTaskRoot.tsx index c52b373461f..6a2fcd6ef5a 100644 --- a/packages/client/components/ArchiveTaskRoot.tsx +++ b/packages/client/components/ArchiveTaskRoot.tsx @@ -1,8 +1,8 @@ import React, {Suspense} from 'react' import useDocumentTitle from '~/hooks/useDocumentTitle' import TeamArchive from '~/modules/teamDashboard/components/TeamArchive/TeamArchive' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import teamArchiveQuery, {TeamArchiveQuery} from '../__generated__/TeamArchiveQuery.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' interface Props { teamIds?: string[] | null diff --git a/packages/client/components/ArchiveTaskUserRoot.tsx b/packages/client/components/ArchiveTaskUserRoot.tsx index ed64cf7bdd0..9707ac9f96e 100644 --- a/packages/client/components/ArchiveTaskUserRoot.tsx +++ b/packages/client/components/ArchiveTaskUserRoot.tsx @@ -1,8 +1,8 @@ import React, {Suspense} from 'react' import TeamArchive from '~/modules/teamDashboard/components/TeamArchive/TeamArchive' import UserTasksHeader from '~/modules/userDashboard/components/UserTasksHeader/UserTasksHeader' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import teamArchiveQuery, {TeamArchiveQuery} from '../__generated__/TeamArchiveQuery.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' interface Props { teamIds?: string[] | null diff --git a/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx b/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx index f9e44bc9d8a..2ffa721ed59 100644 --- a/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx +++ b/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx @@ -4,6 +4,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' +import {AzureDevOpsFieldDimensionDropdown_stage$key} from '../__generated__/AzureDevOpsFieldDimensionDropdown_stage.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import {SprintPokerDefaults} from '../types/constEnums' @@ -13,7 +14,6 @@ import { azureDevOpsRemainingWorkWorkItems, azureDevOpsStoryPointWorkItems } from '../utils/AzureDevOpsWorkItemFields' -import {AzureDevOpsFieldDimensionDropdown_stage$key} from '../__generated__/AzureDevOpsFieldDimensionDropdown_stage.graphql' import AzureDevOpsFieldMenu from './AzureDevOpsFieldMenu' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/AzureDevOpsFieldMenu.tsx b/packages/client/components/AzureDevOpsFieldMenu.tsx index 9b1bd6689bf..dd399c6eb8f 100644 --- a/packages/client/components/AzureDevOpsFieldMenu.tsx +++ b/packages/client/components/AzureDevOpsFieldMenu.tsx @@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' +import {AzureDevOpsFieldMenu_stage$key} from '../__generated__/AzureDevOpsFieldMenu_stage.graphql' import {MenuProps} from '../hooks/useMenu' import UpdateAzureDevOpsDimensionFieldMutation from '../mutations/UpdateAzureDevOpsDimensionFieldMutation' import {SprintPokerDefaults} from '../types/constEnums' @@ -12,7 +13,6 @@ import { azureDevOpsRemainingWorkWorkItems, azureDevOpsStoryPointWorkItems } from '../utils/AzureDevOpsWorkItemFields' -import {AzureDevOpsFieldMenu_stage$key} from '../__generated__/AzureDevOpsFieldMenu_stage.graphql' import Menu from './Menu' import MenuItem from './MenuItem' import MenuItemHR from './MenuItemHR' diff --git a/packages/client/components/AzureDevOpsScopingSearchBar.tsx b/packages/client/components/AzureDevOpsScopingSearchBar.tsx index 4d8a7b79659..57ae76f6966 100644 --- a/packages/client/components/AzureDevOpsScopingSearchBar.tsx +++ b/packages/client/components/AzureDevOpsScopingSearchBar.tsx @@ -3,8 +3,8 @@ import {Search} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {PALETTE} from '../styles/paletteV3' import {AzureDevOpsScopingSearchBar_meeting$key} from '../__generated__/AzureDevOpsScopingSearchBar_meeting.graphql' +import {PALETTE} from '../styles/paletteV3' import AzureDevOpsScopingSearchFilterToggle from './AzureDevOpsScopingSearchFilterToggle' import AzureDevOpsScopingSearchInput from './AzureDevOpsScopingSearchInput' diff --git a/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx b/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx index e15d1080661..395c4f67930 100644 --- a/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx +++ b/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx @@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' -import {MenuProps} from '../hooks/useMenu' import { AzureDevOpsScopingSearchFilterMenu_meeting$data, AzureDevOpsScopingSearchFilterMenu_meeting$key } from '../__generated__/AzureDevOpsScopingSearchFilterMenu_meeting.graphql' +import {MenuProps} from '../hooks/useMenu' import Checkbox from './Checkbox' import DropdownMenuLabel from './DropdownMenuLabel' import Menu from './Menu' diff --git a/packages/client/components/AzureDevOpsScopingSearchInput.tsx b/packages/client/components/AzureDevOpsScopingSearchInput.tsx index e5aa030bc2f..d2e6864b596 100644 --- a/packages/client/components/AzureDevOpsScopingSearchInput.tsx +++ b/packages/client/components/AzureDevOpsScopingSearchInput.tsx @@ -5,8 +5,8 @@ import React from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' import Atmosphere from '../Atmosphere' -import useAtmosphere from '../hooks/useAtmosphere' import {AzureDevOpsScopingSearchInput_meeting$key} from '../__generated__/AzureDevOpsScopingSearchInput_meeting.graphql' +import useAtmosphere from '../hooks/useAtmosphere' const Wrapper = styled('div')({ alignItems: 'center', diff --git a/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx b/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx index 259cf7f0faf..52637c5e284 100644 --- a/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx +++ b/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx @@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' import MockScopingList from '~/modules/meeting/components/MockScopingList' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import azureDevOpsScopingSearchResultsQuery, { AzureDevOpsScopingSearchResultsQuery } from '../__generated__/AzureDevOpsScopingSearchResultsQuery.graphql' import {AzureDevOpsScopingSearchResultsRoot_meeting$key} from '../__generated__/AzureDevOpsScopingSearchResultsRoot_meeting.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import AzureDevOpsScopingSearchResults from './AzureDevOpsScopingSearchResults' interface Props { diff --git a/packages/client/components/BillingLeaderActionMenu.tsx b/packages/client/components/BillingLeaderActionMenu.tsx index d8ee60cf36a..9f6e1e7604c 100644 --- a/packages/client/components/BillingLeaderActionMenu.tsx +++ b/packages/client/components/BillingLeaderActionMenu.tsx @@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' +import {BillingLeaderActionMenu_organization$key} from '../__generated__/BillingLeaderActionMenu_organization.graphql' +import {BillingLeaderActionMenu_organizationUser$key} from '../__generated__/BillingLeaderActionMenu_organizationUser.graphql' import {MenuProps} from '../hooks/useMenu' import SetOrgUserRoleMutation from '../mutations/SetOrgUserRoleMutation' import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps' -import {BillingLeaderActionMenu_organization$key} from '../__generated__/BillingLeaderActionMenu_organization.graphql' -import {BillingLeaderActionMenu_organizationUser$key} from '../__generated__/BillingLeaderActionMenu_organizationUser.graphql' import Menu from './Menu' import MenuItem from './MenuItem' diff --git a/packages/client/components/BillingLeaderMenu.tsx b/packages/client/components/BillingLeaderMenu.tsx index 033cdeb64db..3082a87b4d1 100644 --- a/packages/client/components/BillingLeaderMenu.tsx +++ b/packages/client/components/BillingLeaderMenu.tsx @@ -1,10 +1,10 @@ import React from 'react' import useAtmosphere from '~/hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' +import useMutationProps from '../hooks/useMutationProps' import SetOrgUserRoleMutation from '../mutations/SetOrgUserRoleMutation' import Menu from './Menu' import MenuItem from './MenuItem' -import useMutationProps from '../hooks/useMutationProps' type Props = { menuProps: MenuProps diff --git a/packages/client/components/BottomControlBarReady.tsx b/packages/client/components/BottomControlBarReady.tsx index b212c7cbb5d..a1291de032e 100644 --- a/packages/client/components/BottomControlBarReady.tsx +++ b/packages/client/components/BottomControlBarReady.tsx @@ -1,8 +1,9 @@ import styled from '@emotion/styled' -import {ArrowForward, CheckCircleOutline, CheckCircle} from '@mui/icons-material' +import {ArrowForward, CheckCircle, CheckCircleOutline} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {useFragment} from 'react-relay' +import {BottomControlBarReady_meeting$key} from '~/__generated__/BottomControlBarReady_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useGotoNext from '~/hooks/useGotoNext' import {TransitionStatus} from '~/hooks/useTransition' @@ -10,10 +11,9 @@ import FlagReadyToAdvanceMutation from '~/mutations/FlagReadyToAdvanceMutation' import {PALETTE} from '~/styles/paletteV3' import {BezierCurve, Times} from '~/types/constEnums' import handleRightArrow from '~/utils/handleRightArrow' -import {BottomControlBarReady_meeting$key} from '~/__generated__/BottomControlBarReady_meeting.graphql' +import {NewMeetingPhaseTypeEnum} from '../__generated__/BottomControlBarReady_meeting.graphql' import {MenuPosition} from '../hooks/useCoords' import useTooltip from '../hooks/useTooltip' -import {NewMeetingPhaseTypeEnum} from '../__generated__/BottomControlBarReady_meeting.graphql' import BottomControlBarProgress from './BottomControlBarProgress' import BottomNavControl from './BottomNavControl' import BottomNavIconLabel from './BottomNavIconLabel' diff --git a/packages/client/components/BottomControlBarTips.tsx b/packages/client/components/BottomControlBarTips.tsx index 6aa0b6086af..fa8873ae2ae 100644 --- a/packages/client/components/BottomControlBarTips.tsx +++ b/packages/client/components/BottomControlBarTips.tsx @@ -2,16 +2,16 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {useFragment} from 'react-relay' +import {BottomControlBarTips_meeting$key} from '~/__generated__/BottomControlBarTips_meeting.graphql' import {MenuPosition} from '~/hooks/useCoords' import useMenu from '~/hooks/useMenu' import useTimeout from '~/hooks/useTimeout' import {TransitionStatus} from '~/hooks/useTransition' import LocalAtmosphere from '~/modules/demo/LocalAtmosphere' import lazyPreload, {LazyExoticPreload} from '~/utils/lazyPreload' -import {BottomControlBarTips_meeting$key} from '~/__generated__/BottomControlBarTips_meeting.graphql' +import {NewMeetingPhaseTypeEnum} from '../__generated__/BottomControlBarTips_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import isDemoRoute from '../utils/isDemoRoute' -import {NewMeetingPhaseTypeEnum} from '../__generated__/BottomControlBarTips_meeting.graphql' import BottomNavControl from './BottomNavControl' import BottomNavIconLabel from './BottomNavIconLabel' import Menu from './Menu' diff --git a/packages/client/components/BottomNavIconLabel.tsx b/packages/client/components/BottomNavIconLabel.tsx index e24975b915a..97d0d5498f4 100644 --- a/packages/client/components/BottomNavIconLabel.tsx +++ b/packages/client/components/BottomNavIconLabel.tsx @@ -1,6 +1,6 @@ import styled from '@emotion/styled' import {Event, HelpOutline, PersonPinCircleOutlined, TimerOutlined} from '@mui/icons-material' -import React, {forwardRef, ReactNode, Ref} from 'react' +import React, {ReactNode, Ref, forwardRef} from 'react' import {PALETTE} from '../styles/paletteV3' const paletteColors = { diff --git a/packages/client/components/Checkbox.tsx b/packages/client/components/Checkbox.tsx index 9915fd83b2d..a319fa4a5b2 100644 --- a/packages/client/components/Checkbox.tsx +++ b/packages/client/components/Checkbox.tsx @@ -1,6 +1,6 @@ import {CheckBox, CheckBoxOutlineBlank, IndeterminateCheckBox} from '@mui/icons-material' -import React from 'react' import clsx from 'clsx' +import React from 'react' interface Props { active: boolean | null diff --git a/packages/client/components/DashFilterToggle/DashFilterToggle.tsx b/packages/client/components/DashFilterToggle/DashFilterToggle.tsx index ccb11d7e89c..155621b2ebc 100644 --- a/packages/client/components/DashFilterToggle/DashFilterToggle.tsx +++ b/packages/client/components/DashFilterToggle/DashFilterToggle.tsx @@ -1,6 +1,6 @@ import styled from '@emotion/styled' import {FilterList, Group, Person} from '@mui/icons-material' -import React, {forwardRef, Ref} from 'react' +import React, {Ref, forwardRef} from 'react' import {PALETTE} from '~/styles/paletteV3' import LinkButton from '../LinkButton' diff --git a/packages/client/components/DashNavList/DashNavList.tsx b/packages/client/components/DashNavList/DashNavList.tsx index 137497d813b..2c5890bc643 100644 --- a/packages/client/components/DashNavList/DashNavList.tsx +++ b/packages/client/components/DashNavList/DashNavList.tsx @@ -5,11 +5,11 @@ import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' import {Breakpoint} from '~/types/constEnums' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' -import LeftDashNavItem from '../Dashboard/LeftDashNavItem' import { - DashNavList_organization$key, - DashNavList_organization$data + DashNavList_organization$data, + DashNavList_organization$key } from '../../__generated__/DashNavList_organization.graphql' +import LeftDashNavItem from '../Dashboard/LeftDashNavItem' const DashNavListStyles = styled('div')({ paddingRight: 8, diff --git a/packages/client/components/DashTopBar.tsx b/packages/client/components/DashTopBar.tsx index 2b9c9ead0a3..691afb835db 100644 --- a/packages/client/components/DashTopBar.tsx +++ b/packages/client/components/DashTopBar.tsx @@ -3,12 +3,12 @@ import {Menu} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {DashTopBar_query$key} from '~/__generated__/DashTopBar_query.graphql' import useRouter from '~/hooks/useRouter' import {PALETTE} from '~/styles/paletteV3' import {ICON_SIZE} from '~/styles/typographyV2' import {AppBar, Breakpoint, Layout, NavSidebar} from '~/types/constEnums' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' -import {DashTopBar_query$key} from '~/__generated__/DashTopBar_query.graphql' import parabolLogo from '../styles/theme/images/brand/lockup_color_mark_white_type.svg' import PinnedSnackbarNotifications from './PinnedSnackbarNotifications' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/Dashboard.tsx b/packages/client/components/Dashboard.tsx index 6dbc7c535e2..e636a27285f 100644 --- a/packages/client/components/Dashboard.tsx +++ b/packages/client/components/Dashboard.tsx @@ -4,20 +4,20 @@ import React, {lazy, useRef} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import {Route, Switch} from 'react-router' import useBreakpoint from '~/hooks/useBreakpoint' +import useNewFeatureSnackbar from '~/hooks/useNewFeatureSnackbar' import useSnackNag from '~/hooks/useSnackNag' import useSnacksForNewMeetings from '~/hooks/useSnacksForNewMeetings' -import useNewFeatureSnackbar from '~/hooks/useNewFeatureSnackbar' import {PALETTE} from '~/styles/paletteV3' import {Breakpoint} from '~/types/constEnums' +import {DashboardQuery} from '../__generated__/DashboardQuery.graphql' import useSidebar from '../hooks/useSidebar' import useUsageSnackNag from '../hooks/useUsageSnackNag' -import {DashboardQuery} from '../__generated__/DashboardQuery.graphql' +import DashTopBar from './DashTopBar' import DashSidebar from './Dashboard/DashSidebar' import MobileDashSidebar from './Dashboard/MobileDashSidebar' -import DashTopBar from './DashTopBar' import MobileDashTopBar from './MobileDashTopBar' -import SwipeableDashSidebar from './SwipeableDashSidebar' import RequestToJoinComponent from './RequestToJoin' +import SwipeableDashSidebar from './SwipeableDashSidebar' const InsightsRoot = lazy( () => import(/* webpackChunkName: 'Insights' */ '../components/InsightsRoot') diff --git a/packages/client/components/Dashboard/DashSidebar.tsx b/packages/client/components/Dashboard/DashSidebar.tsx index 2f5c78f0cdb..f95a6d38675 100644 --- a/packages/client/components/Dashboard/DashSidebar.tsx +++ b/packages/client/components/Dashboard/DashSidebar.tsx @@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {useRouteMatch} from 'react-router' +import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql' import {PALETTE} from '../../styles/paletteV3' import {NavSidebar} from '../../types/constEnums' import { @@ -12,7 +13,6 @@ import { ORG_SETTINGS_PAGE, TEAMS_PAGE } from '../../utils/constants' -import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql' import DashNavList from '../DashNavList/DashNavList' import SideBarStartMeetingButton from '../SideBarStartMeetingButton' import LeftDashNavItem from './LeftDashNavItem' diff --git a/packages/client/components/Dashboard/MobileDashSidebar.tsx b/packages/client/components/Dashboard/MobileDashSidebar.tsx index 03666b91642..033556c85bc 100644 --- a/packages/client/components/Dashboard/MobileDashSidebar.tsx +++ b/packages/client/components/Dashboard/MobileDashSidebar.tsx @@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {useRouteMatch} from 'react-router' +import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql' import {PALETTE} from '../../styles/paletteV3' import {NavSidebar} from '../../types/constEnums' import { @@ -12,7 +13,6 @@ import { ORG_SETTINGS_PAGE, TEAMS_PAGE } from '../../utils/constants' -import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql' import DashNavList from '../DashNavList/DashNavList' import StandardHub from '../StandardHub/StandardHub' import LeftDashNavItem from './LeftDashNavItem' diff --git a/packages/client/components/DashboardAvatars/DashboardAvatars.tsx b/packages/client/components/DashboardAvatars/DashboardAvatars.tsx index 5827f1edb8c..acfe2337256 100644 --- a/packages/client/components/DashboardAvatars/DashboardAvatars.tsx +++ b/packages/client/components/DashboardAvatars/DashboardAvatars.tsx @@ -4,15 +4,15 @@ import React, {useMemo} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' import {Breakpoint, ElementHeight, ElementWidth} from '~/types/constEnums' import fromTeamMemberId from '~/utils/relay/fromTeamMemberId' +import { + DashboardAvatars_team$data, + DashboardAvatars_team$key +} from '../../__generated__/DashboardAvatars_team.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import useBreakpoint from '../../hooks/useBreakpoint' import useMutationProps from '../../hooks/useMutationProps' import ToggleTeamDrawerMutation from '../../mutations/ToggleTeamDrawerMutation' import {PALETTE} from '../../styles/paletteV3' -import { - DashboardAvatars_team$key, - DashboardAvatars_team$data -} from '../../__generated__/DashboardAvatars_team.graphql' import ErrorBoundary from '../ErrorBoundary' import PlainButton from '../PlainButton/PlainButton' import DashboardAvatar from './DashboardAvatar' diff --git a/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx b/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx index 9bf47a5b7b8..5433494085e 100644 --- a/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx +++ b/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx @@ -3,8 +3,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' -import {MenuProps} from '../../hooks/useMenu' import {TeamMemberAvatarMenu_teamMember$key} from '../../__generated__/TeamMemberAvatarMenu_teamMember.graphql' +import {MenuProps} from '../../hooks/useMenu' import Menu from '../Menu' import MenuItem from '../MenuItem' import MenuItemLabel from '../MenuItemLabel' diff --git a/packages/client/components/DashboardRoot.tsx b/packages/client/components/DashboardRoot.tsx index f97e879fce5..e2366c7d517 100644 --- a/packages/client/components/DashboardRoot.tsx +++ b/packages/client/components/DashboardRoot.tsx @@ -1,12 +1,12 @@ import React, {Suspense} from 'react' import {withRouter} from 'react-router-dom' +import dashboardQuery, {DashboardQuery} from '../__generated__/DashboardQuery.graphql' import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import useSubscription from '../hooks/useSubscription' import NotificationSubscription from '../subscriptions/NotificationSubscription' import OrganizationSubscription from '../subscriptions/OrganizationSubscription' import TaskSubscription from '../subscriptions/TaskSubscription' import TeamSubscription from '../subscriptions/TeamSubscription' -import dashboardQuery, {DashboardQuery} from '../__generated__/DashboardQuery.graphql' import Dashboard from './Dashboard' const DashboardRoot = () => { diff --git a/packages/client/components/DeleteTeamDialog.tsx b/packages/client/components/DeleteTeamDialog.tsx index d6bb993bbde..d940674c070 100644 --- a/packages/client/components/DeleteTeamDialog.tsx +++ b/packages/client/components/DeleteTeamDialog.tsx @@ -1,15 +1,15 @@ import React, {useState} from 'react' -import FlatPrimaryButton from './FlatPrimaryButton' -import {Input} from '../ui/Input/Input' +import useAtmosphere from '../hooks/useAtmosphere' +import useMutationProps from '../hooks/useMutationProps' +import useRouter from '../hooks/useRouter' +import ArchiveTeamMutation from '../mutations/ArchiveTeamMutation' import {Dialog} from '../ui/Dialog/Dialog' +import {DialogActions} from '../ui/Dialog/DialogActions' import {DialogContent} from '../ui/Dialog/DialogContent' import {DialogTitle} from '../ui/Dialog/DialogTitle' -import {DialogActions} from '../ui/Dialog/DialogActions' -import useMutationProps from '../hooks/useMutationProps' +import {Input} from '../ui/Input/Input' +import FlatPrimaryButton from './FlatPrimaryButton' import SecondaryButton from './SecondaryButton' -import ArchiveTeamMutation from '../mutations/ArchiveTeamMutation' -import useAtmosphere from '../hooks/useAtmosphere' -import useRouter from '../hooks/useRouter' interface Props { isOpen: boolean diff --git a/packages/client/components/DemoMeetingCard.tsx b/packages/client/components/DemoMeetingCard.tsx index 1409d57911d..36892c5c372 100644 --- a/packages/client/components/DemoMeetingCard.tsx +++ b/packages/client/components/DemoMeetingCard.tsx @@ -4,10 +4,10 @@ import {Link} from 'react-router-dom' import retrospective from '../../../static/images/illustrations/retrospective.png' import useAtmosphere from '../hooks/useAtmosphere' import useBreakpoint from '../hooks/useBreakpoint' -import SendClientSideEvent from '../utils/SendClientSideEvent' import {Elevation} from '../styles/elevation' import {PALETTE} from '../styles/paletteV3' import {BezierCurve, Breakpoint, Card, ElementWidth} from '../types/constEnums' +import SendClientSideEvent from '../utils/SendClientSideEvent' const CardWrapper = styled('div')<{ maybeTabletPlus: boolean diff --git a/packages/client/components/DemoMeetingRoot.tsx b/packages/client/components/DemoMeetingRoot.tsx index 53e3f595b73..932301106e5 100644 --- a/packages/client/components/DemoMeetingRoot.tsx +++ b/packages/client/components/DemoMeetingRoot.tsx @@ -2,13 +2,13 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useLazyLoadQuery} from 'react-relay' import MeetingSubscription from '~/subscriptions/MeetingSubscription' +import {DemoMeetingRootQuery} from '../__generated__/DemoMeetingRootQuery.graphql' import useSubscription from '../hooks/useSubscription' import NotificationSubscription from '../subscriptions/NotificationSubscription' import OrganizationSubscription from '../subscriptions/OrganizationSubscription' import TaskSubscription from '../subscriptions/TaskSubscription' import TeamSubscription from '../subscriptions/TeamSubscription' import {RetroDemo} from '../types/constEnums' -import {DemoMeetingRootQuery} from '../__generated__/DemoMeetingRootQuery.graphql' import RetroMeeting from './RetroMeeting' const query = graphql` diff --git a/packages/client/components/DiscussPhaseReflectionGrid.tsx b/packages/client/components/DiscussPhaseReflectionGrid.tsx index 514cc27fc68..0189bc882ee 100644 --- a/packages/client/components/DiscussPhaseReflectionGrid.tsx +++ b/packages/client/components/DiscussPhaseReflectionGrid.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useRef} from 'react' import {useFragment} from 'react-relay' +import {DiscussPhaseReflectionGrid_meeting$key} from '~/__generated__/DiscussPhaseReflectionGrid_meeting.graphql' import {useCoverable} from '~/hooks/useControlBarCovers' import {MeetingControlBarEnum} from '~/types/constEnums' -import {DiscussPhaseReflectionGrid_meeting$key} from '~/__generated__/DiscussPhaseReflectionGrid_meeting.graphql' import {meetingGridMinWidth} from '../styles/meeting' import MasonryCSSGrid from './MasonryCSSGrid' import ReflectionCard from './ReflectionCard/ReflectionCard' diff --git a/packages/client/components/DiscussionMentioned.tsx b/packages/client/components/DiscussionMentioned.tsx index 25b494e3b91..1fd1cab6386 100644 --- a/packages/client/components/DiscussionMentioned.tsx +++ b/packages/client/components/DiscussionMentioned.tsx @@ -4,13 +4,13 @@ import {Editor} from 'draft-js' import React from 'react' import {useFragment} from 'react-relay' import NotificationAction from '~/components/NotificationAction' +import {DiscussionMentioned_notification$key} from '../__generated__/DiscussionMentioned_notification.graphql' import useEditorState from '../hooks/useEditorState' import useRouter from '../hooks/useRouter' import {cardShadow} from '../styles/elevation' +import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg' import fromStageIdToUrl from '../utils/meetings/fromStageIdToUrl' -import {DiscussionMentioned_notification$key} from '../__generated__/DiscussionMentioned_notification.graphql' import NotificationTemplate from './NotificationTemplate' -import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg' const EditorWrapper = styled('div')({ backgroundColor: '#fff', diff --git a/packages/client/components/DiscussionThread.tsx b/packages/client/components/DiscussionThread.tsx index 40a7c534904..35b400a19e5 100644 --- a/packages/client/components/DiscussionThread.tsx +++ b/packages/client/components/DiscussionThread.tsx @@ -5,10 +5,10 @@ import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' import {useCoverable} from '~/hooks/useControlBarCovers' import {Breakpoint, DiscussionThreadEnum, MeetingControlBarEnum} from '~/types/constEnums' -import {Elevation} from '../styles/elevation' -import makeMinWidthMediaQuery from '../utils/makeMinWidthMediaQuery' import {DiscussionThreadQuery} from '../__generated__/DiscussionThreadQuery.graphql' import {RetroDiscussPhase_meeting$data} from '../__generated__/RetroDiscussPhase_meeting.graphql' +import {Elevation} from '../styles/elevation' +import makeMinWidthMediaQuery from '../utils/makeMinWidthMediaQuery' import DiscussionThreadInput from './DiscussionThreadInput' import DiscussionThreadList, {DiscussionThreadables} from './DiscussionThreadList' import {isLocalPoll} from './Poll/local/newPoll' diff --git a/packages/client/components/DiscussionThreadList.tsx b/packages/client/components/DiscussionThreadList.tsx index 76c11100693..e13fa04e9df 100644 --- a/packages/client/components/DiscussionThreadList.tsx +++ b/packages/client/components/DiscussionThreadList.tsx @@ -2,12 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {forwardRef, ReactNode, RefObject} from 'react' import {useFragment} from 'react-relay' -import useScrollThreadList from '~/hooks/useScrollThreadList' import {DiscussionThreadList_discussion$key} from '~/__generated__/DiscussionThreadList_discussion.graphql' import {DiscussionThreadList_threadables$key} from '~/__generated__/DiscussionThreadList_threadables.graphql' import {DiscussionThreadList_viewer$key} from '~/__generated__/DiscussionThreadList_viewer.graphql' -import {PALETTE} from '../styles/paletteV3' +import useScrollThreadList from '~/hooks/useScrollThreadList' import {RetroDiscussPhase_meeting$data} from '../__generated__/RetroDiscussPhase_meeting.graphql' +import {PALETTE} from '../styles/paletteV3' import CommentingStatusText from './CommentingStatusText' import LabelHeading from './LabelHeading/LabelHeading' import ThreadedItem from './ThreadedItem' diff --git a/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx b/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx index 0ab2cd51288..c9b7a53a874 100644 --- a/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx +++ b/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {DiscussionThreadListEmptyTranscriptState_meeting$key} from '~/__generated__/DiscussionThreadListEmptyTranscriptState_meeting.graphql' import {PALETTE} from '~/styles/paletteV3' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' import useAtmosphere from '../hooks/useAtmosphere' @@ -12,7 +13,6 @@ import linkify from '../utils/linkify' import Legitity from '../validation/Legitity' import FlatButton from './FlatButton' import StyledError from './StyledError' -import {DiscussionThreadListEmptyTranscriptState_meeting$key} from '~/__generated__/DiscussionThreadListEmptyTranscriptState_meeting.graphql' import {ZoomSVG} from './ZoomSVG' const mobileBreakpoint = makeMinWidthMediaQuery(380) diff --git a/packages/client/components/DiscussionThreadRoot.tsx b/packages/client/components/DiscussionThreadRoot.tsx index c6a590f0703..d7d7d0d011d 100644 --- a/packages/client/components/DiscussionThreadRoot.tsx +++ b/packages/client/components/DiscussionThreadRoot.tsx @@ -1,9 +1,9 @@ import React, {ReactNode, RefObject, Suspense} from 'react' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import discussionThreadQuery, { DiscussionThreadQuery } from '../__generated__/DiscussionThreadQuery.graphql' import {RetroDiscussPhase_meeting$data} from '../__generated__/RetroDiscussPhase_meeting.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import DiscussionThread from './DiscussionThread' import {DiscussionThreadables} from './DiscussionThreadList' diff --git a/packages/client/components/DropdownToggleV2.tsx b/packages/client/components/DropdownToggleV2.tsx index f5fd1c31f9c..b7111cd7384 100644 --- a/packages/client/components/DropdownToggleV2.tsx +++ b/packages/client/components/DropdownToggleV2.tsx @@ -1,6 +1,6 @@ import styled from '@emotion/styled' import {ExpandMore as ExpandMoreIcon, KeyboardArrowRight} from '@mui/icons-material' -import React, {forwardRef, ReactNode, Ref} from 'react' +import React, {ReactNode, Ref, forwardRef} from 'react' import useMenu from '../hooks/useMenu' import {PALETTE} from '../styles/paletteV3' diff --git a/packages/client/components/DueDatePicker.tsx b/packages/client/components/DueDatePicker.tsx index 459be442401..62544916bbe 100644 --- a/packages/client/components/DueDatePicker.tsx +++ b/packages/client/components/DueDatePicker.tsx @@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {DayModifiers, DayPicker} from 'react-day-picker' import {useFragment} from 'react-relay' +import {DueDatePicker_task$key} from '../__generated__/DueDatePicker_task.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' import useMutationProps from '../hooks/useMutationProps' import {UseTaskChild} from '../hooks/useTaskChildFocus' import UpdateTaskDueDateMutation from '../mutations/UpdateTaskDueDateMutation' import {PALETTE} from '../styles/paletteV3' -import {DueDatePicker_task$key} from '../__generated__/DueDatePicker_task.graphql' import Menu from './Menu' interface Props { diff --git a/packages/client/components/DueDateToggle.tsx b/packages/client/components/DueDateToggle.tsx index f8c11acb133..3feb5e60c3b 100644 --- a/packages/client/components/DueDateToggle.tsx +++ b/packages/client/components/DueDateToggle.tsx @@ -5,13 +5,13 @@ import ms from 'ms' import React from 'react' import {useFragment} from 'react-relay' import useTooltip from '~/hooks/useTooltip' +import {DueDateToggle_task$key} from '../__generated__/DueDateToggle_task.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import {UseTaskChild} from '../hooks/useTaskChildFocus' import {PALETTE} from '../styles/paletteV3' import lazyPreload from '../utils/lazyPreload' import {shortMonths} from '../utils/makeDateString' -import {DueDateToggle_task$key} from '../__generated__/DueDateToggle_task.graphql' import CardButton from './CardButton' interface StyleProps { diff --git a/packages/client/components/EditableOrgName.tsx b/packages/client/components/EditableOrgName.tsx index ec119c837b8..2bcde367f44 100644 --- a/packages/client/components/EditableOrgName.tsx +++ b/packages/client/components/EditableOrgName.tsx @@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' +import {EditableOrgName_organization$key} from '../__generated__/EditableOrgName_organization.graphql' import UpdateOrgMutation from '../mutations/UpdateOrgMutation' import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps' import Legitity from '../validation/Legitity' -import {EditableOrgName_organization$key} from '../__generated__/EditableOrgName_organization.graphql' import EditableText from './EditableText' interface Props extends WithMutationProps { diff --git a/packages/client/components/EditingStatus/EditingStatus.tsx b/packages/client/components/EditingStatus/EditingStatus.tsx index d1d989d22f2..34b89a41a0d 100644 --- a/packages/client/components/EditingStatus/EditingStatus.tsx +++ b/packages/client/components/EditingStatus/EditingStatus.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {ReactNode, useState} from 'react' import {useFragment} from 'react-relay' +import {EditingStatus_task$key} from '~/__generated__/EditingStatus_task.graphql' import {MenuPosition} from '~/hooks/useCoords' import useTooltip from '~/hooks/useTooltip' -import {EditingStatus_task$key} from '~/__generated__/EditingStatus_task.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import {UseTaskChild} from '../../hooks/useTaskChildFocus' import {PALETTE} from '../../styles/paletteV3' diff --git a/packages/client/components/EditorInputWrapper.tsx b/packages/client/components/EditorInputWrapper.tsx index f567636c02b..f1ac2701673 100644 --- a/packages/client/components/EditorInputWrapper.tsx +++ b/packages/client/components/EditorInputWrapper.tsx @@ -16,8 +16,8 @@ import entitizeText from '../utils/draftjs/entitizeText' import isAndroid from '../utils/draftjs/isAndroid' import isRichDraft from '../utils/draftjs/isRichDraft' import lazyPreload from '../utils/lazyPreload' -import blockStyleFn from './TaskEditor/blockStyleFn' import './TaskEditor/Draft.css' +import blockStyleFn from './TaskEditor/blockStyleFn' type Handlers = Pick< EditorProps, diff --git a/packages/client/components/EmailNotifications.tsx b/packages/client/components/EmailNotifications.tsx index bda786ac1f0..077bd47ea45 100644 --- a/packages/client/components/EmailNotifications.tsx +++ b/packages/client/components/EmailNotifications.tsx @@ -2,11 +2,11 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {EmailNotifications_viewer$key} from '../__generated__/EmailNotifications_viewer.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import ToggleSummaryEmailMutation from '../mutations/ToggleSummaryEmailMutation' import {PALETTE} from '../styles/paletteV3' -import {EmailNotifications_viewer$key} from '../__generated__/EmailNotifications_viewer.graphql' import Checkbox from './Checkbox' import StyledError from './StyledError' diff --git a/packages/client/components/EstimateDimensionColumn.tsx b/packages/client/components/EstimateDimensionColumn.tsx index da3c6360ca8..2bd2ae39fa1 100644 --- a/packages/client/components/EstimateDimensionColumn.tsx +++ b/packages/client/components/EstimateDimensionColumn.tsx @@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useMutationProps from '~/hooks/useMutationProps' +import {EstimateDimensionColumn_meeting$key} from '../__generated__/EstimateDimensionColumn_meeting.graphql' +import {EstimateDimensionColumn_stage$key} from '../__generated__/EstimateDimensionColumn_stage.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useIsInitializing from '../hooks/useIsInitializing' import useIsPokerVotingClosing from '../hooks/useIsPokerVotingClosing' import PokerResetDimensionMutation from '../mutations/PokerResetDimensionMutation' import SetPokerSpectateMutation from '../mutations/SetPokerSpectateMutation' import {PALETTE} from '../styles/paletteV3' -import {EstimateDimensionColumn_meeting$key} from '../__generated__/EstimateDimensionColumn_meeting.graphql' -import {EstimateDimensionColumn_stage$key} from '../__generated__/EstimateDimensionColumn_stage.graphql' import DeckActivityAvatars from './DeckActivityAvatars' import LinkButton from './LinkButton' import PokerActiveVoting from './PokerActiveVoting' diff --git a/packages/client/components/EstimatePhaseArea.tsx b/packages/client/components/EstimatePhaseArea.tsx index ca0e6a12d0d..2af1cfdf9ca 100644 --- a/packages/client/components/EstimatePhaseArea.tsx +++ b/packages/client/components/EstimatePhaseArea.tsx @@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {useRef} from 'react' import {useFragment} from 'react-relay' import SwipeableViews from 'react-swipeable-views' +import {EstimatePhaseArea_meeting$key} from '~/__generated__/EstimatePhaseArea_meeting.graphql' import useBreakpoint from '~/hooks/useBreakpoint' import useGotoStageId from '~/hooks/useGotoStageId' import {PALETTE} from '~/styles/paletteV3' import {Breakpoint} from '~/types/constEnums' -import {EstimatePhaseArea_meeting$key} from '~/__generated__/EstimatePhaseArea_meeting.graphql' import EstimateDimensionColumn from './EstimateDimensionColumn' import PokerCardDeck from './PokerCardDeck' diff --git a/packages/client/components/EstimatePhaseDiscussionDrawer.tsx b/packages/client/components/EstimatePhaseDiscussionDrawer.tsx index ab4aaf7d0a4..49d9b65a1b1 100644 --- a/packages/client/components/EstimatePhaseDiscussionDrawer.tsx +++ b/packages/client/components/EstimatePhaseDiscussionDrawer.tsx @@ -3,9 +3,9 @@ import {Close} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {EstimatePhaseDiscussionDrawer_meeting$key} from '~/__generated__/EstimatePhaseDiscussionDrawer_meeting.graphql' import {desktopSidebarShadow} from '~/styles/elevation' import {PALETTE} from '~/styles/paletteV3' -import {EstimatePhaseDiscussionDrawer_meeting$key} from '~/__generated__/EstimatePhaseDiscussionDrawer_meeting.graphql' import {BezierCurve, Breakpoint, DiscussionThreadEnum, ZIndex} from '../types/constEnums' import {DiscussionThreadables} from './DiscussionThreadList' import DiscussionThreadListEmptyState from './DiscussionThreadListEmptyState' diff --git a/packages/client/components/EventTypeFilterMenuItemLabel.tsx b/packages/client/components/EventTypeFilterMenuItemLabel.tsx index ed1e4ba0702..6455726166d 100644 --- a/packages/client/components/EventTypeFilterMenuItemLabel.tsx +++ b/packages/client/components/EventTypeFilterMenuItemLabel.tsx @@ -1,14 +1,14 @@ import React from 'react' +import {TimelineEventEnum} from '../__generated__/MyDashboardTimelineQuery.graphql' +import {FilterLabels} from '../types/constEnums' import { CUSTOMIZED_SVG, timelineEventTypeMenuIcons, timelineEventTypeMenuLabels } from '../utils/constants' -import TimelineEventTypeIcon from './TimelineEventTypeIcon' -import MenuItemLabel from './MenuItemLabel' -import {FilterLabels} from '../types/constEnums' -import {TimelineEventEnum} from '../__generated__/MyDashboardTimelineQuery.graphql' import CardsSVG from './CardsSVG' +import MenuItemLabel from './MenuItemLabel' +import TimelineEventTypeIcon from './TimelineEventTypeIcon' interface Props { eventType?: TimelineEventEnum diff --git a/packages/client/components/FacilitatorMenu.tsx b/packages/client/components/FacilitatorMenu.tsx index d712e2338d9..4a6322d4d26 100644 --- a/packages/client/components/FacilitatorMenu.tsx +++ b/packages/client/components/FacilitatorMenu.tsx @@ -1,13 +1,13 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {FacilitatorMenu_meeting$key} from '../__generated__/FacilitatorMenu_meeting.graphql' import Menu from '../components/Menu' import MenuItem from '../components/MenuItem' import MenuItemLabel from '../components/MenuItemLabel' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' import PromoteNewMeetingFacilitatorMutation from '../mutations/PromoteNewMeetingFacilitatorMutation' -import {FacilitatorMenu_meeting$key} from '../__generated__/FacilitatorMenu_meeting.graphql' interface Props { menuProps: MenuProps diff --git a/packages/client/components/GitHubFieldDimensionDropdown.tsx b/packages/client/components/GitHubFieldDimensionDropdown.tsx index 80b40d2ffdd..ddeae024e74 100644 --- a/packages/client/components/GitHubFieldDimensionDropdown.tsx +++ b/packages/client/components/GitHubFieldDimensionDropdown.tsx @@ -4,11 +4,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' +import {GitHubFieldDimensionDropdown_stage$key} from '../__generated__/GitHubFieldDimensionDropdown_stage.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import interpolateGitHubLabelTemplate from '../shared/interpolateGitHubLabelTemplate' import {SprintPokerDefaults} from '../types/constEnums' -import {GitHubFieldDimensionDropdown_stage$key} from '../__generated__/GitHubFieldDimensionDropdown_stage.graphql' import GitHubFieldMenu from './GitHubFieldMenu' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/GitHubFieldMenu.tsx b/packages/client/components/GitHubFieldMenu.tsx index a642ce69956..2d984a45bf8 100644 --- a/packages/client/components/GitHubFieldMenu.tsx +++ b/packages/client/components/GitHubFieldMenu.tsx @@ -3,6 +3,7 @@ import {Edit} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {GitHubFieldMenu_stage$key} from '../__generated__/GitHubFieldMenu_stage.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' import useModal from '../hooks/useModal' @@ -11,7 +12,6 @@ import textOverflow from '../styles/helpers/textOverflow' import {PALETTE} from '../styles/paletteV3' import {FONT_FAMILY} from '../styles/typographyV2' import {SprintPokerDefaults} from '../types/constEnums' -import {GitHubFieldMenu_stage$key} from '../__generated__/GitHubFieldMenu_stage.graphql' import EditGitHubLabelTemplateModal from './EditGitHubLabelTemplateModal' import FlatButton from './FlatButton' import Menu from './Menu' diff --git a/packages/client/components/GitHubRepoSearchFilterMenu.tsx b/packages/client/components/GitHubRepoSearchFilterMenu.tsx index b90b0412987..4ca35ff2cb5 100644 --- a/packages/client/components/GitHubRepoSearchFilterMenu.tsx +++ b/packages/client/components/GitHubRepoSearchFilterMenu.tsx @@ -1,16 +1,16 @@ -import React, {useMemo} from 'react' +import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' +import React, {useMemo} from 'react' import {useFragment} from 'react-relay' -import {MenuProps} from '../hooks/useMenu' import {GitHubRepoSearchFilterMenu_teamMember$key} from '../__generated__/GitHubRepoSearchFilterMenu_teamMember.graphql' import useGetRepoContributions from '../hooks/useGetRepoContributions' +import {MenuProps} from '../hooks/useMenu' import useSearchFilter from '../hooks/useSearchFilter' import Checkbox from './Checkbox' import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel' import Menu from './Menu' import MenuItem from './MenuItem' import MenuItemLabel from './MenuItemLabel' -import styled from '@emotion/styled' import {SearchMenuItem} from './SearchMenuItem' import TypeAheadLabel from './TypeAheadLabel' diff --git a/packages/client/components/GitHubScopingSearchBar.tsx b/packages/client/components/GitHubScopingSearchBar.tsx index 0aabdc3a9d0..422aaabbb41 100644 --- a/packages/client/components/GitHubScopingSearchBar.tsx +++ b/packages/client/components/GitHubScopingSearchBar.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {SprintPokerDefaults} from '../types/constEnums' import {GitHubScopingSearchBar_meeting$key} from '../__generated__/GitHubScopingSearchBar_meeting.graphql' +import {SprintPokerDefaults} from '../types/constEnums' import GitHubScopingSearchFilterToggle from './GitHubScopingSearchFilterToggle' import GitHubScopingSearchHistoryToggle from './GitHubScopingSearchHistoryToggle' import ScopingSearchBar from './ScopingSearchBar' diff --git a/packages/client/components/GitHubScopingSearchFilterMenu.tsx b/packages/client/components/GitHubScopingSearchFilterMenu.tsx index 122b4dff0e0..ae97624b714 100644 --- a/packages/client/components/GitHubScopingSearchFilterMenu.tsx +++ b/packages/client/components/GitHubScopingSearchFilterMenu.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {commitLocalUpdate, PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {GitHubScopingSearchFilterMenuQuery} from '../__generated__/GitHubScopingSearchFilterMenuQuery.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' import SearchQueryId from '../shared/gqlIds/SearchQueryId' import getReposFromQueryStr from '../utils/getReposFromQueryStr' -import {GitHubScopingSearchFilterMenuQuery} from '../__generated__/GitHubScopingSearchFilterMenuQuery.graphql' import GitHubRepoSearchFilterMenu from './GitHubRepoSearchFilterMenu' interface Props { diff --git a/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx b/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx index b8282b75508..c2fbf9b72eb 100644 --- a/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx +++ b/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' -import {MenuProps} from '../hooks/useMenu' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import githubScopingSearchFilterMenuQuery, { GitHubScopingSearchFilterMenuQuery } from '../__generated__/GitHubScopingSearchFilterMenuQuery.graphql' import {GitHubScopingSearchFilterMenuRoot_meeting$key} from '../__generated__/GitHubScopingSearchFilterMenuRoot_meeting.graphql' +import {MenuProps} from '../hooks/useMenu' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import GitHubScopingSearchFilterMenu from './GitHubScopingSearchFilterMenu' import MockFieldList from './MockFieldList' diff --git a/packages/client/components/GitHubScopingSearchFilterToggle.tsx b/packages/client/components/GitHubScopingSearchFilterToggle.tsx index b3512c66576..628522a6882 100644 --- a/packages/client/components/GitHubScopingSearchFilterToggle.tsx +++ b/packages/client/components/GitHubScopingSearchFilterToggle.tsx @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {GitHubScopingSearchFilterToggle_meeting$key} from '../__generated__/GitHubScopingSearchFilterToggle_meeting.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import lazyPreload from '../utils/lazyPreload' -import {GitHubScopingSearchFilterToggle_meeting$key} from '../__generated__/GitHubScopingSearchFilterToggle_meeting.graphql' import FilterButton from './FilterButton' const GitHubScopingSearchFilterMenuRoot = lazyPreload( diff --git a/packages/client/components/GitHubScopingSearchHistoryToggle.tsx b/packages/client/components/GitHubScopingSearchHistoryToggle.tsx index 32f010496c1..a88e6f124cb 100644 --- a/packages/client/components/GitHubScopingSearchHistoryToggle.tsx +++ b/packages/client/components/GitHubScopingSearchHistoryToggle.tsx @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' +import {GitHubScopingSearchHistoryToggle_meeting$key} from '../__generated__/GitHubScopingSearchHistoryToggle_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import PersistGitHubSearchQueryMutation from '../mutations/PersistGitHubSearchQueryMutation' import SearchQueryId from '../shared/gqlIds/SearchQueryId' -import {GitHubScopingSearchHistoryToggle_meeting$key} from '../__generated__/GitHubScopingSearchHistoryToggle_meeting.graphql' import ScopingSearchHistoryToggle from './ScopingSearchHistoryToggle' interface Props { diff --git a/packages/client/components/GitHubScopingSearchResults.tsx b/packages/client/components/GitHubScopingSearchResults.tsx index 27b11d2ea0f..fa1535989f3 100644 --- a/packages/client/components/GitHubScopingSearchResults.tsx +++ b/packages/client/components/GitHubScopingSearchResults.tsx @@ -3,6 +3,10 @@ import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} from 'react-relay' import MockScopingList from '~/modules/meeting/components/MockScopingList' +import {GitHubScopingSearchResultsPaginationQuery} from '../__generated__/GitHubScopingSearchResultsPaginationQuery.graphql' +import {GitHubScopingSearchResultsQuery} from '../__generated__/GitHubScopingSearchResultsQuery.graphql' +import {GitHubScopingSearchResults_meeting$key} from '../__generated__/GitHubScopingSearchResults_meeting.graphql' +import {GitHubScopingSearchResults_query$key} from '../__generated__/GitHubScopingSearchResults_query.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useGetUsedServiceTaskIds from '../hooks/useGetUsedServiceTaskIds' import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom' @@ -12,10 +16,6 @@ import {SprintPokerDefaults} from '../types/constEnums' import {GQLType} from '../types/generics' import getNonNullEdges from '../utils/getNonNullEdges' import {gitHubQueryValidation} from '../validation/gitHubQueryValidation' -import {GitHubScopingSearchResultsPaginationQuery} from '../__generated__/GitHubScopingSearchResultsPaginationQuery.graphql' -import {GitHubScopingSearchResultsQuery} from '../__generated__/GitHubScopingSearchResultsQuery.graphql' -import {GitHubScopingSearchResults_meeting$key} from '../__generated__/GitHubScopingSearchResults_meeting.graphql' -import {GitHubScopingSearchResults_query$key} from '../__generated__/GitHubScopingSearchResults_query.graphql' import Ellipsis from './Ellipsis/Ellipsis' import GitHubScopingSelectAllIssues from './GitHubScopingSelectAllIssues' import IntegrationScopingNoResults from './IntegrationScopingNoResults' diff --git a/packages/client/components/GitHubScopingSearchResultsRoot.tsx b/packages/client/components/GitHubScopingSearchResultsRoot.tsx index ee82dd8c69f..633cc125899 100644 --- a/packages/client/components/GitHubScopingSearchResultsRoot.tsx +++ b/packages/client/components/GitHubScopingSearchResultsRoot.tsx @@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' import MockScopingList from '~/modules/meeting/components/MockScopingList' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import githubScopingSearchResultsQuery, { GitHubScopingSearchResultsQuery } from '../__generated__/GitHubScopingSearchResultsQuery.graphql' import {GitHubScopingSearchResultsRoot_meeting$key} from '../__generated__/GitHubScopingSearchResultsRoot_meeting.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import GitHubScopingSearchResults from './GitHubScopingSearchResults' interface Props { meetingRef: GitHubScopingSearchResultsRoot_meeting$key diff --git a/packages/client/components/GitHubScopingSelectAllIssues.tsx b/packages/client/components/GitHubScopingSelectAllIssues.tsx index 2c9599eab2c..a7dd4f84321 100644 --- a/packages/client/components/GitHubScopingSelectAllIssues.tsx +++ b/packages/client/components/GitHubScopingSelectAllIssues.tsx @@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useUnusedRecords from '~/hooks/useUnusedRecords' +import {GitHubScopingSelectAllIssues_issues$key} from '../__generated__/GitHubScopingSelectAllIssues_issues.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation' @@ -10,7 +11,6 @@ import GitHubIssueId from '../shared/gqlIds/GitHubIssueId' import {PALETTE} from '../styles/paletteV3' import {Threshold} from '../types/constEnums' import getSelectAllTitle from '../utils/getSelectAllTitle' -import {GitHubScopingSelectAllIssues_issues$key} from '../__generated__/GitHubScopingSelectAllIssues_issues.graphql' import Checkbox from './Checkbox' const Item = styled('div')({ display: 'flex', diff --git a/packages/client/components/GitLabFieldDimensionDropdown.tsx b/packages/client/components/GitLabFieldDimensionDropdown.tsx index 5d094055128..23d874bfb39 100644 --- a/packages/client/components/GitLabFieldDimensionDropdown.tsx +++ b/packages/client/components/GitLabFieldDimensionDropdown.tsx @@ -4,10 +4,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' +import {GitLabFieldDimensionDropdown_stage$key} from '../__generated__/GitLabFieldDimensionDropdown_stage.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import {SprintPokerDefaults} from '../types/constEnums' -import {GitLabFieldDimensionDropdown_stage$key} from '../__generated__/GitLabFieldDimensionDropdown_stage.graphql' import GitLabFieldMenu from './GitLabFieldMenu' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/GitLabFieldMenu.tsx b/packages/client/components/GitLabFieldMenu.tsx index f8de17601ad..0fbdbc20a93 100644 --- a/packages/client/components/GitLabFieldMenu.tsx +++ b/packages/client/components/GitLabFieldMenu.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {GitLabFieldMenu_stage$key} from '../__generated__/GitLabFieldMenu_stage.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' import UpdateGitLabDimensionFieldMutation from '../mutations/UpdateGitLabDimensionFieldMutation' import {SprintPokerDefaults} from '../types/constEnums' -import {GitLabFieldMenu_stage$key} from '../__generated__/GitLabFieldMenu_stage.graphql' import Menu from './Menu' import MenuItem from './MenuItem' diff --git a/packages/client/components/GitLabScopingSearchFilterMenu.tsx b/packages/client/components/GitLabScopingSearchFilterMenu.tsx index b77a1360a4f..ce418c7370d 100644 --- a/packages/client/components/GitLabScopingSearchFilterMenu.tsx +++ b/packages/client/components/GitLabScopingSearchFilterMenu.tsx @@ -3,12 +3,12 @@ import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {commitLocalUpdate, PreloadedQuery, usePreloadedQuery} from 'react-relay' import useSearchFilter from '~/hooks/useSearchFilter' -import SendClientSideEvent from '~/utils/SendClientSideEvent' import getNonNullEdges from '~/utils/getNonNullEdges' +import SendClientSideEvent from '~/utils/SendClientSideEvent' +import {GitLabScopingSearchFilterMenuQuery} from '../__generated__/GitLabScopingSearchFilterMenuQuery.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' import SearchQueryId from '../shared/gqlIds/SearchQueryId' -import {GitLabScopingSearchFilterMenuQuery} from '../__generated__/GitLabScopingSearchFilterMenuQuery.graphql' import Checkbox from './Checkbox' import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel' import Menu from './Menu' diff --git a/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx b/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx index 17cfa84668b..3206a7635fe 100644 --- a/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx +++ b/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' -import {MenuProps} from '../hooks/useMenu' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import gitlabScopingSearchFilterMenuQuery, { GitLabScopingSearchFilterMenuQuery } from '../__generated__/GitLabScopingSearchFilterMenuQuery.graphql' import {GitLabScopingSearchFilterMenuRoot_meeting$key} from '../__generated__/GitLabScopingSearchFilterMenuRoot_meeting.graphql' +import {MenuProps} from '../hooks/useMenu' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import GitLabScopingSearchFilterMenu from './GitLabScopingSearchFilterMenu' import MockFieldList from './MockFieldList' diff --git a/packages/client/components/GitLabScopingSearchFilterToggle.tsx b/packages/client/components/GitLabScopingSearchFilterToggle.tsx index 645a483ce58..edc62152e21 100644 --- a/packages/client/components/GitLabScopingSearchFilterToggle.tsx +++ b/packages/client/components/GitLabScopingSearchFilterToggle.tsx @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {GitLabScopingSearchFilterToggle_meeting$key} from '../__generated__/GitLabScopingSearchFilterToggle_meeting.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import lazyPreload from '../utils/lazyPreload' -import {GitLabScopingSearchFilterToggle_meeting$key} from '../__generated__/GitLabScopingSearchFilterToggle_meeting.graphql' import FilterButton from './FilterButton' const GitLabScopingSearchFilterMenuRoot = lazyPreload( diff --git a/packages/client/components/GitLabScopingSearchResults.tsx b/packages/client/components/GitLabScopingSearchResults.tsx index 2aeb35f7a57..814509d5ce5 100644 --- a/packages/client/components/GitLabScopingSearchResults.tsx +++ b/packages/client/components/GitLabScopingSearchResults.tsx @@ -5,13 +5,13 @@ import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} f import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds' import useLoadNextOnScrollBottom from '~/hooks/useLoadNextOnScrollBottom' import MockScopingList from '~/modules/meeting/components/MockScopingList' -import GitLabIssueId from '../shared/gqlIds/GitLabIssueId' -import getNonNullEdges from '../utils/getNonNullEdges' -import {parseWebPath} from '../utils/parseWebPath' import {GitLabScopingSearchResultsPaginationQuery} from '../__generated__/GitLabScopingSearchResultsPaginationQuery.graphql' import {GitLabScopingSearchResultsQuery} from '../__generated__/GitLabScopingSearchResultsQuery.graphql' import {GitLabScopingSearchResults_meeting$key} from '../__generated__/GitLabScopingSearchResults_meeting.graphql' import {GitLabScopingSearchResults_query$key} from '../__generated__/GitLabScopingSearchResults_query.graphql' +import GitLabIssueId from '../shared/gqlIds/GitLabIssueId' +import getNonNullEdges from '../utils/getNonNullEdges' +import {parseWebPath} from '../utils/parseWebPath' import Ellipsis from './Ellipsis/Ellipsis' import GitLabScopingSelectAllIssues from './GitLabScopingSelectAllIssues' import IntegrationScopingNoResults from './IntegrationScopingNoResults' diff --git a/packages/client/components/GitLabScopingSearchResultsRoot.tsx b/packages/client/components/GitLabScopingSearchResultsRoot.tsx index 4fe626203db..b7fbf59efed 100644 --- a/packages/client/components/GitLabScopingSearchResultsRoot.tsx +++ b/packages/client/components/GitLabScopingSearchResultsRoot.tsx @@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' import MockScopingList from '~/modules/meeting/components/MockScopingList' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import gitlabScopingSearchResultsQuery, { GitLabScopingSearchResultsQuery } from '../__generated__/GitLabScopingSearchResultsQuery.graphql' import {GitLabScopingSearchResultsRoot_meeting$key} from '../__generated__/GitLabScopingSearchResultsRoot_meeting.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import GitLabScopingSearchResults from './GitLabScopingSearchResults' interface Props { diff --git a/packages/client/components/GitLabScopingSelectAllIssues.tsx b/packages/client/components/GitLabScopingSelectAllIssues.tsx index 1ad0082e02a..adb175f28a1 100644 --- a/packages/client/components/GitLabScopingSelectAllIssues.tsx +++ b/packages/client/components/GitLabScopingSelectAllIssues.tsx @@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useUnusedRecords from '~/hooks/useUnusedRecords' +import {GitLabScopingSelectAllIssues_issues$key} from '../__generated__/GitLabScopingSelectAllIssues_issues.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation' @@ -10,7 +11,6 @@ import GitLabIssueId from '../shared/gqlIds/GitLabIssueId' import {PALETTE} from '../styles/paletteV3' import {Threshold} from '../types/constEnums' import getSelectAllTitle from '../utils/getSelectAllTitle' -import {GitLabScopingSelectAllIssues_issues$key} from '../__generated__/GitLabScopingSelectAllIssues_issues.graphql' import Checkbox from './Checkbox' const Item = styled('div')({ diff --git a/packages/client/components/GoogleMeetProviderLogo.tsx b/packages/client/components/GoogleMeetProviderLogo.tsx index 42d6bc7ec2d..f2bd53e8516 100644 --- a/packages/client/components/GoogleMeetProviderLogo.tsx +++ b/packages/client/components/GoogleMeetProviderLogo.tsx @@ -1,5 +1,5 @@ -import logo from '../styles/theme/images/graphics/google-meet-icon.svg' import React from 'react' +import logo from '../styles/theme/images/graphics/google-meet-icon.svg' const GoogleMeetProviderLogo = () => { return ( diff --git a/packages/client/components/GroupingKanban.tsx b/packages/client/components/GroupingKanban.tsx index 92bb79644cd..e827bfe45b0 100644 --- a/packages/client/components/GroupingKanban.tsx +++ b/packages/client/components/GroupingKanban.tsx @@ -3,8 +3,8 @@ import {captureException} from '@sentry/minimal' import graphql from 'babel-plugin-relay/macro' import React, {RefObject, useEffect, useMemo, useRef, useState} from 'react' import {useFragment} from 'react-relay' -import useCallbackRef from '~/hooks/useCallbackRef' import {GroupingKanban_meeting$key} from '~/__generated__/GroupingKanban_meeting.graphql' +import useCallbackRef from '~/hooks/useCallbackRef' import useAnimatedSpotlightSource from '../hooks/useAnimatedSpotlightSource' import useBreakpoint from '../hooks/useBreakpoint' import useHideBodyScroll from '../hooks/useHideBodyScroll' @@ -14,8 +14,8 @@ import useThrottledEvent from '../hooks/useThrottledEvent' import {Breakpoint, Times} from '../types/constEnums' import PortalProvider from './AtmosphereProvider/PortalProvider' import GroupingKanbanColumn from './GroupingKanbanColumn' -import ReflectWrapperMobile from './RetroReflectPhase/ReflectionWrapperMobile' import ReflectWrapperDesktop from './RetroReflectPhase/ReflectWrapperDesktop' +import ReflectWrapperMobile from './RetroReflectPhase/ReflectionWrapperMobile' import SpotlightModal from './SpotlightModal' interface Props { diff --git a/packages/client/components/GroupingKanbanColumn.tsx b/packages/client/components/GroupingKanbanColumn.tsx index 025e3bc5d0f..575496872bd 100644 --- a/packages/client/components/GroupingKanbanColumn.tsx +++ b/packages/client/components/GroupingKanbanColumn.tsx @@ -2,13 +2,13 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {RefObject, useMemo, useRef} from 'react' import {useFragment} from 'react-relay' +import {GroupingKanbanColumn_meeting$key} from '~/__generated__/GroupingKanbanColumn_meeting.graphql' +import {GroupingKanbanColumn_prompt$key} from '~/__generated__/GroupingKanbanColumn_prompt.graphql' +import {GroupingKanbanColumn_reflectionGroups$key} from '~/__generated__/GroupingKanbanColumn_reflectionGroups.graphql' import {useCoverable} from '~/hooks/useControlBarCovers' import useDeepEqual from '~/hooks/useDeepEqual' import useSubColumns from '~/hooks/useSubColumns' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' -import {GroupingKanbanColumn_meeting$key} from '~/__generated__/GroupingKanbanColumn_meeting.graphql' -import {GroupingKanbanColumn_prompt$key} from '~/__generated__/GroupingKanbanColumn_prompt.graphql' -import {GroupingKanbanColumn_reflectionGroups$key} from '~/__generated__/GroupingKanbanColumn_reflectionGroups.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import CreateReflectionMutation from '../mutations/CreateReflectionMutation' diff --git a/packages/client/components/IconLabel.tsx b/packages/client/components/IconLabel.tsx index f1b9fe2ba5e..86025cb37c5 100644 --- a/packages/client/components/IconLabel.tsx +++ b/packages/client/components/IconLabel.tsx @@ -27,7 +27,7 @@ import { WebAsset, Widgets } from '@mui/icons-material' -import React, {forwardRef, ReactNode} from 'react' +import React, {ReactNode, forwardRef} from 'react' const LabelBlock = styled('div')({ alignItems: 'center', diff --git a/packages/client/components/Insights.tsx b/packages/client/components/Insights.tsx index fd2eb806331..b316c6d8995 100644 --- a/packages/client/components/Insights.tsx +++ b/packages/client/components/Insights.tsx @@ -4,8 +4,8 @@ import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' import SendClientSideEvent from '~/utils/SendClientSideEvent' -import {Elevation} from '../styles/elevation' import {InsightsQuery} from '../__generated__/InsightsQuery.graphql' +import {Elevation} from '../styles/elevation' import InsightsCharts from './InsightsCharts' import InsightsDomainPanel from './InsightsDomainPanel' import Panel from './Panel/Panel' diff --git a/packages/client/components/InsightsCharts.tsx b/packages/client/components/InsightsCharts.tsx index 1427e8ab5f3..9f3344de22b 100644 --- a/packages/client/components/InsightsCharts.tsx +++ b/packages/client/components/InsightsCharts.tsx @@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro' import { BarElement, CategoryScale, - Chart as ChartJS, ChartData, ChartDataset, + Chart as ChartJS, ChartOptions, Filler, Legend, - LinearScale, LineElement, + LinearScale, PointElement, SubTitle, TimeScale, @@ -23,14 +23,14 @@ import 'chartjs-adapter-dayjs-3' import React, {useMemo} from 'react' import {Bar, Line} from 'react-chartjs-2' import {useFragment} from 'react-relay' -import {Elevation} from '../styles/elevation' -import {PALETTE} from '../styles/paletteV3' -import {FONT_FAMILY} from '../styles/typographyV2' -import {ElementWidth} from '../types/constEnums' import { InsightsCharts_domain$key, MeetingTypeEnum } from '../__generated__/InsightsCharts_domain.graphql' +import {Elevation} from '../styles/elevation' +import {PALETTE} from '../styles/paletteV3' +import {FONT_FAMILY} from '../styles/typographyV2' +import {ElementWidth} from '../types/constEnums' ChartJS.register( BarElement, diff --git a/packages/client/components/InsightsDomainNudge.tsx b/packages/client/components/InsightsDomainNudge.tsx index 6e8c33a69c4..8256f31f4f2 100644 --- a/packages/client/components/InsightsDomainNudge.tsx +++ b/packages/client/components/InsightsDomainNudge.tsx @@ -5,12 +5,12 @@ import {useFragment} from 'react-relay' import {useHistory} from 'react-router' import useAtmosphere from '~/hooks/useAtmosphere' import SendClientSideEvent from '~/utils/SendClientSideEvent' +import {InsightsDomainNudge_domain$key} from '../__generated__/InsightsDomainNudge_domain.graphql' import useModal from '../hooks/useModal' import CreditCardModal from '../modules/userDashboard/components/CreditCardModal/CreditCardModal' import {PALETTE} from '../styles/paletteV3' -import {InsightsDomainNudge_domain$key} from '../__generated__/InsightsDomainNudge_domain.graphql' -import PrimaryButton from './PrimaryButton' import LimitExceededWarning from './LimitExceededWarning' +import PrimaryButton from './PrimaryButton' const NudgeBlock = styled('div')({ display: 'flex', diff --git a/packages/client/components/InsightsDomainPanel.tsx b/packages/client/components/InsightsDomainPanel.tsx index 0a4aa68b309..b612cc56a46 100644 --- a/packages/client/components/InsightsDomainPanel.tsx +++ b/packages/client/components/InsightsDomainPanel.tsx @@ -3,6 +3,7 @@ import {Info} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {InsightsDomainPanel_domain$key} from '../__generated__/InsightsDomainPanel_domain.graphql' import useBreakpoint from '../hooks/useBreakpoint' import {MenuPosition} from '../hooks/useCoords' import useTooltip from '../hooks/useTooltip' @@ -10,7 +11,6 @@ import {Elevation} from '../styles/elevation' import {PALETTE} from '../styles/paletteV3' import {Breakpoint} from '../types/constEnums' import plural from '../utils/plural' -import {InsightsDomainPanel_domain$key} from '../__generated__/InsightsDomainPanel_domain.graphql' import InsightsDomainNudge from './InsightsDomainNudge' import Panel from './Panel/Panel' diff --git a/packages/client/components/InsightsRoot.tsx b/packages/client/components/InsightsRoot.tsx index 9fcf5b3f9cf..70a1e4f7d2f 100644 --- a/packages/client/components/InsightsRoot.tsx +++ b/packages/client/components/InsightsRoot.tsx @@ -1,6 +1,6 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import insightsQuery, {InsightsQuery} from '../__generated__/InsightsQuery.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import Insights from './Insights' const InsightsRoot = () => { diff --git a/packages/client/components/InvitationLinkDialog.tsx b/packages/client/components/InvitationLinkDialog.tsx index 98059adbc17..55755069b6d 100644 --- a/packages/client/components/InvitationLinkDialog.tsx +++ b/packages/client/components/InvitationLinkDialog.tsx @@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {useFragment} from 'react-relay' import {RouteComponentProps, withRouter} from 'react-router' +import {InvitationLinkDialog_massInvitation$key} from '../__generated__/InvitationLinkDialog_massInvitation.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useRouter from '../hooks/useRouter' import {LocalStorageKey} from '../types/constEnums' -import {InvitationLinkDialog_massInvitation$key} from '../__generated__/InvitationLinkDialog_massInvitation.graphql' import InvitationLinkAuthentication from './InvitationLinkAuthentication' import InvitationLinkErrorExpired from './InvitationLinkErrorExpired' import TeamInvitationAccept from './TeamInvitationAccept' diff --git a/packages/client/components/InvitationLinkErrorExpired.tsx b/packages/client/components/InvitationLinkErrorExpired.tsx index 95dee14f41c..b0dc095cc1e 100644 --- a/packages/client/components/InvitationLinkErrorExpired.tsx +++ b/packages/client/components/InvitationLinkErrorExpired.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {InvitationLinkErrorExpired_massInvitation$key} from '../__generated__/InvitationLinkErrorExpired_massInvitation.graphql' import useDocumentTitle from '../hooks/useDocumentTitle' import useRouter from '../hooks/useRouter' import hasToken from '../utils/hasToken' -import {InvitationLinkErrorExpired_massInvitation$key} from '../__generated__/InvitationLinkErrorExpired_massInvitation.graphql' import DialogContent from './DialogContent' import DialogTitle from './DialogTitle' import FlatPrimaryButton from './FlatPrimaryButton' diff --git a/packages/client/components/InviteTeamMemberAvatar.tsx b/packages/client/components/InviteTeamMemberAvatar.tsx index 210a9df7e77..028f6303716 100644 --- a/packages/client/components/InviteTeamMemberAvatar.tsx +++ b/packages/client/components/InviteTeamMemberAvatar.tsx @@ -4,8 +4,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' -import useModal from '../hooks/useModal' import {InviteTeamMemberAvatar_teamMembers$key} from '../__generated__/InviteTeamMemberAvatar_teamMembers.graphql' +import useModal from '../hooks/useModal' import AddTeamMemberModal from './AddTeamMemberModal' const Label = styled('div')({ diff --git a/packages/client/components/JiraFieldDimensionDropdown.tsx b/packages/client/components/JiraFieldDimensionDropdown.tsx index bebcc387482..d1e464823ad 100644 --- a/packages/client/components/JiraFieldDimensionDropdown.tsx +++ b/packages/client/components/JiraFieldDimensionDropdown.tsx @@ -4,10 +4,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' +import {JiraFieldDimensionDropdown_stage$key} from '../__generated__/JiraFieldDimensionDropdown_stage.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import {SprintPokerDefaults} from '../types/constEnums' -import {JiraFieldDimensionDropdown_stage$key} from '../__generated__/JiraFieldDimensionDropdown_stage.graphql' import JiraFieldMenu from './JiraFieldMenu' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/JiraFieldMenu.tsx b/packages/client/components/JiraFieldMenu.tsx index 7c1cd5b86a9..b2b6c3fef32 100644 --- a/packages/client/components/JiraFieldMenu.tsx +++ b/packages/client/components/JiraFieldMenu.tsx @@ -3,13 +3,13 @@ import {OpenInNew} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {useFragment} from 'react-relay' +import {JiraFieldMenu_stage$key} from '../__generated__/JiraFieldMenu_stage.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' -import SendClientSideEvent from '../utils/SendClientSideEvent' import UpdateJiraDimensionFieldMutation from '../mutations/UpdateJiraDimensionFieldMutation' import {PALETTE} from '../styles/paletteV3' import {ExternalLinks, SprintPokerDefaults} from '../types/constEnums' -import {JiraFieldMenu_stage$key} from '../__generated__/JiraFieldMenu_stage.graphql' +import SendClientSideEvent from '../utils/SendClientSideEvent' import Menu from './Menu' import MenuItem from './MenuItem' import MenuItemHR from './MenuItemHR' diff --git a/packages/client/components/JiraScopingSearchCurrentFilters.tsx b/packages/client/components/JiraScopingSearchCurrentFilters.tsx index bf0aac0f84a..d04ecfe050b 100644 --- a/packages/client/components/JiraScopingSearchCurrentFilters.tsx +++ b/packages/client/components/JiraScopingSearchCurrentFilters.tsx @@ -2,8 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {PALETTE} from '../styles/paletteV3' import {JiraScopingSearchCurrentFilters_meeting$key} from '../__generated__/JiraScopingSearchCurrentFilters_meeting.graphql' +import {PALETTE} from '../styles/paletteV3' const Wrapper = styled('div')({ width: '100%', diff --git a/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx b/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx index a37f7260d55..f6a5bceb690 100644 --- a/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx +++ b/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useLazyLoadQuery} from 'react-relay' -import {MenuProps} from '../hooks/useMenu' import {JiraScopingSearchFilterMenuRootQuery} from '../__generated__/JiraScopingSearchFilterMenuRootQuery.graphql' +import {MenuProps} from '../hooks/useMenu' import JiraScopingSearchFilterMenu from './JiraScopingSearchFilterMenu' const query = graphql` diff --git a/packages/client/components/JiraScopingSearchFilterToggle.tsx b/packages/client/components/JiraScopingSearchFilterToggle.tsx index 31b331b548a..35c2ee567db 100644 --- a/packages/client/components/JiraScopingSearchFilterToggle.tsx +++ b/packages/client/components/JiraScopingSearchFilterToggle.tsx @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {JiraScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraScopingSearchFilterToggle_meeting.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import lazyPreload from '../utils/lazyPreload' -import {JiraScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraScopingSearchFilterToggle_meeting.graphql' import FilterButton from './FilterButton' const JiraScopingSearchFilterMenuRoot = lazyPreload( diff --git a/packages/client/components/JiraScopingSearchResults.tsx b/packages/client/components/JiraScopingSearchResults.tsx index d0ebffff5ac..23aa7e914d9 100644 --- a/packages/client/components/JiraScopingSearchResults.tsx +++ b/packages/client/components/JiraScopingSearchResults.tsx @@ -1,12 +1,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' -import {useFragment, PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay' import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds' -import useAtmosphere from '../hooks/useAtmosphere' -import PersistJiraSearchQueryMutation from '../mutations/PersistJiraSearchQueryMutation' import {JiraScopingSearchResultsQuery} from '../__generated__/JiraScopingSearchResultsQuery.graphql' import {JiraScopingSearchResults_meeting$key} from '../__generated__/JiraScopingSearchResults_meeting.graphql' +import useAtmosphere from '../hooks/useAtmosphere' +import PersistJiraSearchQueryMutation from '../mutations/PersistJiraSearchQueryMutation' import IntegrationScopingNoResults from './IntegrationScopingNoResults' import JiraScopingSelectAllIssues from './JiraScopingSelectAllIssues' import NewIntegrationRecordButton from './NewIntegrationRecordButton' diff --git a/packages/client/components/JiraScopingSearchResultsRoot.tsx b/packages/client/components/JiraScopingSearchResultsRoot.tsx index 52e7a4a86d8..640d792ed18 100644 --- a/packages/client/components/JiraScopingSearchResultsRoot.tsx +++ b/packages/client/components/JiraScopingSearchResultsRoot.tsx @@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' import MockScopingList from '~/modules/meeting/components/MockScopingList' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import jiraScopingSearchResultsQuery, { JiraScopingSearchResultsQuery } from '../__generated__/JiraScopingSearchResultsQuery.graphql' import {JiraScopingSearchResultsRoot_meeting$key} from '../__generated__/JiraScopingSearchResultsRoot_meeting.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import ErrorBoundary from './ErrorBoundary' import JiraScopingSearchResults from './JiraScopingSearchResults' diff --git a/packages/client/components/JiraScopingSelectAllIssues.tsx b/packages/client/components/JiraScopingSelectAllIssues.tsx index bbba141580e..ade3b46aa16 100644 --- a/packages/client/components/JiraScopingSelectAllIssues.tsx +++ b/packages/client/components/JiraScopingSelectAllIssues.tsx @@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useUnusedRecords from '~/hooks/useUnusedRecords' +import {JiraScopingSelectAllIssues_issues$key} from '../__generated__/JiraScopingSelectAllIssues_issues.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation' import {PALETTE} from '../styles/paletteV3' import {Threshold} from '../types/constEnums' import getSelectAllTitle from '../utils/getSelectAllTitle' -import {JiraScopingSelectAllIssues_issues$key} from '../__generated__/JiraScopingSelectAllIssues_issues.graphql' import Checkbox from './Checkbox' const Item = styled('div')({ diff --git a/packages/client/components/JiraServerFieldDimensionDropdown.tsx b/packages/client/components/JiraServerFieldDimensionDropdown.tsx index abeb881c8bf..1c2315517d1 100644 --- a/packages/client/components/JiraServerFieldDimensionDropdown.tsx +++ b/packages/client/components/JiraServerFieldDimensionDropdown.tsx @@ -3,11 +3,11 @@ import {ExpandMore} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {JiraServerFieldDimensionDropdown_stage$key} from '../__generated__/JiraServerFieldDimensionDropdown_stage.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import {PALETTE} from '../styles/paletteV3' import {SprintPokerDefaults} from '../types/constEnums' -import {JiraServerFieldDimensionDropdown_stage$key} from '../__generated__/JiraServerFieldDimensionDropdown_stage.graphql' import JiraServerFieldMenu from './JiraServerFieldMenu' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/JiraServerFieldMenu.tsx b/packages/client/components/JiraServerFieldMenu.tsx index 890a42da3cc..ec14af8f755 100644 --- a/packages/client/components/JiraServerFieldMenu.tsx +++ b/packages/client/components/JiraServerFieldMenu.tsx @@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' +import {JiraServerFieldMenu_stage$key} from '../__generated__/JiraServerFieldMenu_stage.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' import UpdateJiraServerDimensionFieldMutation from '../mutations/UpdateJiraServerDimensionFieldMutation' import {SprintPokerDefaults} from '../types/constEnums' -import {JiraServerFieldMenu_stage$key} from '../__generated__/JiraServerFieldMenu_stage.graphql' import Menu from './Menu' import MenuItem from './MenuItem' import MenuItemHR from './MenuItemHR' diff --git a/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx b/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx index ece8b0fc04b..05937171331 100644 --- a/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx +++ b/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useLazyLoadQuery} from 'react-relay' -import {MenuProps} from '../hooks/useMenu' import {JiraServerScopingSearchFilterMenuRootQuery} from '../__generated__/JiraServerScopingSearchFilterMenuRootQuery.graphql' +import {MenuProps} from '../hooks/useMenu' import JiraScopingSearchFilterMenu from './JiraScopingSearchFilterMenu' const query = graphql` diff --git a/packages/client/components/JiraServerScopingSearchFilterToggle.tsx b/packages/client/components/JiraServerScopingSearchFilterToggle.tsx index 434ec2a7534..35f85ef0944 100644 --- a/packages/client/components/JiraServerScopingSearchFilterToggle.tsx +++ b/packages/client/components/JiraServerScopingSearchFilterToggle.tsx @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {JiraServerScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraServerScopingSearchFilterToggle_meeting.graphql' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import lazyPreload from '../utils/lazyPreload' -import {JiraServerScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraServerScopingSearchFilterToggle_meeting.graphql' import FilterButton from './FilterButton' const JiraServerScopingSearchFilterMenuRoot = lazyPreload( diff --git a/packages/client/components/JiraServerScopingSearchResults.tsx b/packages/client/components/JiraServerScopingSearchResults.tsx index a324a9cf1ab..cbb680f5ca3 100644 --- a/packages/client/components/JiraServerScopingSearchResults.tsx +++ b/packages/client/components/JiraServerScopingSearchResults.tsx @@ -4,13 +4,13 @@ import React, {useState} from 'react' import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} from 'react-relay' import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds' import MockScopingList from '~/modules/meeting/components/MockScopingList' -import useAtmosphere from '../hooks/useAtmosphere' -import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom' -import PersistJiraServerSearchQueryMutation from '../mutations/PersistJiraServerSearchQueryMutation' import {JiraServerScopingSearchResultsPaginationQuery} from '../__generated__/JiraServerScopingSearchResultsPaginationQuery.graphql' import {JiraServerScopingSearchResultsQuery} from '../__generated__/JiraServerScopingSearchResultsQuery.graphql' import {JiraServerScopingSearchResults_meeting$key} from '../__generated__/JiraServerScopingSearchResults_meeting.graphql' import {JiraServerScopingSearchResults_query$key} from '../__generated__/JiraServerScopingSearchResults_query.graphql' +import useAtmosphere from '../hooks/useAtmosphere' +import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom' +import PersistJiraServerSearchQueryMutation from '../mutations/PersistJiraServerSearchQueryMutation' import Ellipsis from './Ellipsis/Ellipsis' import IntegrationScopingNoResults from './IntegrationScopingNoResults' import NewIntegrationRecordButton from './NewIntegrationRecordButton' diff --git a/packages/client/components/JiraServerScopingSearchResultsRoot.tsx b/packages/client/components/JiraServerScopingSearchResultsRoot.tsx index 847e501c55f..5c0bfe0cc8d 100644 --- a/packages/client/components/JiraServerScopingSearchResultsRoot.tsx +++ b/packages/client/components/JiraServerScopingSearchResultsRoot.tsx @@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' import MockScopingList from '~/modules/meeting/components/MockScopingList' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import jiraServerScopingSearchResultsQuery, { JiraServerScopingSearchResultsQuery } from '../__generated__/JiraServerScopingSearchResultsQuery.graphql' import {JiraServerScopingSearchResultsRoot_meeting$key} from '../__generated__/JiraServerScopingSearchResultsRoot_meeting.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import JiraServerScopingSearchResults from './JiraServerScopingSearchResults' interface Props { diff --git a/packages/client/components/KudosReceivedNotification.tsx b/packages/client/components/KudosReceivedNotification.tsx index a9cc11ba396..8215f304e6b 100644 --- a/packages/client/components/KudosReceivedNotification.tsx +++ b/packages/client/components/KudosReceivedNotification.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' -import {Link} from 'react-router-dom' import React, {useEffect} from 'react' import {useFragment} from 'react-relay' +import {Link} from 'react-router-dom' import {KudosReceivedNotification_notification$key} from '~/__generated__/KudosReceivedNotification_notification.graphql' -import NotificationTemplate from './NotificationTemplate' import useAtmosphere from '../hooks/useAtmosphere' -import SendClientSideEvent from '../utils/SendClientSideEvent' import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg' +import SendClientSideEvent from '../utils/SendClientSideEvent' +import NotificationTemplate from './NotificationTemplate' interface Props { notification: KudosReceivedNotification_notification$key diff --git a/packages/client/components/LimitExceededWarning.tsx b/packages/client/components/LimitExceededWarning.tsx index 4dfa1285be4..e52bc3b6d8a 100644 --- a/packages/client/components/LimitExceededWarning.tsx +++ b/packages/client/components/LimitExceededWarning.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {LimitExceededWarning_organization$key} from '../__generated__/LimitExceededWarning_organization.graphql' import {PALETTE} from '../styles/paletteV3' import {Threshold} from '../types/constEnums' import relativeDate from '../utils/date/relativeDate' -import {LimitExceededWarning_organization$key} from '../__generated__/LimitExceededWarning_organization.graphql' const WarningMsg = styled('div')({ background: PALETTE.GOLD_100, diff --git a/packages/client/components/MassInvitationTokenLink.tsx b/packages/client/components/MassInvitationTokenLink.tsx index 92c3ff1f04a..235f8aca58a 100644 --- a/packages/client/components/MassInvitationTokenLink.tsx +++ b/packages/client/components/MassInvitationTokenLink.tsx @@ -5,13 +5,13 @@ import React, {useEffect} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import useMutationProps from '~/hooks/useMutationProps' import CreateMassInvitationMutation from '~/mutations/CreateMassInvitationMutation' +import {MassInvitationTokenLinkQuery} from '../__generated__/MassInvitationTokenLinkQuery.graphql' import useAtmosphere from '../hooks/useAtmosphere' import CopyShortLink from '../modules/meeting/components/CopyShortLink/CopyShortLink' -import SendClientSideEvent from '../utils/SendClientSideEvent' import {PALETTE} from '../styles/paletteV3' import {Threshold} from '../types/constEnums' +import SendClientSideEvent from '../utils/SendClientSideEvent' import getMassInvitationUrl from '../utils/getMassInvitationUrl' -import {MassInvitationTokenLinkQuery} from '../__generated__/MassInvitationTokenLinkQuery.graphql' const StyledCopyShortLink = styled(CopyShortLink)({ borderRadius: 4, diff --git a/packages/client/components/MassInvitationTokenLinkRoot.tsx b/packages/client/components/MassInvitationTokenLinkRoot.tsx index a41250451fc..9d82a7160f3 100644 --- a/packages/client/components/MassInvitationTokenLinkRoot.tsx +++ b/packages/client/components/MassInvitationTokenLinkRoot.tsx @@ -1,8 +1,8 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import massInvitationTokenLinkQuery, { MassInvitationTokenLinkQuery } from '../__generated__/MassInvitationTokenLinkQuery.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import MassInvitationTokenLink from './MassInvitationTokenLink' interface Props { diff --git a/packages/client/components/MeetingCard.tsx b/packages/client/components/MeetingCard.tsx index e68a61dfc90..52cbfc61416 100644 --- a/packages/client/components/MeetingCard.tsx +++ b/packages/client/components/MeetingCard.tsx @@ -1,6 +1,7 @@ import styled from '@emotion/styled' import * as Sentry from '@sentry/browser' import graphql from 'babel-plugin-relay/macro' +import clsx from 'clsx' import React from 'react' import {useFragment} from 'react-relay' import {Link} from 'react-router-dom' @@ -8,11 +9,13 @@ import action from '../../../static/images/illustrations/action.png' import retrospective from '../../../static/images/illustrations/retrospective.png' import poker from '../../../static/images/illustrations/sprintPoker.png' import teamPrompt from '../../../static/images/illustrations/teamPrompt.png' +import {MeetingCard_meeting$key} from '../__generated__/MeetingCard_meeting.graphql' import useAnimatedCard from '../hooks/useAnimatedCard' import useBreakpoint from '../hooks/useBreakpoint' import {MenuPosition} from '../hooks/useCoords' import useMeetingMemberAvatars from '../hooks/useMeetingMemberAvatars' import useMenu from '../hooks/useMenu' +import useModal from '../hooks/useModal' import useTooltip from '../hooks/useTooltip' import {TransitionStatus} from '../hooks/useTransition' import {Elevation} from '../styles/elevation' @@ -20,15 +23,12 @@ import {PALETTE} from '../styles/paletteV3' import {BezierCurve, Breakpoint, Card, ElementWidth} from '../types/constEnums' import getMeetingPhase from '../utils/getMeetingPhase' import {phaseLabelLookup} from '../utils/meetings/lookups' -import {MeetingCard_meeting$key} from '../__generated__/MeetingCard_meeting.graphql' import AvatarList from './AvatarList' import CardButton from './CardButton' import IconLabel from './IconLabel' import MeetingCardOptionsMenuRoot from './MeetingCardOptionsMenuRoot' -import useModal from '../hooks/useModal' import {EndRecurringMeetingModal} from './Recurrence/EndRecurringMeetingModal' import {UpdateRecurrenceSettingsModal} from './Recurrence/UpdateRecurrenceSettingsModal' -import clsx from 'clsx' const CardWrapper = styled('div')<{ maybeTabletPlus: boolean diff --git a/packages/client/components/MeetingCardOptionsMenu.tsx b/packages/client/components/MeetingCardOptionsMenu.tsx index a8e64c969f4..1937602413f 100644 --- a/packages/client/components/MeetingCardOptionsMenu.tsx +++ b/packages/client/components/MeetingCardOptionsMenu.tsx @@ -11,12 +11,12 @@ import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' import useMutationProps from '~/hooks/useMutationProps' import useRouter from '~/hooks/useRouter' +import {MeetingCardOptionsMenuQuery} from '../__generated__/MeetingCardOptionsMenuQuery.graphql' import {MenuProps} from '../hooks/useMenu' -import SendClientSideEvent from '../utils/SendClientSideEvent' import {PALETTE} from '../styles/paletteV3' +import SendClientSideEvent from '../utils/SendClientSideEvent' import getMassInvitationUrl from '../utils/getMassInvitationUrl' import makeAppURL from '../utils/makeAppURL' -import {MeetingCardOptionsMenuQuery} from '../__generated__/MeetingCardOptionsMenuQuery.graphql' import Menu from './Menu' import MenuItem from './MenuItem' import {MenuItemLabelStyle} from './MenuItemLabel' diff --git a/packages/client/components/MeetingCardOptionsMenuRoot.tsx b/packages/client/components/MeetingCardOptionsMenuRoot.tsx index e38c53b8163..379734f6603 100644 --- a/packages/client/components/MeetingCardOptionsMenuRoot.tsx +++ b/packages/client/components/MeetingCardOptionsMenuRoot.tsx @@ -1,9 +1,9 @@ import React, {Suspense} from 'react' -import {MenuProps} from '../hooks/useMenu' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import meetingCardOptionsMenuQuery, { MeetingCardOptionsMenuQuery } from '../__generated__/MeetingCardOptionsMenuQuery.graphql' +import {MenuProps} from '../hooks/useMenu' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import MeetingCardOptionsMenu from './MeetingCardOptionsMenu' interface Props { diff --git a/packages/client/components/MeetingControlBar.tsx b/packages/client/components/MeetingControlBar.tsx index 9453836abb7..59f4d98bffa 100644 --- a/packages/client/components/MeetingControlBar.tsx +++ b/packages/client/components/MeetingControlBar.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useRef} from 'react' import {useFragment} from 'react-relay' +import {MeetingControlBar_meeting$key} from '~/__generated__/MeetingControlBar_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useBreakpoint from '~/hooks/useBreakpoint' import {useCovering} from '~/hooks/useControlBarCovers' @@ -15,10 +16,9 @@ import {PALETTE} from '~/styles/paletteV3' import {BezierCurve, Breakpoint, ElementWidth, ZIndex} from '~/types/constEnums' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' import findStageAfterId from '~/utils/meetings/findStageAfterId' -import {MeetingControlBar_meeting$key} from '~/__generated__/MeetingControlBar_meeting.graphql' +import {NewMeetingPhaseTypeEnum} from '../__generated__/MeetingControlBar_meeting.graphql' import useClickConfirmation from '../hooks/useClickConfirmation' import {bottomBarShadow, desktopBarShadow} from '../styles/elevation' -import {NewMeetingPhaseTypeEnum} from '../__generated__/MeetingControlBar_meeting.graphql' import BottomControlBarReady from './BottomControlBarReady' import BottomControlBarRejoin from './BottomControlBarRejoin' import BottomControlBarTips from './BottomControlBarTips' diff --git a/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx b/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx index af76ab6ba2a..09127c5d22d 100644 --- a/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx +++ b/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx @@ -1,12 +1,12 @@ -import React, {forwardRef} from 'react' import graphql from 'babel-plugin-relay/macro' +import React, {forwardRef} from 'react' import {useFragment} from 'react-relay' +import {TeamHealthHelpMenu_stage$key} from '~/__generated__/TeamHealthHelpMenu_stage.graphql' import useClientSideTrack from '../../hooks/useClientSideTrack' import {phaseLabelLookup} from '../../utils/meetings/lookups' import HelpMenuContent from './HelpMenuContent' import HelpMenuCopy from './HelpMenuCopy' import HelpMenuHeader from './HelpMenuHeader' -import {TeamHealthHelpMenu_stage$key} from '~/__generated__/TeamHealthHelpMenu_stage.graphql' interface Props { stageRef: TeamHealthHelpMenu_stage$key diff --git a/packages/client/components/MeetingLockedOverlay.tsx b/packages/client/components/MeetingLockedOverlay.tsx index 362423a6fb2..cf35d279cea 100644 --- a/packages/client/components/MeetingLockedOverlay.tsx +++ b/packages/client/components/MeetingLockedOverlay.tsx @@ -6,10 +6,10 @@ import {useFragment} from 'react-relay' import {MeetingLockedOverlay_meeting$key} from '~/__generated__/MeetingLockedOverlay_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useRouter from '../hooks/useRouter' -import SendClientSideEvent from '../utils/SendClientSideEvent' import {modalShadow} from '../styles/elevation' import {PALETTE} from '../styles/paletteV3' import {Radius} from '../types/constEnums' +import SendClientSideEvent from '../utils/SendClientSideEvent' import PrimaryButton from './PrimaryButton' interface Props { diff --git a/packages/client/components/MeetingOptions.tsx b/packages/client/components/MeetingOptions.tsx index 0c39571d8d7..17fef02c6c3 100644 --- a/packages/client/components/MeetingOptions.tsx +++ b/packages/client/components/MeetingOptions.tsx @@ -1,12 +1,12 @@ +import SwapHorizIcon from '@mui/icons-material/SwapHoriz' import React, {useState} from 'react' -import IconLabel from './IconLabel' import {Menu} from '../ui/Menu/Menu' import {MenuItem} from '../ui/Menu/MenuItem' -import SwapHorizIcon from '@mui/icons-material/SwapHoriz' -import {OptionsButton} from './TeamPrompt/TeamPromptOptions' import {Tooltip} from '../ui/Tooltip/Tooltip' -import {TooltipTrigger} from '../ui/Tooltip/TooltipTrigger' import {TooltipContent} from '../ui/Tooltip/TooltipContent' +import {TooltipTrigger} from '../ui/Tooltip/TooltipTrigger' +import IconLabel from './IconLabel' +import {OptionsButton} from './TeamPrompt/TeamPromptOptions' type Props = { setShowDrawer: (showDrawer: boolean) => void diff --git a/packages/client/components/MeetingRoot.tsx b/packages/client/components/MeetingRoot.tsx index 5e3db73d2c4..a545a877fff 100644 --- a/packages/client/components/MeetingRoot.tsx +++ b/packages/client/components/MeetingRoot.tsx @@ -1,9 +1,9 @@ import React, {Suspense, useEffect} from 'react' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' -import useRouter from '../hooks/useRouter' import meetingSelectorQuery, { MeetingSelectorQuery } from '../__generated__/MeetingSelectorQuery.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' +import useRouter from '../hooks/useRouter' import MeetingSelector from './MeetingSelector' const MeetingRoot = () => { diff --git a/packages/client/components/MeetingSelector.tsx b/packages/client/components/MeetingSelector.tsx index b313a081927..f7913daba10 100644 --- a/packages/client/components/MeetingSelector.tsx +++ b/packages/client/components/MeetingSelector.tsx @@ -1,16 +1,16 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' -import {Redirect} from 'react-router' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {Redirect} from 'react-router' import useAtmosphere from '~/hooks/useAtmosphere' import SetAppLocationMutation from '~/mutations/SetAppLocationMutation' +import {MeetingSelectorQuery} from '../__generated__/MeetingSelectorQuery.graphql' import useSubscription from '../hooks/useSubscription' import NotificationSubscription from '../subscriptions/NotificationSubscription' import OrganizationSubscription from '../subscriptions/OrganizationSubscription' import TaskSubscription from '../subscriptions/TaskSubscription' import TeamSubscription from '../subscriptions/TeamSubscription' import lazyPreload from '../utils/lazyPreload' -import {MeetingSelectorQuery} from '../__generated__/MeetingSelectorQuery.graphql' interface Props { meetingId: string diff --git a/packages/client/components/MeetingSeriesRoot.tsx b/packages/client/components/MeetingSeriesRoot.tsx index 7c2c1b0c8f6..00a8c5b3fce 100644 --- a/packages/client/components/MeetingSeriesRoot.tsx +++ b/packages/client/components/MeetingSeriesRoot.tsx @@ -1,10 +1,10 @@ import React, {Suspense} from 'react' import {Redirect} from 'react-router' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' -import useRouter from '../hooks/useRouter' import meetingSeriesRedirectorQuery, { MeetingSeriesRedirectorQuery } from '../__generated__/MeetingSeriesRedirectorQuery.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' +import useRouter from '../hooks/useRouter' import MeetingSeriesRedirector from './MeetingSeriesRedirector' const MeetingRoot = () => { diff --git a/packages/client/components/MeetingStageTimeLimitEnd.tsx b/packages/client/components/MeetingStageTimeLimitEnd.tsx index 16757c6580a..e4a431fcab9 100644 --- a/packages/client/components/MeetingStageTimeLimitEnd.tsx +++ b/packages/client/components/MeetingStageTimeLimitEnd.tsx @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import NotificationAction from '~/components/NotificationAction' -import useRouter from '../hooks/useRouter' import {MeetingStageTimeLimitEnd_notification$key} from '../__generated__/MeetingStageTimeLimitEnd_notification.graphql' +import useRouter from '../hooks/useRouter' import NotificationTemplate from './NotificationTemplate' interface Props { diff --git a/packages/client/components/MeetingTopBar.tsx b/packages/client/components/MeetingTopBar.tsx index 287a53012b4..f8768749365 100644 --- a/packages/client/components/MeetingTopBar.tsx +++ b/packages/client/components/MeetingTopBar.tsx @@ -8,8 +8,8 @@ import isDemoRoute from '../utils/isDemoRoute' import makeMinWidthMediaQuery from '../utils/makeMinWidthMediaQuery' import DemoCreateAccountButton from './DemoCreateAccountButton' import PlainButton from './PlainButton/PlainButton' -import SidebarToggle from './SidebarToggle' import RetroDrawerRoot from './RetroDrawerRoot' +import SidebarToggle from './SidebarToggle' const localHeaderBreakpoint = makeMinWidthMediaQuery(600) diff --git a/packages/client/components/MeetingsDash.tsx b/packages/client/components/MeetingsDash.tsx index e92e3c5db81..7faf932e1b6 100644 --- a/packages/client/components/MeetingsDash.tsx +++ b/packages/client/components/MeetingsDash.tsx @@ -3,20 +3,20 @@ import graphql from 'babel-plugin-relay/macro' import React, {RefObject, useMemo} from 'react' import {useFragment} from 'react-relay' import {MeetingsDash_viewer$key} from '~/__generated__/MeetingsDash_viewer.graphql' +import useAtmosphere from '../hooks/useAtmosphere' import useBreakpoint from '../hooks/useBreakpoint' import useCardsPerRow from '../hooks/useCardsPerRow' import useDocumentTitle from '../hooks/useDocumentTitle' import useTransition from '../hooks/useTransition' import {Breakpoint, EmptyMeetingViewMessage, Layout} from '../types/constEnums' import getSafeRegex from '../utils/getSafeRegex' +import {useQueryParameterParser} from '../utils/useQueryParameterParser' import DemoMeetingCard from './DemoMeetingCard' import MeetingCard from './MeetingCard' import MeetingsDashEmpty from './MeetingsDashEmpty' import MeetingsDashHeader from './MeetingsDashHeader' import StartMeetingFAB from './StartMeetingFAB' import TutorialMeetingCard from './TutorialMeetingCard' -import {useQueryParameterParser} from '../utils/useQueryParameterParser' -import useAtmosphere from '../hooks/useAtmosphere' interface Props { meetingsDashRef: RefObject diff --git a/packages/client/components/MeetingsDashEmpty.tsx b/packages/client/components/MeetingsDashEmpty.tsx index 6fcb45cf877..617e9588b3b 100644 --- a/packages/client/components/MeetingsDashEmpty.tsx +++ b/packages/client/components/MeetingsDashEmpty.tsx @@ -1,10 +1,10 @@ import styled from '@emotion/styled' import React from 'react' import {Link} from 'react-router-dom' +import {commitLocalUpdate} from 'relay-runtime' import {Breakpoint} from '~/types/constEnums' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' import Atmosphere from '../Atmosphere' -import {commitLocalUpdate} from 'relay-runtime' import useAtmosphere from '../hooks/useAtmosphere' const maybeTabletPlusMediaQuery = makeMinWidthMediaQuery(Breakpoint.FUZZY_TABLET) diff --git a/packages/client/components/MeetingsDashHeader.tsx b/packages/client/components/MeetingsDashHeader.tsx index 20c98397fcb..df2ee10887e 100644 --- a/packages/client/components/MeetingsDashHeader.tsx +++ b/packages/client/components/MeetingsDashHeader.tsx @@ -1,16 +1,16 @@ import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {useFragment} from 'react-relay' +import {MeetingsDashHeader_viewer$key} from '../__generated__/MeetingsDashHeader_viewer.graphql' +import useAtmosphere from '../hooks/useAtmosphere' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import {FilterLabels} from '../types/constEnums' import lazyPreload from '../utils/lazyPreload' -import {MeetingsDashHeader_viewer$key} from '../__generated__/MeetingsDashHeader_viewer.graphql' +import {useQueryParameterParser} from '../utils/useQueryParameterParser' +import DashFilterToggle from './DashFilterToggle/DashFilterToggle' import DashSectionControls from './Dashboard/DashSectionControls' import DashSectionHeader from './Dashboard/DashSectionHeader' -import DashFilterToggle from './DashFilterToggle/DashFilterToggle' -import {useQueryParameterParser} from '../utils/useQueryParameterParser' -import useAtmosphere from '../hooks/useAtmosphere' const TeamFilterMenu = lazyPreload( () => diff --git a/packages/client/components/Mentioned.tsx b/packages/client/components/Mentioned.tsx index f298f3f3056..e22a97c40ba 100644 --- a/packages/client/components/Mentioned.tsx +++ b/packages/client/components/Mentioned.tsx @@ -1,15 +1,15 @@ import graphql from 'babel-plugin-relay/macro' +import {Editor} from 'draft-js' import React, {useEffect} from 'react' import {useFragment} from 'react-relay' import NotificationAction from '~/components/NotificationAction' -import useRouter from '../hooks/useRouter' -import {Mentioned_notification$key} from '../__generated__/Mentioned_notification.graphql' -import NotificationTemplate from './NotificationTemplate' -import SendClientSideEvent from '../utils/SendClientSideEvent' import useAtmosphere from '~/hooks/useAtmosphere' import anonymousAvatar from '~/styles/theme/images/anonymous-avatar.svg' +import {Mentioned_notification$key} from '../__generated__/Mentioned_notification.graphql' import useEditorState from '../hooks/useEditorState' -import {Editor} from 'draft-js' +import useRouter from '../hooks/useRouter' +import SendClientSideEvent from '../utils/SendClientSideEvent' +import NotificationTemplate from './NotificationTemplate' interface Props { notification: Mentioned_notification$key diff --git a/packages/client/components/MicrosoftOAuthButtonBlock.tsx b/packages/client/components/MicrosoftOAuthButtonBlock.tsx index 160c074955b..ec75bfb7532 100644 --- a/packages/client/components/MicrosoftOAuthButtonBlock.tsx +++ b/packages/client/components/MicrosoftOAuthButtonBlock.tsx @@ -1,14 +1,14 @@ import styled from '@emotion/styled' +import clsx from 'clsx' import React from 'react' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import useRouter from '../hooks/useRouter' +import logo from '../styles/theme/images/graphics/microsoft.svg' import MicrosoftClientManager from '../utils/MicrosoftClientManager' +import RaisedButton from './RaisedButton' import StyledError from './StyledError' import StyledTip from './StyledTip' -import logo from '../styles/theme/images/graphics/microsoft.svg' -import RaisedButton from './RaisedButton' -import clsx from 'clsx' interface Props { invitationToken?: string diff --git a/packages/client/components/MyDashboardTasksAndHeader.tsx b/packages/client/components/MyDashboardTasksAndHeader.tsx index 7cbcbfeef36..8ea14d366bd 100644 --- a/packages/client/components/MyDashboardTasksAndHeader.tsx +++ b/packages/client/components/MyDashboardTasksAndHeader.tsx @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {MyDashboardTasksAndHeaderQuery} from '../__generated__/MyDashboardTasksAndHeaderQuery.graphql' import UserTasksHeader from '../modules/userDashboard/components/UserTasksHeader/UserTasksHeader' import UserColumnsContainer from '../modules/userDashboard/containers/UserColumns/UserColumnsContainer' -import {MyDashboardTasksAndHeaderQuery} from '../__generated__/MyDashboardTasksAndHeaderQuery.graphql' interface Props { queryRef: PreloadedQuery diff --git a/packages/client/components/MyDashboardTasksRoot.tsx b/packages/client/components/MyDashboardTasksRoot.tsx index a5804a1d267..2477a161c90 100644 --- a/packages/client/components/MyDashboardTasksRoot.tsx +++ b/packages/client/components/MyDashboardTasksRoot.tsx @@ -1,11 +1,11 @@ import React, {Suspense} from 'react' import {useQueryParameterParser} from '~/utils/useQueryParameterParser' -import useAtmosphere from '../hooks/useAtmosphere' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' -import UserTasksHeader from '../modules/userDashboard/components/UserTasksHeader/UserTasksHeader' import myDashboardTasksAndHeaderQuery, { MyDashboardTasksAndHeaderQuery } from '../__generated__/MyDashboardTasksAndHeaderQuery.graphql' +import useAtmosphere from '../hooks/useAtmosphere' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' +import UserTasksHeader from '../modules/userDashboard/components/UserTasksHeader/UserTasksHeader' import ErrorBoundary from './ErrorBoundary' import MyDashboardTasksAndHeader from './MyDashboardTasksAndHeader' diff --git a/packages/client/components/MyDashboardTimeline.tsx b/packages/client/components/MyDashboardTimeline.tsx index 6b3240cf5d0..ad676f9c819 100644 --- a/packages/client/components/MyDashboardTimeline.tsx +++ b/packages/client/components/MyDashboardTimeline.tsx @@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import useDocumentTitle from '~/hooks/useDocumentTitle' -import {DashTimeline} from '../types/constEnums' import {MyDashboardTimelineQuery} from '../__generated__/MyDashboardTimelineQuery.graphql' +import {DashTimeline} from '../types/constEnums' import ErrorBoundary from './ErrorBoundary' import TimelineFeedList from './TimelineFeedList' +import TimelineHeader from './TimelineHeader' import TimelineLoadingEvents from './TimelineLoadingEvents' import TimelineRightDrawer from './TimelineRightDrawer' import TimelineSuggestedAction from './TimelineSuggestedAction' -import TimelineHeader from './TimelineHeader' interface Props { queryRef: PreloadedQuery diff --git a/packages/client/components/MyDashboardTimelineRoot.tsx b/packages/client/components/MyDashboardTimelineRoot.tsx index 382a6b20703..22e519e36a8 100644 --- a/packages/client/components/MyDashboardTimelineRoot.tsx +++ b/packages/client/components/MyDashboardTimelineRoot.tsx @@ -1,11 +1,11 @@ import React, {Suspense} from 'react' -import useAtmosphere from '../hooks/useAtmosphere' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import myDashboardTimelineQuery, { MyDashboardTimelineQuery } from '../__generated__/MyDashboardTimelineQuery.graphql' -import MyDashboardTimeline from './MyDashboardTimeline' +import useAtmosphere from '../hooks/useAtmosphere' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import {useQueryParameterParser} from '../utils/useQueryParameterParser' +import MyDashboardTimeline from './MyDashboardTimeline' const MyDashboardTimelineRoot = () => { const atmosphere = useAtmosphere() diff --git a/packages/client/components/NewAzureIssueInput.tsx b/packages/client/components/NewAzureIssueInput.tsx index 85fbe4e350f..323f93e026a 100644 --- a/packages/client/components/NewAzureIssueInput.tsx +++ b/packages/client/components/NewAzureIssueInput.tsx @@ -3,6 +3,7 @@ import {ExpandMore} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {FormEvent, useEffect, useRef, useState} from 'react' import {useFragment} from 'react-relay' +import {NewAzureIssueInput_viewer$key} from '~/__generated__/NewAzureIssueInput_viewer.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import {MenuPosition} from '~/hooks/useCoords' import useMenu from '~/hooks/useMenu' @@ -10,7 +11,7 @@ import useMutationProps from '~/hooks/useMutationProps' import CreateTaskMutation from '~/mutations/CreateTaskMutation' import AzureDevOpsProjectId from '~/shared/gqlIds/AzureDevOpsProjectId' import {PALETTE} from '~/styles/paletteV3' -import {NewAzureIssueInput_viewer$key} from '~/__generated__/NewAzureIssueInput_viewer.graphql' +import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql' import useForm from '../hooks/useForm' import {PortalStatus} from '../hooks/usePortal' import useTimedState from '../hooks/useTimedState' @@ -18,7 +19,6 @@ import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation' import {CompletedHandler} from '../types/relayMutations' import convertToTaskContent from '../utils/draftjs/convertToTaskContent' import Legitity from '../validation/Legitity' -import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql' import Checkbox from './Checkbox' import NewAzureIssueMenu from './NewAzureIssueMenu' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/NewGitHubIssueInput.tsx b/packages/client/components/NewGitHubIssueInput.tsx index 53d649aa027..a9be74bcf2f 100644 --- a/packages/client/components/NewGitHubIssueInput.tsx +++ b/packages/client/components/NewGitHubIssueInput.tsx @@ -3,14 +3,15 @@ import {ExpandMore} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {FormEvent, useEffect, useRef, useState} from 'react' import {useFragment} from 'react-relay' +import {NewGitHubIssueInput_meeting$key} from '~/__generated__/NewGitHubIssueInput_meeting.graphql' +import {NewGitHubIssueInput_viewer$key} from '~/__generated__/NewGitHubIssueInput_viewer.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import {MenuPosition} from '~/hooks/useCoords' import useGetRepoContributions from '~/hooks/useGetRepoContributions' import useMenu from '~/hooks/useMenu' import useMutationProps from '~/hooks/useMutationProps' import {PALETTE} from '~/styles/paletteV3' -import {NewGitHubIssueInput_meeting$key} from '~/__generated__/NewGitHubIssueInput_meeting.graphql' -import {NewGitHubIssueInput_viewer$key} from '~/__generated__/NewGitHubIssueInput_viewer.graphql' +import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql' import useForm from '../hooks/useForm' import {PortalStatus} from '../hooks/usePortal' import useTimedState from '../hooks/useTimedState' @@ -20,7 +21,6 @@ import GitHubIssueId from '../shared/gqlIds/GitHubIssueId' import {CompletedHandler} from '../types/relayMutations' import convertToTaskContent from '../utils/draftjs/convertToTaskContent' import Legitity from '../validation/Legitity' -import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql' import Checkbox from './Checkbox' import NewGitHubIssueMenu from './NewGitHubIssueMenu' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/NewGitLabIssueInput.tsx b/packages/client/components/NewGitLabIssueInput.tsx index 0169acdeca5..140c5f314dc 100644 --- a/packages/client/components/NewGitLabIssueInput.tsx +++ b/packages/client/components/NewGitLabIssueInput.tsx @@ -3,13 +3,14 @@ import {ExpandMore} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {FormEvent, useEffect, useRef, useState} from 'react' import {useFragment} from 'react-relay' +import {NewGitLabIssueInput_viewer$key} from '~/__generated__/NewGitLabIssueInput_viewer.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import {MenuPosition} from '~/hooks/useCoords' import useMenu from '~/hooks/useMenu' import useMutationProps from '~/hooks/useMutationProps' import {PALETTE} from '~/styles/paletteV3' import getNonNullEdges from '~/utils/getNonNullEdges' -import {NewGitLabIssueInput_viewer$key} from '~/__generated__/NewGitLabIssueInput_viewer.graphql' +import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql' import useForm from '../hooks/useForm' import {PortalStatus} from '../hooks/usePortal' import useTimedState from '../hooks/useTimedState' @@ -18,7 +19,6 @@ import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation' import {CompletedHandler} from '../types/relayMutations' import convertToTaskContent from '../utils/draftjs/convertToTaskContent' import Legitity from '../validation/Legitity' -import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql' import Checkbox from './Checkbox' import NewGitLabIssueMenu from './NewGitLabIssueMenu' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/NewJiraIssueInput.tsx b/packages/client/components/NewJiraIssueInput.tsx index 4f9ad22c1aa..d904a5cc2d9 100644 --- a/packages/client/components/NewJiraIssueInput.tsx +++ b/packages/client/components/NewJiraIssueInput.tsx @@ -8,6 +8,8 @@ import {MenuPosition} from '~/hooks/useCoords' import useMenu from '~/hooks/useMenu' import useMutationProps from '~/hooks/useMutationProps' import {PALETTE} from '~/styles/paletteV3' +import {NewJiraIssueInput_meeting$key} from '../__generated__/NewJiraIssueInput_meeting.graphql' +import {NewJiraIssueInput_viewer$key} from '../__generated__/NewJiraIssueInput_viewer.graphql' import useForm from '../hooks/useForm' import {PortalStatus} from '../hooks/usePortal' import useTimedState from '../hooks/useTimedState' @@ -18,8 +20,6 @@ import JiraProjectId from '../shared/gqlIds/JiraProjectId' import {CompletedHandler} from '../types/relayMutations' import convertToTaskContent from '../utils/draftjs/convertToTaskContent' import Legitity from '../validation/Legitity' -import {NewJiraIssueInput_meeting$key} from '../__generated__/NewJiraIssueInput_meeting.graphql' -import {NewJiraIssueInput_viewer$key} from '../__generated__/NewJiraIssueInput_viewer.graphql' import Checkbox from './Checkbox' import NewJiraIssueMenu from './NewJiraIssueMenu' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/NewMeetingActions.tsx b/packages/client/components/NewMeetingActions.tsx index 9b557d1e5a2..9ee965291a5 100644 --- a/packages/client/components/NewMeetingActions.tsx +++ b/packages/client/components/NewMeetingActions.tsx @@ -4,8 +4,8 @@ import React, {useEffect} from 'react' import {useFragment} from 'react-relay' import {NewMeetingActions_team$key} from '~/__generated__/NewMeetingActions_team.graphql' import useAtmosphere from '../hooks/useAtmosphere' -import SendClientSideEvent from '../utils/SendClientSideEvent' import {Breakpoint, Threshold} from '../types/constEnums' +import SendClientSideEvent from '../utils/SendClientSideEvent' import FlatPrimaryButton from './FlatPrimaryButton' import NewMeetingActionsCurrentMeetings from './NewMeetingActionsCurrentMeetings' import StyledError from './StyledError' diff --git a/packages/client/components/NewMeetingActionsCurrentMeetings.tsx b/packages/client/components/NewMeetingActionsCurrentMeetings.tsx index af6f2fb4840..59708912872 100644 --- a/packages/client/components/NewMeetingActionsCurrentMeetings.tsx +++ b/packages/client/components/NewMeetingActionsCurrentMeetings.tsx @@ -3,12 +3,12 @@ import {Forum} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {NewMeetingActionsCurrentMeetings_team$key} from '~/__generated__/NewMeetingActionsCurrentMeetings_team.graphql' import {MenuPosition} from '~/hooks/useCoords' import useMenu from '~/hooks/useMenu' import useSnacksForNewMeetings from '~/hooks/useSnacksForNewMeetings' import {PALETTE} from '~/styles/paletteV3' import plural from '~/utils/plural' -import {NewMeetingActionsCurrentMeetings_team$key} from '~/__generated__/NewMeetingActionsCurrentMeetings_team.graphql' import FlatButton from './FlatButton' import SelectMeetingDropdown from './SelectMeetingDropdown' diff --git a/packages/client/components/NewMeetingCheckIn.tsx b/packages/client/components/NewMeetingCheckIn.tsx index c90652753c6..9ca9869724a 100644 --- a/packages/client/components/NewMeetingCheckIn.tsx +++ b/packages/client/components/NewMeetingCheckIn.tsx @@ -3,8 +3,8 @@ import {RecordVoiceOver} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {ReactElement} from 'react' import {useFragment} from 'react-relay' -import useGotoStageId from '~/hooks/useGotoStageId' import {NewMeetingCheckIn_meeting$key} from '~/__generated__/NewMeetingCheckIn_meeting.graphql' +import useGotoStageId from '~/hooks/useGotoStageId' import useAtmosphere from '../hooks/useAtmosphere' import NewMeetingCheckInPrompt from '../modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt' import MeetingFacilitationHint from '../modules/meeting/components/MeetingFacilitationHint/MeetingFacilitationHint' diff --git a/packages/client/components/NewMeetingSettings.tsx b/packages/client/components/NewMeetingSettings.tsx deleted file mode 100644 index 26993d5e365..00000000000 --- a/packages/client/components/NewMeetingSettings.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql' -import {NewMeetingSettings_selectedTeam$key} from '~/__generated__/NewMeetingSettings_selectedTeam.graphql' -import NewMeetingSettingsAction from './NewMeetingSettingsAction' -import NewMeetingSettingsPoker from './NewMeetingSettingsPoker' -import NewMeetingSettingsRetrospective from './NewMeetingSettingsRetrospective' -import NewMeetingSettingsTeamPrompt from './NewMeetingSettingsTeamPrompt' - -interface Props { - meetingType: MeetingTypeEnum - selectedTeamRef: NewMeetingSettings_selectedTeam$key -} - -const settingsLookup = { - action: NewMeetingSettingsAction, - retrospective: NewMeetingSettingsRetrospective, - poker: NewMeetingSettingsPoker, - teamPrompt: NewMeetingSettingsTeamPrompt -} - -const NewMeetingSettings = (props: Props) => { - const {meetingType, selectedTeamRef} = props - const selectedTeam = useFragment( - graphql` - fragment NewMeetingSettings_selectedTeam on Team { - ...NewMeetingSettingsRetrospective_team - ...NewMeetingSettingsAction_team - ...NewMeetingSettingsPoker_team - ...NewMeetingSettingsTeamPrompt_team - id - } - `, - selectedTeamRef - ) - - const Settings = settingsLookup[meetingType] - return -} - -export default NewMeetingSettings diff --git a/packages/client/components/NewMeetingSettingsAction.tsx b/packages/client/components/NewMeetingSettingsAction.tsx deleted file mode 100644 index db7e1a75d88..00000000000 --- a/packages/client/components/NewMeetingSettingsAction.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import {NewMeetingSettingsAction_team$key} from '../__generated__/NewMeetingSettingsAction_team.graphql' -import NewMeetingSettingsToggleCheckIn from './NewMeetingSettingsToggleCheckIn' - -interface Props { - teamRef: NewMeetingSettingsAction_team$key -} - -const NewMeetingSettingsAction = (props: Props) => { - const {teamRef} = props - const team = useFragment( - graphql` - fragment NewMeetingSettingsAction_team on Team { - actionSettings: meetingSettings(meetingType: action) { - ...NewMeetingSettingsToggleCheckIn_settings - } - } - `, - teamRef - ) - const {actionSettings} = team - return -} - -export default NewMeetingSettingsAction diff --git a/packages/client/components/NewMeetingSettingsPoker.tsx b/packages/client/components/NewMeetingSettingsPoker.tsx deleted file mode 100644 index f546a8cd65a..00000000000 --- a/packages/client/components/NewMeetingSettingsPoker.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import {NewMeetingSettingsPoker_team$key} from '~/__generated__/NewMeetingSettingsPoker_team.graphql' -import PokerTemplatePicker from '../modules/meeting/components/PokerTemplatePicker' -import NewMeetingSettingsToggleCheckIn from './NewMeetingSettingsToggleCheckIn' - -interface Props { - teamRef: NewMeetingSettingsPoker_team$key -} - -const NewMeetingSettingsPoker = (props: Props) => { - const {teamRef} = props - const team = useFragment( - graphql` - fragment NewMeetingSettingsPoker_team on Team { - pokerSettings: meetingSettings(meetingType: poker) { - ...PokerTemplatePicker_settings - ...NewMeetingSettingsToggleCheckIn_settings - } - } - `, - teamRef - ) - const {pokerSettings} = team - return ( - <> - - - - ) -} - -export default NewMeetingSettingsPoker diff --git a/packages/client/components/NewMeetingSettingsRetrospective.tsx b/packages/client/components/NewMeetingSettingsRetrospective.tsx deleted file mode 100644 index 75f1d3ab983..00000000000 --- a/packages/client/components/NewMeetingSettingsRetrospective.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import {NewMeetingSettingsRetrospective_team$key} from '~/__generated__/NewMeetingSettingsRetrospective_team.graphql' -import RetroTemplatePicker from '../modules/meeting/components/RetroTemplatePicker' -import NewMeetingSettingsRetrospectiveSettings from './NewMeetingSettingsRetrospectiveSettings' - -interface Props { - teamRef: NewMeetingSettingsRetrospective_team$key -} - -const NewMeetingSettingsRetrospective = (props: Props) => { - const {teamRef} = props - const team = useFragment( - graphql` - fragment NewMeetingSettingsRetrospective_team on Team { - ...NewMeetingSettingsRetrospectiveSettings_team - retroSettings: meetingSettings(meetingType: retrospective) { - ...RetroTemplatePicker_settings - } - organization { - ...NewMeetingSettingsRetrospectiveSettings_organization - } - } - `, - teamRef - ) - const {organization} = team - const {retroSettings} = team - return ( - <> - - - - ) -} - -export default NewMeetingSettingsRetrospective diff --git a/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx b/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx deleted file mode 100644 index 36f569d2723..00000000000 --- a/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx +++ /dev/null @@ -1,96 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import {NewMeetingSettingsRetrospectiveSettings_team$key} from '~/__generated__/NewMeetingSettingsRetrospectiveSettings_team.graphql' -import {NewMeetingSettingsRetrospectiveSettings_organization$key} from '~/__generated__/NewMeetingSettingsRetrospectiveSettings_organization.graphql' -import {MenuPosition} from '../hooks/useCoords' -import useMenu from '../hooks/useMenu' -import {PortalStatus} from '../hooks/usePortal' -import NewMeetingDropdown from './NewMeetingDropdown' -import NewMeetingSettingsToggleAnonymity from './NewMeetingSettingsToggleAnonymity' -import NewMeetingSettingsToggleCheckIn from './NewMeetingSettingsToggleCheckIn' -import NewMeetingSettingsToggleTranscription from './NewMeetingSettingsToggleTranscription' -import NewMeetingSettingsToggleTeamHealth from './NewMeetingSettingsToggleTeamHealth' - -const NewMeetingSettingsToggleCheckInMenuEntry = styled(NewMeetingSettingsToggleCheckIn)({ - background: 'none', - borderRadius: 0 -}) - -const NewMeetingSettingsToggleTeamHealthMenuEntry = styled(NewMeetingSettingsToggleTeamHealth)({ - background: 'none', - borderRadius: 0 -}) - -const NewMeetingSettingsToggleAnonymityMenuEntry = styled(NewMeetingSettingsToggleAnonymity)({ - background: 'none', - borderRadius: 0 -}) - -interface Props { - teamRef: NewMeetingSettingsRetrospectiveSettings_team$key - organizationRef: NewMeetingSettingsRetrospectiveSettings_organization$key -} - -const NewMeetingSettingsRetrospectiveSettings = (props: Props) => { - const {teamRef, organizationRef} = props - const {togglePortal, menuPortal, originRef, menuProps, portalStatus} = useMenu( - MenuPosition.LOWER_RIGHT, - { - isDropdown: true - } - ) - - const team = useFragment( - graphql` - fragment NewMeetingSettingsRetrospectiveSettings_team on Team { - ...NewMeetingSettingsToggleTeamHealth_team - retroSettings: meetingSettings(meetingType: retrospective) { - ...NewMeetingSettingsToggleCheckIn_settings - ...NewMeetingSettingsToggleTeamHealth_settings - ...NewMeetingSettingsToggleAnonymity_settings - ...NewMeetingSettingsToggleTranscription_settings - } - } - `, - teamRef - ) - const {retroSettings} = team - - const organization = useFragment( - graphql` - fragment NewMeetingSettingsRetrospectiveSettings_organization on Organization { - featureFlags { - zoomTranscription - } - } - `, - organizationRef - ) - const {zoomTranscription} = organization.featureFlags - - return ( - <> - - {menuPortal( -
- - - - {zoomTranscription && ( - - )} -
- )} - - ) -} - -export default NewMeetingSettingsRetrospectiveSettings diff --git a/packages/client/components/NewMeetingSettingsTeamPrompt.tsx b/packages/client/components/NewMeetingSettingsTeamPrompt.tsx deleted file mode 100644 index 0d396e4fa9f..00000000000 --- a/packages/client/components/NewMeetingSettingsTeamPrompt.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import graphql from 'babel-plugin-relay/macro' -import {useFragment} from 'react-relay' -import {NewMeetingSettingsTeamPrompt_team$key} from '../__generated__/NewMeetingSettingsTeamPrompt_team.graphql' - -interface Props { - teamRef: NewMeetingSettingsTeamPrompt_team$key -} - -const NewMeetingSettingsTeamPrompt = (props: Props) => { - const {teamRef} = props - useFragment( - graphql` - fragment NewMeetingSettingsTeamPrompt_team on Team { - teamPromptSettings: meetingSettings(meetingType: teamPrompt) { - id - } - } - `, - teamRef - ) - - return null -} -export default NewMeetingSettingsTeamPrompt diff --git a/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx b/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx index 94c295c9fa6..542938fd461 100644 --- a/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx +++ b/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx @@ -4,14 +4,14 @@ import React from 'react' import {useFragment} from 'react-relay' import {NewMeetingSettingsToggleTeamHealth_settings$key} from '~/__generated__/NewMeetingSettingsToggleTeamHealth_settings.graphql' import {NewMeetingSettingsToggleTeamHealth_team$key} from '~/__generated__/NewMeetingSettingsToggleTeamHealth_team.graphql' -import isTeamHealthAvailable from '../utils/features/isTeamHealthAvailable' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import SetMeetingSettingsMutation from '../mutations/SetMeetingSettingsMutation' import {PALETTE} from '../styles/paletteV3' +import isTeamHealthAvailable from '../utils/features/isTeamHealthAvailable' import Checkbox from './Checkbox' -import PlainButton from './PlainButton/PlainButton' import NewMeetingSettingsUpgradeForTeamHealth from './NewMeetingSettingsUpgradeForTeamHealth' +import PlainButton from './PlainButton/PlainButton' const ButtonRow = styled(PlainButton)({ background: PALETTE.SLATE_200, diff --git a/packages/client/components/NewMeetingSettingsToggleTranscription.tsx b/packages/client/components/NewMeetingSettingsToggleTranscription.tsx index 4f3c9a48f36..92ed4edba81 100644 --- a/packages/client/components/NewMeetingSettingsToggleTranscription.tsx +++ b/packages/client/components/NewMeetingSettingsToggleTranscription.tsx @@ -1,5 +1,4 @@ import styled from '@emotion/styled' -import StyledError from './StyledError' import DeleteIcon from '@mui/icons-material/Delete' import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' @@ -15,6 +14,7 @@ import Legitity from '../validation/Legitity' import Checkbox from './Checkbox' import FlatButton from './FlatButton' import PlainButton from './PlainButton/PlainButton' +import StyledError from './StyledError' const ButtonRow = styled(PlainButton)({ background: PALETTE.SLATE_200, diff --git a/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx b/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx index c354a0ed63f..2149ebf098e 100644 --- a/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx +++ b/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx @@ -1,13 +1,13 @@ +import styled from '@emotion/styled' +import {Lock} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {NewMeetingSettingsUpgradeForTeamHealth_team$key} from '~/__generated__/NewMeetingSettingsUpgradeForTeamHealth_team.graphql' -import PlainButton from './PlainButton/PlainButton' -import {Lock} from '@mui/icons-material' -import SendClientSideEvent from '../utils/SendClientSideEvent' import useAtmosphere from '../hooks/useAtmosphere' -import styled from '@emotion/styled' import {PALETTE} from '../styles/paletteV3' +import SendClientSideEvent from '../utils/SendClientSideEvent' +import PlainButton from './PlainButton/PlainButton' const ButtonRow = styled(PlainButton)({ background: PALETTE.SLATE_200, diff --git a/packages/client/components/NewMeetingSidebar.tsx b/packages/client/components/NewMeetingSidebar.tsx index 58f62f932e8..22b76fa85f9 100644 --- a/packages/client/components/NewMeetingSidebar.tsx +++ b/packages/client/components/NewMeetingSidebar.tsx @@ -3,9 +3,9 @@ import graphql from 'babel-plugin-relay/macro' import React, {ReactNode} from 'react' import {useFragment} from 'react-relay' import {Link} from 'react-router-dom' +import {NewMeetingSidebar_meeting$key} from '~/__generated__/NewMeetingSidebar_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import {useRenameMeeting} from '~/hooks/useRenameMeeting' -import {NewMeetingSidebar_meeting$key} from '~/__generated__/NewMeetingSidebar_meeting.graphql' import {PALETTE} from '../styles/paletteV3' import {NavSidebar} from '../types/constEnums' import isDemoRoute from '../utils/isDemoRoute' diff --git a/packages/client/components/NewMeetingSidebarPhaseListItem.tsx b/packages/client/components/NewMeetingSidebarPhaseListItem.tsx index ae1264faf81..31b929e1cf3 100644 --- a/packages/client/components/NewMeetingSidebarPhaseListItem.tsx +++ b/packages/client/components/NewMeetingSidebarPhaseListItem.tsx @@ -4,10 +4,10 @@ import { Edit, Group, GroupWork, + MonitorHeart, PlaylistAdd, Receipt, ThumbsUpDown, - MonitorHeart, Update } from '@mui/icons-material' import React from 'react' diff --git a/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx b/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx index 34b39cfc4dc..a87cad5ac2d 100644 --- a/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx +++ b/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx @@ -2,8 +2,8 @@ import styled from '@emotion/styled' import React, {useEffect} from 'react' import {useHistory} from 'react-router' import useAtmosphere from '../hooks/useAtmosphere' -import SendClientSideEvent from '../utils/SendClientSideEvent' import {PALETTE} from '../styles/paletteV3' +import SendClientSideEvent from '../utils/SendClientSideEvent' import FlatPrimaryButton from './FlatPrimaryButton' import IconButton from './IconButton' diff --git a/packages/client/components/NewMeetingTeamPicker.tsx b/packages/client/components/NewMeetingTeamPicker.tsx index 15bb5e35671..2443f8067c9 100644 --- a/packages/client/components/NewMeetingTeamPicker.tsx +++ b/packages/client/components/NewMeetingTeamPicker.tsx @@ -3,16 +3,16 @@ import React from 'react' import {useFragment} from 'react-relay' import {NewMeetingTeamPicker_selectedTeam$key} from '~/__generated__/NewMeetingTeamPicker_selectedTeam.graphql' import {NewMeetingTeamPicker_teams$key} from '~/__generated__/NewMeetingTeamPicker_teams.graphql' +import AddTeamDialogRoot from '~/components/AddTeamDialogRoot' +import SendClientSideEvent from '~/utils/SendClientSideEvent' +import useAtmosphere from '../hooks/useAtmosphere' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import {PortalStatus} from '../hooks/usePortal' import lazyPreload from '../utils/lazyPreload' +import setPreferredTeamId from '../utils/relay/setPreferredTeamId' import NewMeetingDropdown from './NewMeetingDropdown' import NewMeetingTeamPickerAvatars from './NewMeetingTeamPickerAvatars' -import useAtmosphere from '../hooks/useAtmosphere' -import setPreferredTeamId from '../utils/relay/setPreferredTeamId' -import AddTeamDialogRoot from '~/components/AddTeamDialogRoot' -import SendClientSideEvent from '~/utils/SendClientSideEvent' const SelectTeamDropdown = lazyPreload( () => diff --git a/packages/client/components/NewTeamOrgDropdown.tsx b/packages/client/components/NewTeamOrgDropdown.tsx index 9f5fb0935d9..3778804e48a 100644 --- a/packages/client/components/NewTeamOrgDropdown.tsx +++ b/packages/client/components/NewTeamOrgDropdown.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {MenuProps} from '../hooks/useMenu' import {NewTeamOrgDropdown_organizations$key} from '../__generated__/NewTeamOrgDropdown_organizations.graphql' +import {MenuProps} from '../hooks/useMenu' import DropdownMenuItemLabel from './DropdownMenuItemLabel' import DropdownMenuLabel from './DropdownMenuLabel' import Menu from './Menu' diff --git a/packages/client/components/NotificationDropdown.tsx b/packages/client/components/NotificationDropdown.tsx index 0e923e81a99..3afb59a34a1 100644 --- a/packages/client/components/NotificationDropdown.tsx +++ b/packages/client/components/NotificationDropdown.tsx @@ -2,18 +2,18 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {RefObject} from 'react' import {usePaginationFragment} from 'react-relay' -import useAtmosphere from '~/hooks/useAtmosphere' -import useTimeout from '~/hooks/useTimeout' -import SetNotificationStatusMutation from '~/mutations/SetNotificationStatusMutation' import { NotificationDropdown_query$data, NotificationDropdown_query$key } from '~/__generated__/NotificationDropdown_query.graphql' +import useAtmosphere from '~/hooks/useAtmosphere' +import useTimeout from '~/hooks/useTimeout' +import SetNotificationStatusMutation from '~/mutations/SetNotificationStatusMutation' +import {NotificationDropdownPaginationQuery} from '../__generated__/NotificationDropdownPaginationQuery.graphql' +import useClientSideTrack from '../hooks/useClientSideTrack' import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom' import {MenuProps} from '../hooks/useMenu' -import useClientSideTrack from '../hooks/useClientSideTrack' import SendClientSideEvent from '../utils/SendClientSideEvent' -import {NotificationDropdownPaginationQuery} from '../__generated__/NotificationDropdownPaginationQuery.graphql' import Menu from './Menu' import MenuItem from './MenuItem' import NotificationPicker from './NotificationPicker' diff --git a/packages/client/components/NotificationPicker.tsx b/packages/client/components/NotificationPicker.tsx index d119db0dc74..1d562f24283 100644 --- a/packages/client/components/NotificationPicker.tsx +++ b/packages/client/components/NotificationPicker.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' -import lazyPreload, {LazyExoticPreload} from '~/utils/lazyPreload' import { NotificationEnum, NotificationPicker_notification$key } from '~/__generated__/NotificationPicker_notification.graphql' +import lazyPreload, {LazyExoticPreload} from '~/utils/lazyPreload' const typePicker: Record> = { DISCUSSION_MENTIONED: lazyPreload( diff --git a/packages/client/components/NotificationRow.tsx b/packages/client/components/NotificationRow.tsx index 78d54cc32b9..eda7ebea52f 100644 --- a/packages/client/components/NotificationRow.tsx +++ b/packages/client/components/NotificationRow.tsx @@ -1,7 +1,7 @@ import styled from '@emotion/styled' import React, {ReactNode, useState} from 'react' -import {PALETTE} from '../styles/paletteV3' import {NotificationStatusEnum} from '../__generated__/NotificationDropdown_query.graphql' +import {PALETTE} from '../styles/paletteV3' const Row = styled('div')<{isNew: boolean}>(({isNew}) => ({ background: isNew ? PALETTE.SLATE_300 : '#fff', diff --git a/packages/client/components/NotificationTemplate.tsx b/packages/client/components/NotificationTemplate.tsx index 78503bc33be..279ac41f640 100644 --- a/packages/client/components/NotificationTemplate.tsx +++ b/packages/client/components/NotificationTemplate.tsx @@ -3,9 +3,9 @@ import ms from 'ms' import React, {ReactNode} from 'react' import {useFragment} from 'react-relay' import parabolLogo from 'static/images/brand/mark-color.svg' +import {NotificationTemplate_notification$key} from '~/__generated__/NotificationTemplate_notification.graphql' import NotificationSubtitle from '~/components/NotificationSubtitle' import useRefreshInterval from '~/hooks/useRefreshInterval' -import {NotificationTemplate_notification$key} from '~/__generated__/NotificationTemplate_notification.graphql' import NotificationBody from './NotificationBody' import NotificationMessage from './NotificationMessage' import NotificationRow from './NotificationRow' diff --git a/packages/client/components/NullableTask/NullableTask.tsx b/packages/client/components/NullableTask/NullableTask.tsx index 0057af98e49..bcca9e0e861 100644 --- a/packages/client/components/NullableTask/NullableTask.tsx +++ b/packages/client/components/NullableTask/NullableTask.tsx @@ -3,10 +3,10 @@ import {convertFromRaw} from 'draft-js' import React, {useMemo} from 'react' import {useFragment} from 'react-relay' import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql' +import {NullableTask_task$key} from '../../__generated__/NullableTask_task.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import OutcomeCardContainer from '../../modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer' import makeEmptyStr from '../../utils/draftjs/makeEmptyStr' -import {NullableTask_task$key} from '../../__generated__/NullableTask_task.graphql' import NullCard from '../NullCard/NullCard' interface Props { diff --git a/packages/client/components/OrgAdminActionMenu.tsx b/packages/client/components/OrgAdminActionMenu.tsx index 19799e08abb..adb94de0977 100644 --- a/packages/client/components/OrgAdminActionMenu.tsx +++ b/packages/client/components/OrgAdminActionMenu.tsx @@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' -import {MenuProps} from '../hooks/useMenu' -import SetOrgUserRoleMutation from '../mutations/SetOrgUserRoleMutation' -import useMutationProps from '../hooks/useMutationProps' import {OrgAdminActionMenu_organization$key} from '../__generated__/OrgAdminActionMenu_organization.graphql' import {OrgAdminActionMenu_organizationUser$key} from '../__generated__/OrgAdminActionMenu_organizationUser.graphql' +import {MenuProps} from '../hooks/useMenu' +import useMutationProps from '../hooks/useMutationProps' +import SetOrgUserRoleMutation from '../mutations/SetOrgUserRoleMutation' import Menu from './Menu' import MenuItem from './MenuItem' diff --git a/packages/client/components/PalettePicker/PalettePicker.tsx b/packages/client/components/PalettePicker/PalettePicker.tsx index e2e841112b0..41cefa48c8d 100644 --- a/packages/client/components/PalettePicker/PalettePicker.tsx +++ b/packages/client/components/PalettePicker/PalettePicker.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import ReflectTemplatePromptUpdateGroupColorMutation from '~/mutations/ReflectTemplatePromptUpdateGroupColorMutation' import {PalettePicker_prompt$key} from '~/__generated__/PalettePicker_prompt.graphql' import {PalettePicker_prompts$key} from '~/__generated__/PalettePicker_prompts.graphql' +import ReflectTemplatePromptUpdateGroupColorMutation from '~/mutations/ReflectTemplatePromptUpdateGroupColorMutation' import useAtmosphere from '../../hooks/useAtmosphere' import {MenuProps} from '../../hooks/useMenu' import palettePickerOptions from '../../styles/palettePickerOptions' diff --git a/packages/client/components/ParabolScopingSearchFilterMenu.tsx b/packages/client/components/ParabolScopingSearchFilterMenu.tsx index 4750326f46e..1a69f762037 100644 --- a/packages/client/components/ParabolScopingSearchFilterMenu.tsx +++ b/packages/client/components/ParabolScopingSearchFilterMenu.tsx @@ -5,8 +5,8 @@ import {commitLocalUpdate, useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' import {ParabolSearchQuery} from '~/types/clientSchema' import {taskScopingStatusFilters} from '~/utils/constants' -import {MenuProps} from '../hooks/useMenu' import {ParabolScopingSearchFilterMenu_meeting$key} from '../__generated__/ParabolScopingSearchFilterMenu_meeting.graphql' +import {MenuProps} from '../hooks/useMenu' import Checkbox from './Checkbox' import DropdownMenuLabel from './DropdownMenuLabel' import Menu from './Menu' diff --git a/packages/client/components/ParabolScopingSearchResultItem.tsx b/packages/client/components/ParabolScopingSearchResultItem.tsx index f84e0f58b67..c5e2f5b6858 100644 --- a/packages/client/components/ParabolScopingSearchResultItem.tsx +++ b/packages/client/components/ParabolScopingSearchResultItem.tsx @@ -14,10 +14,10 @@ import UpdateTaskMutation from '~/mutations/UpdateTaskMutation' import {PALETTE} from '~/styles/paletteV3' import convertToTaskContent from '~/utils/draftjs/convertToTaskContent' import isAndroid from '~/utils/draftjs/isAndroid' -import {Threshold} from '../types/constEnums' import {ParabolScopingSearchResultItem_task$key} from '../__generated__/ParabolScopingSearchResultItem_task.graphql' import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql' import {AreaEnum} from '../__generated__/UpdateTaskMutation.graphql' +import {Threshold} from '../types/constEnums' import Checkbox from './Checkbox' import TaskEditor from './TaskEditor/TaskEditor' diff --git a/packages/client/components/ParabolScopingSearchResults.tsx b/packages/client/components/ParabolScopingSearchResults.tsx index a767c7b286f..5726c7fa882 100644 --- a/packages/client/components/ParabolScopingSearchResults.tsx +++ b/packages/client/components/ParabolScopingSearchResults.tsx @@ -6,12 +6,12 @@ import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds' import useMutationProps from '~/hooks/useMutationProps' import CreateTaskMutation from '~/mutations/CreateTaskMutation' import dndNoise from '~/utils/dndNoise' -import useAtmosphere from '../hooks/useAtmosphere' -import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom' import {ParabolScopingSearchResultsPaginationQuery} from '../__generated__/ParabolScopingSearchResultsPaginationQuery.graphql' import {ParabolScopingSearchResultsQuery} from '../__generated__/ParabolScopingSearchResultsQuery.graphql' import {ParabolScopingSearchResults_meeting$key} from '../__generated__/ParabolScopingSearchResults_meeting.graphql' import {ParabolScopingSearchResults_query$key} from '../__generated__/ParabolScopingSearchResults_query.graphql' +import useAtmosphere from '../hooks/useAtmosphere' +import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom' import IntegrationScopingNoResults from './IntegrationScopingNoResults' import NewIntegrationRecordButton from './NewIntegrationRecordButton' import ParabolScopingSearchResultItem from './ParabolScopingSearchResultItem' diff --git a/packages/client/components/ParabolScopingSearchResultsRoot.tsx b/packages/client/components/ParabolScopingSearchResultsRoot.tsx index 56f29ae411d..9f69f579116 100644 --- a/packages/client/components/ParabolScopingSearchResultsRoot.tsx +++ b/packages/client/components/ParabolScopingSearchResultsRoot.tsx @@ -3,12 +3,12 @@ import React, {Suspense} from 'react' import {useFragment} from 'react-relay' import {ParabolSearchQuery} from '~/types/clientSchema' import {taskScopingStatusFilters} from '~/utils/constants' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' -import MockScopingList from '../modules/meeting/components/MockScopingList' import parabolScopingSearchResultsQuery, { ParabolScopingSearchResultsQuery } from '../__generated__/ParabolScopingSearchResultsQuery.graphql' import {ParabolScopingSearchResultsRoot_meeting$key} from '../__generated__/ParabolScopingSearchResultsRoot_meeting.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' +import MockScopingList from '../modules/meeting/components/MockScopingList' import ErrorBoundary from './ErrorBoundary' import ParabolScopingSearchResults from './ParabolScopingSearchResults' diff --git a/packages/client/components/ParabolScopingSelectAllTasks.tsx b/packages/client/components/ParabolScopingSelectAllTasks.tsx index 23406f7e8db..e0b019610af 100644 --- a/packages/client/components/ParabolScopingSelectAllTasks.tsx +++ b/packages/client/components/ParabolScopingSelectAllTasks.tsx @@ -6,9 +6,9 @@ import {useFragment} from 'react-relay' import useMutationProps from '~/hooks/useMutationProps' import useUnusedRecords from '~/hooks/useUnusedRecords' import UpdatePokerScopeMutation from '~/mutations/UpdatePokerScopeMutation' +import {ParabolScopingSelectAllTasks_tasks$key} from '../__generated__/ParabolScopingSelectAllTasks_tasks.graphql' import useAtmosphere from '../hooks/useAtmosphere' import getSelectAllTitle from '../utils/getSelectAllTitle' -import {ParabolScopingSelectAllTasks_tasks$key} from '../__generated__/ParabolScopingSelectAllTasks_tasks.graphql' import Checkbox from './Checkbox' const Item = styled('div')({ diff --git a/packages/client/components/PasswordResetLink.tsx b/packages/client/components/PasswordResetLink.tsx index 09040734765..59a59eb6f9b 100644 --- a/packages/client/components/PasswordResetLink.tsx +++ b/packages/client/components/PasswordResetLink.tsx @@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {useFragment} from 'react-relay' import passwordIcon from '../../../static/images/icons/password_black_24dp.svg' +import {PasswordResetLink_viewer$key} from '../__generated__/PasswordResetLink_viewer.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import EmailPasswordResetMutation from '../mutations/EmailPasswordResetMutation' import {PALETTE} from '../styles/paletteV3' -import {PasswordResetLink_viewer$key} from '../__generated__/PasswordResetLink_viewer.graphql' import StyledError from './StyledError' const Wrapper = styled('div')({ diff --git a/packages/client/components/PaymentRejected.tsx b/packages/client/components/PaymentRejected.tsx index 8c4990c8c5e..f4fc172a364 100644 --- a/packages/client/components/PaymentRejected.tsx +++ b/packages/client/components/PaymentRejected.tsx @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import NotificationAction from '~/components/NotificationAction' -import useRouter from '../hooks/useRouter' import {PaymentRejected_notification$key} from '../__generated__/PaymentRejected_notification.graphql' +import useRouter from '../hooks/useRouter' import NotificationTemplate from './NotificationTemplate' interface Props { diff --git a/packages/client/components/PinnedSnackbarNotifications.tsx b/packages/client/components/PinnedSnackbarNotifications.tsx index 9dbba6bf927..1baeb1ce5ab 100644 --- a/packages/client/components/PinnedSnackbarNotifications.tsx +++ b/packages/client/components/PinnedSnackbarNotifications.tsx @@ -2,15 +2,15 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {PinnedSnackbarNotifications_query$key} from '~/__generated__/PinnedSnackbarNotifications_query.graphql' +import {NotificationEnum} from '../__generated__/popNotificationToast_notification.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useRouter from '../hooks/useRouter' import SetNotificationStatusMutation from '../mutations/SetNotificationStatusMutation' -import mapTeamsLimitExceededToToast from '../mutations/toasts/mapTeamsLimitExceededToToast' -import mapTeamsLimitReminderToToast from '../mutations/toasts/mapTeamsLimitReminderToToast' import mapPromptToJoinOrgToToast from '../mutations/toasts/mapPromptToJoinOrgToToast' import mapRequestToJoinOrgToToast from '../mutations/toasts/mapRequestToJoinOrgToToast' +import mapTeamsLimitExceededToToast from '../mutations/toasts/mapTeamsLimitExceededToToast' +import mapTeamsLimitReminderToToast from '../mutations/toasts/mapTeamsLimitReminderToToast' import {OnNextHistoryContext} from '../types/relayMutations' -import {NotificationEnum} from '../__generated__/popNotificationToast_notification.graphql' import {Snack} from './Snackbar' interface Props { diff --git a/packages/client/components/PokerCard.tsx b/packages/client/components/PokerCard.tsx index 418eecd46c9..10d1be85bb5 100644 --- a/packages/client/components/PokerCard.tsx +++ b/packages/client/components/PokerCard.tsx @@ -4,11 +4,11 @@ import React, {RefObject, useEffect, useRef} from 'react' import {useFragment} from 'react-relay' import useBreakpoint from '~/hooks/useBreakpoint' import PassSVG from '../../../static/images/icons/no_entry.svg' +import {PokerCard_scaleValue$key} from '../__generated__/PokerCard_scaleValue.graphql' import usePokerZIndexOverride from '../hooks/usePokerZIndexOverride' import logoMarkWhite from '../styles/theme/images/brand/mark-white.svg' import {BezierCurve, Breakpoint, PokerCards} from '../types/constEnums' import getPokerCardBackground from '../utils/getPokerCardBackground' -import {PokerCard_scaleValue$key} from '../__generated__/PokerCard_scaleValue.graphql' const COLLAPSE_DUR = 700 const EXPAND_DUR = 300 diff --git a/packages/client/components/PokerCardDeck.tsx b/packages/client/components/PokerCardDeck.tsx index 3339b284231..41932cae97e 100644 --- a/packages/client/components/PokerCardDeck.tsx +++ b/packages/client/components/PokerCardDeck.tsx @@ -4,6 +4,7 @@ import React, {KeyboardEvent, RefObject, useEffect, useMemo, useRef, useState} f import {useFragment} from 'react-relay' import useMutationProps from '~/hooks/useMutationProps' import usePokerDeckLeftEdge from '~/hooks/usePokerDeckLeftEdge' +import {PokerCardDeck_meeting$key} from '../__generated__/PokerCardDeck_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useEventCallback from '../hooks/useEventCallback' import useHotkey from '../hooks/useHotkey' @@ -13,7 +14,6 @@ import usePokerCardLocation from '../hooks/usePokerCardLocation' import PokerAnnounceDeckHoverMutation from '../mutations/PokerAnnounceDeckHoverMutation' import VoteForPokerStoryMutation from '../mutations/VoteForPokerStoryMutation' import {BezierCurve, PokerCards} from '../types/constEnums' -import {PokerCardDeck_meeting$key} from '../__generated__/PokerCardDeck_meeting.graphql' import PokerCard from './PokerCard' const Deck = styled('div')<{left: number; isSpectating: boolean}>(({left, isSpectating}) => ({ diff --git a/packages/client/components/PokerDimensionFinalScorePicker.tsx b/packages/client/components/PokerDimensionFinalScorePicker.tsx index 5c52f75995b..ad6e992b948 100644 --- a/packages/client/components/PokerDimensionFinalScorePicker.tsx +++ b/packages/client/components/PokerDimensionFinalScorePicker.tsx @@ -4,8 +4,8 @@ import React, {RefObject} from 'react' import {useFragment} from 'react-relay' import useBreakpoint from '~/hooks/useBreakpoint' import {Breakpoint} from '~/types/constEnums' -import {PALETTE} from '../styles/paletteV3' import {PokerDimensionFinalScorePicker_stage$key} from '../__generated__/PokerDimensionFinalScorePicker_stage.graphql' +import {PALETTE} from '../styles/paletteV3' import AzureDevOpsFieldDimensionDropdown from './AzureDevOpsFieldDimensionDropdown' import GitHubFieldDimensionDropdown from './GitHubFieldDimensionDropdown' import GitLabFieldDimensionDropdown from './GitLabFieldDimensionDropdown' diff --git a/packages/client/components/PokerDimensionValueControl.tsx b/packages/client/components/PokerDimensionValueControl.tsx index 9650c143950..1f62fe52492 100644 --- a/packages/client/components/PokerDimensionValueControl.tsx +++ b/packages/client/components/PokerDimensionValueControl.tsx @@ -5,8 +5,8 @@ import {useFragment} from 'react-relay' import useBreakpoint from '~/hooks/useBreakpoint' import {PALETTE} from '~/styles/paletteV3' import {Breakpoint} from '~/types/constEnums' -import useResizeFontForElement from '../hooks/useResizeFontForElement' import {PokerDimensionValueControl_stage$key} from '../__generated__/PokerDimensionValueControl_stage.graphql' +import useResizeFontForElement from '../hooks/useResizeFontForElement' import LinkButton from './LinkButton' import MiniPokerCard from './MiniPokerCard' import PokerDimensionFinalScorePicker from './PokerDimensionFinalScorePicker' diff --git a/packages/client/components/PokerDiscussVoting.tsx b/packages/client/components/PokerDiscussVoting.tsx index 06f5a86bd4d..148189efbcb 100644 --- a/packages/client/components/PokerDiscussVoting.tsx +++ b/packages/client/components/PokerDiscussVoting.tsx @@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect, useMemo, useRef, useState} from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' -import useForceUpdate from '../hooks/useForceUpdate' -import {PokerCards} from '../types/constEnums' -import isSpecialPokerLabel from '../utils/isSpecialPokerLabel' import {PokerDiscussVoting_meeting$key} from '../__generated__/PokerDiscussVoting_meeting.graphql' import { - PokerDiscussVoting_stage$key, - PokerDiscussVoting_stage$data + PokerDiscussVoting_stage$data, + PokerDiscussVoting_stage$key } from '../__generated__/PokerDiscussVoting_stage.graphql' +import useForceUpdate from '../hooks/useForceUpdate' +import {PokerCards} from '../types/constEnums' +import isSpecialPokerLabel from '../utils/isSpecialPokerLabel' import PokerDimensionValueControl from './PokerDimensionValueControl' import PokerVotingRow from './PokerVotingRow' import useSetTaskEstimate from './useSetTaskEstimate' diff --git a/packages/client/components/PokerEstimateHeaderCardParabol.tsx b/packages/client/components/PokerEstimateHeaderCardParabol.tsx index cc55ca2abff..e0b54b7d65d 100644 --- a/packages/client/components/PokerEstimateHeaderCardParabol.tsx +++ b/packages/client/components/PokerEstimateHeaderCardParabol.tsx @@ -10,10 +10,10 @@ import {Elevation} from '~/styles/elevation' import {PALETTE} from '~/styles/paletteV3' import {Breakpoint} from '~/types/constEnums' import isAndroid from '~/utils/draftjs/isAndroid' +import {PokerEstimateHeaderCardParabol_task$key} from '../__generated__/PokerEstimateHeaderCardParabol_task.graphql' import useAtmosphere from '../hooks/useAtmosphere' import UpdateTaskMutation from '../mutations/UpdateTaskMutation' import convertToTaskContent from '../utils/draftjs/convertToTaskContent' -import {PokerEstimateHeaderCardParabol_task$key} from '../__generated__/PokerEstimateHeaderCardParabol_task.graphql' import CardButton from './CardButton' import IconLabel from './IconLabel' import TaskEditor from './TaskEditor/TaskEditor' diff --git a/packages/client/components/PokerEstimatePhase.tsx b/packages/client/components/PokerEstimatePhase.tsx index 8622217b040..a4008ca422c 100644 --- a/packages/client/components/PokerEstimatePhase.tsx +++ b/packages/client/components/PokerEstimatePhase.tsx @@ -6,8 +6,8 @@ import useBreakpoint from '~/hooks/useBreakpoint' import useGotoStageId from '~/hooks/useGotoStageId' import useRightDrawer from '~/hooks/useRightDrawer' import {Breakpoint, DiscussionThreadEnum} from '~/types/constEnums' -import {phaseLabelLookup} from '../utils/meetings/lookups' import {PokerEstimatePhase_meeting$key} from '../__generated__/PokerEstimatePhase_meeting.graphql' +import {phaseLabelLookup} from '../utils/meetings/lookups' import ErrorBoundary from './ErrorBoundary' import EstimatePhaseArea from './EstimatePhaseArea' import EstimatePhaseDiscussionDrawer from './EstimatePhaseDiscussionDrawer' diff --git a/packages/client/components/PokerMeetingSidebar.tsx b/packages/client/components/PokerMeetingSidebar.tsx index 59fc535522b..53e9cb6cfd7 100644 --- a/packages/client/components/PokerMeetingSidebar.tsx +++ b/packages/client/components/PokerMeetingSidebar.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {Fragment} from 'react' import {useFragment} from 'react-relay' -import useRouter from '~/hooks/useRouter' import { NewMeetingPhaseTypeEnum, PokerMeetingSidebar_meeting$key } from '~/__generated__/PokerMeetingSidebar_meeting.graphql' +import useRouter from '~/hooks/useRouter' import useAtmosphere from '../hooks/useAtmosphere' import useGotoStageId from '../hooks/useGotoStageId' import getSidebarItemStage from '../utils/getSidebarItemStage' diff --git a/packages/client/components/PokerSidebarEstimateSection.tsx b/packages/client/components/PokerSidebarEstimateSection.tsx index 4bfd8080409..235267fa14c 100644 --- a/packages/client/components/PokerSidebarEstimateSection.tsx +++ b/packages/client/components/PokerSidebarEstimateSection.tsx @@ -3,8 +3,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' -import useGotoStageId from '~/hooks/useGotoStageId' import {PokerSidebarEstimateSection_meeting$key} from '~/__generated__/PokerSidebarEstimateSection_meeting.graphql' +import useGotoStageId from '~/hooks/useGotoStageId' import useAtmosphere from '../hooks/useAtmosphere' import useMakeStageSummaries from '../hooks/useMakeStageSummaries' import DragEstimatingTaskMutation from '../mutations/DragEstimatingTaskMutation' diff --git a/packages/client/components/PokerSidebarPhaseListItemChildren.tsx b/packages/client/components/PokerSidebarPhaseListItemChildren.tsx index ba8da6bdef1..d40750e3f5e 100644 --- a/packages/client/components/PokerSidebarPhaseListItemChildren.tsx +++ b/packages/client/components/PokerSidebarPhaseListItemChildren.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import useGotoStageId from '~/hooks/useGotoStageId' import { NewMeetingPhaseTypeEnum, PokerSidebarPhaseListItemChildren_meeting$key } from '~/__generated__/PokerSidebarPhaseListItemChildren_meeting.graphql' +import useGotoStageId from '~/hooks/useGotoStageId' import MeetingSidebarTeamMemberStageItems from './MeetingSidebarTeamMemberStageItems' import PokerSidebarEstimateSection from './PokerSidebarEstimateSection' diff --git a/packages/client/components/PokerVotingRow.tsx b/packages/client/components/PokerVotingRow.tsx index 3e5f8690fd3..0256935ca6e 100644 --- a/packages/client/components/PokerVotingRow.tsx +++ b/packages/client/components/PokerVotingRow.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {PALETTE} from '../styles/paletteV3' -import {PokerCards} from '../types/constEnums' import {PokerVotingRow_scaleValue$key} from '../__generated__/PokerVotingRow_scaleValue.graphql' import {PokerVotingRow_scores$key} from '../__generated__/PokerVotingRow_scores.graphql' +import {PALETTE} from '../styles/paletteV3' +import {PokerCards} from '../types/constEnums' import AvatarList from './AvatarList' import MiniPokerCard from './MiniPokerCard' import PokerVotingNoVotes from './PokerVotingNoVotes' diff --git a/packages/client/components/Poll/EditablePollOption.tsx b/packages/client/components/Poll/EditablePollOption.tsx index 4aa7bda76d6..d5cbb5df84e 100644 --- a/packages/client/components/Poll/EditablePollOption.tsx +++ b/packages/client/components/Poll/EditablePollOption.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {EditablePollOption_option$key} from '../../__generated__/EditablePollOption_option.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import {PALETTE} from '../../styles/paletteV3' import {Polls, PollsAriaLabels} from '../../types/constEnums' -import {EditablePollOption_option$key} from '../../__generated__/EditablePollOption_option.graphql' import {updateLocalPollOption} from './local/newPoll' const PollOptionInputRoot = styled('div')({ diff --git a/packages/client/components/Poll/EditablePollTitle.tsx b/packages/client/components/Poll/EditablePollTitle.tsx index 2c7754c10ff..9516e4c3256 100644 --- a/packages/client/components/Poll/EditablePollTitle.tsx +++ b/packages/client/components/Poll/EditablePollTitle.tsx @@ -4,8 +4,8 @@ import React from 'react' import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' import {Polls, PollsAriaLabels} from '~/types/constEnums' -import useAtmosphere from '../../hooks/useAtmosphere' import {EditablePollTitle_poll$key} from '../../__generated__/EditablePollTitle_poll.graphql' +import useAtmosphere from '../../hooks/useAtmosphere' import {updateLocalPoll} from './local/newPoll' const PollTitleInput = styled('input')({ diff --git a/packages/client/components/Poll/Poll.tsx b/packages/client/components/Poll/Poll.tsx index 8a10e86279a..a012fc0f765 100644 --- a/packages/client/components/Poll/Poll.tsx +++ b/packages/client/components/Poll/Poll.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {Poll_poll$key} from '~/__generated__/Poll_poll.graphql' import {cardShadow, Elevation} from '~/styles/elevation' import cardRootStyles from '~/styles/helpers/cardRootStyles' import {PALETTE} from '~/styles/paletteV3' -import {Poll_poll$key} from '~/__generated__/Poll_poll.graphql' import ThreadedAvatarColumn from '../ThreadedAvatarColumn' import ThreadedItemHeaderDescription from '../ThreadedItemHeaderDescription' import ThreadedItemWrapper from '../ThreadedItemWrapper' diff --git a/packages/client/components/PrivateRoutes.tsx b/packages/client/components/PrivateRoutes.tsx index 5c5e81a8a97..178742810e2 100644 --- a/packages/client/components/PrivateRoutes.tsx +++ b/packages/client/components/PrivateRoutes.tsx @@ -1,5 +1,5 @@ -import React, {lazy} from 'react' import {Location} from 'history' +import React, {lazy} from 'react' import {Redirect, Route, Switch, useLocation} from 'react-router' import useAuthRoute from '../hooks/useAuthRoute' import useNoIndex from '../hooks/useNoIndex' diff --git a/packages/client/components/PromoteToBillingLeader.tsx b/packages/client/components/PromoteToBillingLeader.tsx index f01871395ac..76844479944 100644 --- a/packages/client/components/PromoteToBillingLeader.tsx +++ b/packages/client/components/PromoteToBillingLeader.tsx @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {PromoteToBillingLeader_notification$key} from '~/__generated__/PromoteToBillingLeader_notification.graphql' import useRouter from '~/hooks/useRouter' import defaultOrgAvatar from '~/styles/theme/images/avatar-organization.svg' -import {PromoteToBillingLeader_notification$key} from '~/__generated__/PromoteToBillingLeader_notification.graphql' import NotificationAction from './NotificationAction' import NotificationTemplate from './NotificationTemplate' interface Props { diff --git a/packages/client/components/PromptToJoinOrgNotification.tsx b/packages/client/components/PromptToJoinOrgNotification.tsx index bb10eec1650..71e989f0980 100644 --- a/packages/client/components/PromptToJoinOrgNotification.tsx +++ b/packages/client/components/PromptToJoinOrgNotification.tsx @@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {useFragment} from 'react-relay' import {PromptToJoinOrgNotification_notification$key} from '~/__generated__/PromptToJoinOrgNotification_notification.graphql' -import NotificationAction from './NotificationAction' -import NotificationTemplate from './NotificationTemplate' import useAtmosphere from '../hooks/useAtmosphere' -import SendClientSideEvent from '../utils/SendClientSideEvent' import RequestToJoinDomainMutation from '../mutations/RequestToJoinDomainMutation' +import SendClientSideEvent from '../utils/SendClientSideEvent' +import NotificationAction from './NotificationAction' +import NotificationTemplate from './NotificationTemplate' interface Props { notification: PromptToJoinOrgNotification_notification$key diff --git a/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx b/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx index 161709a6de8..49c409083d9 100644 --- a/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx +++ b/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx @@ -1,8 +1,10 @@ +import graphql from 'babel-plugin-relay/macro' import clsx from 'clsx' import React, {useMemo, useState} from 'react' import {useFragment} from 'react-relay' -import graphql from 'babel-plugin-relay/macro' import {RRule} from 'rrule' +import {EndRecurringMeetingModal_meeting$key} from '../../__generated__/EndRecurringMeetingModal_meeting.graphql' +import {MeetingTypeEnum} from '../../__generated__/MeetingSelectorQuery.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import useMutationProps from '../../hooks/useMutationProps' import useRouter from '../../hooks/useRouter' @@ -11,14 +13,12 @@ import EndRetrospectiveMutation from '../../mutations/EndRetrospectiveMutation' import EndSprintPokerMutation from '../../mutations/EndSprintPokerMutation' import EndTeamPromptMutation from '../../mutations/EndTeamPromptMutation' import UpdateRecurrenceSettingsMutation from '../../mutations/UpdateRecurrenceSettingsMutation' -import {EndRecurringMeetingModal_meeting$key} from '../../__generated__/EndRecurringMeetingModal_meeting.graphql' import { CompletedHandler, HistoryMaybeLocalHandler, StandardMutation } from '../../types/relayMutations' import {humanReadableCountdown} from '../../utils/date/relativeDate' -import {MeetingTypeEnum} from '../../__generated__/MeetingSelectorQuery.graphql' import DialogContainer from '../DialogContainer' export const EndMeetingMutationLookup = { diff --git a/packages/client/components/Recurrence/RecurrenceSettings.tsx b/packages/client/components/Recurrence/RecurrenceSettings.tsx index 8015c6a7772..a1e039e913a 100644 --- a/packages/client/components/Recurrence/RecurrenceSettings.tsx +++ b/packages/client/components/Recurrence/RecurrenceSettings.tsx @@ -5,12 +5,12 @@ import React, {PropsWithChildren, useEffect} from 'react' import {Frequency, RRule} from 'rrule' import {MenuPosition} from '../../hooks/useCoords' import useMenu from '../../hooks/useMenu' +import {getJSDateFromRRuleDate, getRRuleDateFromJSDate} from '../../shared/rruleUtil' import plural from '../../utils/plural' import DropdownMenuToggle from '../DropdownMenuToggle' import {toHumanReadable} from './HumanReadableRecurrenceRule' import {Day, RecurrenceDayCheckbox} from './RecurrenceDayCheckbox' import {RecurrenceTimePicker} from './RecurrenceTimePicker' -import {getJSDateFromRRuleDate, getRRuleDateFromJSDate} from '../../shared/rruleUtil' dayjs.extend(utcPlugin) export const ALL_DAYS: Day[] = [ diff --git a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx index 355d4137c9b..da69cf7f869 100644 --- a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx +++ b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx @@ -4,15 +4,15 @@ import graphql from 'babel-plugin-relay/macro' import React, {ChangeEvent, useMemo, useState} from 'react' import {useFragment} from 'react-relay' import {RRule} from 'rrule' -import UpdateRecurrenceSettingsMutation from '~/mutations/UpdateRecurrenceSettingsMutation' import {UpdateRecurrenceSettingsModal_meeting$key} from '~/__generated__/UpdateRecurrenceSettingsModal_meeting.graphql' +import UpdateRecurrenceSettingsMutation from '~/mutations/UpdateRecurrenceSettingsMutation' +import {UpdateRecurrenceSettingsMutation as TUpdateRecurrenceSettingsMutation} from '../../__generated__/UpdateRecurrenceSettingsMutation.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import useForm from '../../hooks/useForm' import useMutationProps, {getOnCompletedError} from '../../hooks/useMutationProps' import {PALETTE} from '../../styles/paletteV3' import {CompletedHandler} from '../../types/relayMutations' import Legitity from '../../validation/Legitity' -import {UpdateRecurrenceSettingsMutation as TUpdateRecurrenceSettingsMutation} from '../../__generated__/UpdateRecurrenceSettingsMutation.graphql' import DialogContainer from '../DialogContainer' import PlainButton from '../PlainButton/PlainButton' import StyledError from '../StyledError' diff --git a/packages/client/components/ReflectionCard/ColorBadge.tsx b/packages/client/components/ReflectionCard/ColorBadge.tsx index 23afa905efe..b759a3430b8 100644 --- a/packages/client/components/ReflectionCard/ColorBadge.tsx +++ b/packages/client/components/ReflectionCard/ColorBadge.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {MenuPosition} from '~/hooks/useCoords' -import useTooltip from '~/hooks/useTooltip' import {NewMeetingPhaseTypeEnum} from '~/__generated__/ActionMeeting_meeting.graphql' import {ColorBadge_reflection$key} from '~/__generated__/ColorBadge_reflection.graphql' +import {MenuPosition} from '~/hooks/useCoords' +import useTooltip from '~/hooks/useTooltip' const DROP_SIZE = 32 const DROP_SIZE_HALF = DROP_SIZE / 2 diff --git a/packages/client/components/ReflectionCard/ReactjiCount.tsx b/packages/client/components/ReflectionCard/ReactjiCount.tsx index dce9f4210e6..65f5c7f30de 100644 --- a/packages/client/components/ReflectionCard/ReactjiCount.tsx +++ b/packages/client/components/ReflectionCard/ReactjiCount.tsx @@ -2,16 +2,16 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {ReactjiCount_reactji$key} from '~/__generated__/ReactjiCount_reactji.graphql' import PlainButton from '~/components/PlainButton/PlainButton' import {TransitionStatus} from '~/hooks/useTransition' import {PALETTE} from '~/styles/paletteV3' import {BezierCurve, Times} from '~/types/constEnums' -import {ReactjiCount_reactji$key} from '~/__generated__/ReactjiCount_reactji.graphql' import {MenuPosition} from '../../hooks/useCoords' import useTooltip from '../../hooks/useTooltip' import ReactjiId from '../../shared/gqlIds/ReactjiId' -import EmojiUsersReaction from './EmojiUsersReaction' import getReactji from '../../utils/getReactji' +import EmojiUsersReaction from './EmojiUsersReaction' const Parent = styled('div')<{status: TransitionStatus}>(({status}) => ({ height: status === TransitionStatus.MOUNTED || status === TransitionStatus.EXITING ? 0 : 24, diff --git a/packages/client/components/ReflectionCard/ReactjiSection.tsx b/packages/client/components/ReflectionCard/ReactjiSection.tsx index 9c495f4661b..c3fee9144ed 100644 --- a/packages/client/components/ReflectionCard/ReactjiSection.tsx +++ b/packages/client/components/ReflectionCard/ReactjiSection.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {ReactjiSection_reactjis$key} from '~/__generated__/ReactjiSection_reactjis.graphql' import useInitialRender from '~/hooks/useInitialRender' import useTransition, {TransitionStatus} from '~/hooks/useTransition' import {Threshold} from '~/types/constEnums' -import {ReactjiSection_reactjis$key} from '~/__generated__/ReactjiSection_reactjis.graphql' import AddReactjiButton from './AddReactjiButton' import ReactjiCount from './ReactjiCount' diff --git a/packages/client/components/ReflectionCard/ReflectionCard.tsx b/packages/client/components/ReflectionCard/ReflectionCard.tsx index b23f03e0b97..402aa5722a1 100644 --- a/packages/client/components/ReflectionCard/ReflectionCard.tsx +++ b/packages/client/components/ReflectionCard/ReflectionCard.tsx @@ -3,12 +3,13 @@ import graphql from 'babel-plugin-relay/macro' import {convertToRaw, EditorProps} from 'draft-js' import React, {MouseEvent, useEffect, useRef, useState} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' -import AddReactjiToReactableMutation from '~/mutations/AddReactjiToReactableMutation' -import isDemoRoute from '~/utils/isDemoRoute' import { NewMeetingPhaseTypeEnum, ReflectionCard_meeting$key } from '~/__generated__/ReflectionCard_meeting.graphql' +import AddReactjiToReactableMutation from '~/mutations/AddReactjiToReactableMutation' +import isDemoRoute from '~/utils/isDemoRoute' +import {ReflectionCard_reflection$key} from '../../__generated__/ReflectionCard_reflection.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import useBreakpoint from '../../hooks/useBreakpoint' import {MenuPosition} from '../../hooks/useCoords' @@ -25,7 +26,6 @@ import isAndroid from '../../utils/draftjs/isAndroid' import remountDecorators from '../../utils/draftjs/remountDecorators' import isPhaseComplete from '../../utils/meetings/isPhaseComplete' import isTempId from '../../utils/relay/isTempId' -import {ReflectionCard_reflection$key} from '../../__generated__/ReflectionCard_reflection.graphql' import CardButton from '../CardButton' import {OpenSpotlight} from '../GroupingKanbanColumn' import IconLabel from '../IconLabel' diff --git a/packages/client/components/ReflectionEditorWrapper.tsx b/packages/client/components/ReflectionEditorWrapper.tsx index 9da0ca6ab78..73436c33cd1 100644 --- a/packages/client/components/ReflectionEditorWrapper.tsx +++ b/packages/client/components/ReflectionEditorWrapper.tsx @@ -9,7 +9,8 @@ import { getDefaultKeyBinding } from 'draft-js' import React, {RefObject, Suspense, useEffect, useRef} from 'react' -import {Card, Gutters, ElementHeight} from '../types/constEnums' +import {PALETTE} from '~/styles/paletteV3' +import {Card, ElementHeight, Gutters} from '../types/constEnums' import {textTags} from '../utils/constants' import completeEntity from '../utils/draftjs/completeEntity' import entitizeText from '../utils/draftjs/entitizeText' @@ -19,7 +20,6 @@ import lazyPreload from '../utils/lazyPreload' import linkify from '../utils/linkify' import './TaskEditor/Draft.css' import useCommentPlugins from './TaskEditor/useCommentPlugins' -import {PALETTE} from '~/styles/paletteV3' const EditorStyles = styled('div')(({useFallback, userSelect, isClipped}: any) => ({ color: PALETTE.SLATE_700, diff --git a/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx b/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx index d1614b511d2..22b51205077 100644 --- a/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx +++ b/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx @@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro' import React, {useMemo, useState} from 'react' import {useFragment} from 'react-relay' import useSpotlightResults from '~/hooks/useSpotlightResults' -import useDraggableReflectionCard from '../../hooks/useDraggableReflectionCard' import {DraggableReflectionCard_meeting$key} from '../../__generated__/DraggableReflectionCard_meeting.graphql' import {DraggableReflectionCard_reflection$key} from '../../__generated__/DraggableReflectionCard_reflection.graphql' import {DraggableReflectionCard_staticReflections$key} from '../../__generated__/DraggableReflectionCard_staticReflections.graphql' +import useDraggableReflectionCard from '../../hooks/useDraggableReflectionCard' import {SwipeColumn} from '../GroupingKanban' import {OpenSpotlight} from '../GroupingKanbanColumn' import ReflectionCard from '../ReflectionCard/ReflectionCard' diff --git a/packages/client/components/ReflectionGroup/ReflectionGroup.tsx b/packages/client/components/ReflectionGroup/ReflectionGroup.tsx index c7ab9183126..ffb5efa3419 100644 --- a/packages/client/components/ReflectionGroup/ReflectionGroup.tsx +++ b/packages/client/components/ReflectionGroup/ReflectionGroup.tsx @@ -2,6 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {RefObject, useEffect, useMemo, useRef, useState} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' +import {ReflectionGroup_meeting$key} from '../../__generated__/ReflectionGroup_meeting.graphql' +import {ReflectionGroup_reflectionGroup$key} from '../../__generated__/ReflectionGroup_reflectionGroup.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import useEventCallback from '../../hooks/useEventCallback' import useExpandedReflections from '../../hooks/useExpandedReflections' @@ -12,8 +14,6 @@ import { Times } from '../../types/constEnums' import {GROUP} from '../../utils/constants' -import {ReflectionGroup_meeting$key} from '../../__generated__/ReflectionGroup_meeting.graphql' -import {ReflectionGroup_reflectionGroup$key} from '../../__generated__/ReflectionGroup_reflectionGroup.graphql' import {SwipeColumn} from '../GroupingKanban' import {OpenSpotlight} from '../GroupingKanbanColumn' import ReflectionGroupHeader from '../ReflectionGroupHeader' diff --git a/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx b/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx index 64ec7fd9e09..c02a5677c69 100644 --- a/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx +++ b/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx @@ -2,6 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {RefObject, useRef} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' +import {ReflectionGroupTitleEditor_meeting$key} from '../../__generated__/ReflectionGroupTitleEditor_meeting.graphql' +import {ReflectionGroupTitleEditor_reflectionGroup$key} from '../../__generated__/ReflectionGroupTitleEditor_reflectionGroup.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import useMutationProps from '../../hooks/useMutationProps' import UpdateReflectionGroupTitleMutation from '../../mutations/UpdateReflectionGroupTitleMutation' @@ -9,8 +11,6 @@ import {PALETTE} from '../../styles/paletteV3' import ui from '../../styles/ui' import {Card} from '../../types/constEnums' import {RETRO_TOPIC_LABEL} from '../../utils/constants' -import {ReflectionGroupTitleEditor_meeting$key} from '../../__generated__/ReflectionGroupTitleEditor_meeting.graphql' -import {ReflectionGroupTitleEditor_reflectionGroup$key} from '../../__generated__/ReflectionGroupTitleEditor_reflectionGroup.graphql' import StyledError from '../StyledError' interface Props { diff --git a/packages/client/components/ReflectionGroup/RemoteReflection.tsx b/packages/client/components/ReflectionGroup/RemoteReflection.tsx index 522533d3f7d..02c05d48ade 100644 --- a/packages/client/components/ReflectionGroup/RemoteReflection.tsx +++ b/packages/client/components/ReflectionGroup/RemoteReflection.tsx @@ -4,6 +4,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {RefObject, useEffect, useMemo, useRef} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' import useSpotlightResults from '~/hooks/useSpotlightResults' +import {RemoteReflection_meeting$key} from '../../__generated__/RemoteReflection_meeting.graphql' +import { + RemoteReflection_reflection$data, + RemoteReflection_reflection$key +} from '../../__generated__/RemoteReflection_reflection.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import useEditorState from '../../hooks/useEditorState' import {Elevation} from '../../styles/elevation' @@ -11,11 +16,6 @@ import {BezierCurve, DragAttribute, ElementWidth, Times, ZIndex} from '../../typ import {DeepNonNullable} from '../../types/generics' import {VOTE} from '../../utils/constants' import {getMinTop} from '../../utils/retroGroup/updateClonePosition' -import {RemoteReflection_meeting$key} from '../../__generated__/RemoteReflection_meeting.graphql' -import { - RemoteReflection_reflection$key, - RemoteReflection_reflection$data -} from '../../__generated__/RemoteReflection_reflection.graphql' import ReflectionCardAuthor from '../ReflectionCard/ReflectionCardAuthor' import ReflectionCardRoot from '../ReflectionCard/ReflectionCardRoot' import ReflectionEditorWrapper from '../ReflectionEditorWrapper' diff --git a/packages/client/components/ReflectionGroup/useSpotlightReflectionGroup.ts b/packages/client/components/ReflectionGroup/useSpotlightReflectionGroup.ts index c4c91b4efba..dbdfcd9511e 100644 --- a/packages/client/components/ReflectionGroup/useSpotlightReflectionGroup.ts +++ b/packages/client/components/ReflectionGroup/useSpotlightReflectionGroup.ts @@ -1,7 +1,7 @@ import {useMemo} from 'react' -import useSpotlightResults from '~/hooks/useSpotlightResults' import {ReflectionGroup_meeting$data} from '~/__generated__/ReflectionGroup_meeting.graphql' import {ReflectionGroup_reflectionGroup$data} from '~/__generated__/ReflectionGroup_reflectionGroup.graphql' +import useSpotlightResults from '~/hooks/useSpotlightResults' import useSpotlightVisibleReflections from './useSpotlightVisibleReflections' const useSpotlightReflectionGroup = ( diff --git a/packages/client/components/ReflectionGroupHeader.tsx b/packages/client/components/ReflectionGroupHeader.tsx index 85848189b46..9e79985b3e2 100644 --- a/packages/client/components/ReflectionGroupHeader.tsx +++ b/packages/client/components/ReflectionGroupHeader.tsx @@ -3,13 +3,13 @@ import {Edit} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {forwardRef, Ref, RefObject} from 'react' import {useFragment} from 'react-relay' +import {ReflectionGroupHeader_meeting$key} from '../__generated__/ReflectionGroupHeader_meeting.graphql' +import {ReflectionGroupHeader_reflectionGroup$key} from '../__generated__/ReflectionGroupHeader_reflectionGroup.graphql' import {PortalStatus} from '../hooks/usePortal' import {PALETTE} from '../styles/paletteV3' import {ElementWidth, Gutters} from '../types/constEnums' import {GROUP, VOTE} from '../utils/constants' import plural from '../utils/plural' -import {ReflectionGroupHeader_meeting$key} from '../__generated__/ReflectionGroupHeader_meeting.graphql' -import {ReflectionGroupHeader_reflectionGroup$key} from '../__generated__/ReflectionGroupHeader_reflectionGroup.graphql' import ReflectionGroupTitleEditor from './ReflectionGroup/ReflectionGroupTitleEditor' import ReflectionGroupVoting from './ReflectionGroupVoting' import BaseTag from './Tag/BaseTag' diff --git a/packages/client/components/ReflectionGroupVoting.tsx b/packages/client/components/ReflectionGroupVoting.tsx index 0797172425e..78b4c0b9cad 100644 --- a/packages/client/components/ReflectionGroupVoting.tsx +++ b/packages/client/components/ReflectionGroupVoting.tsx @@ -6,14 +6,14 @@ import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' import useMutationProps from '~/hooks/useMutationProps' import Atmosphere from '../Atmosphere' +import {ReflectionGroupVoting_meeting$key} from '../__generated__/ReflectionGroupVoting_meeting.graphql' +import {ReflectionGroupVoting_reflectionGroup$key} from '../__generated__/ReflectionGroupVoting_reflectionGroup.graphql' import VoteForReflectionGroupMutation from '../mutations/VoteForReflectionGroupMutation' import {PALETTE} from '../styles/paletteV3' import {CompletedHandler} from '../types/relayMutations' import getGraphQLError from '../utils/relay/getGraphQLError' import isTempId from '../utils/relay/isTempId' import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps' -import {ReflectionGroupVoting_meeting$key} from '../__generated__/ReflectionGroupVoting_meeting.graphql' -import {ReflectionGroupVoting_reflectionGroup$key} from '../__generated__/ReflectionGroupVoting_reflectionGroup.graphql' import FlatButton from './FlatButton' interface Props extends WithMutationProps { diff --git a/packages/client/components/RequestToJoinOrgNotification.tsx b/packages/client/components/RequestToJoinOrgNotification.tsx index a2328c8c604..f48163a99ff 100644 --- a/packages/client/components/RequestToJoinOrgNotification.tsx +++ b/packages/client/components/RequestToJoinOrgNotification.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' -import {useLocation} from 'react-router' import React from 'react' import {useFragment} from 'react-relay' +import {useLocation} from 'react-router' import {RequestToJoinOrgNotification_notification$key} from '~/__generated__/RequestToJoinOrgNotification_notification.graphql' +import useRouter from '../hooks/useRouter' import NotificationAction from './NotificationAction' import NotificationTemplate from './NotificationTemplate' -import useRouter from '../hooks/useRouter' interface Props { notification: RequestToJoinOrgNotification_notification$key diff --git a/packages/client/components/ResponseMentioned.tsx b/packages/client/components/ResponseMentioned.tsx index e948edc9388..57a42589138 100644 --- a/packages/client/components/ResponseMentioned.tsx +++ b/packages/client/components/ResponseMentioned.tsx @@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {useFragment} from 'react-relay' import NotificationAction from '~/components/NotificationAction' -import useRouter from '../hooks/useRouter' +import useAtmosphere from '~/hooks/useAtmosphere' import {ResponseMentioned_notification$key} from '../__generated__/ResponseMentioned_notification.graphql' -import NotificationTemplate from './NotificationTemplate' +import useRouter from '../hooks/useRouter' import SendClientSideEvent from '../utils/SendClientSideEvent' -import useAtmosphere from '~/hooks/useAtmosphere' +import NotificationTemplate from './NotificationTemplate' interface Props { notification: ResponseMentioned_notification$key diff --git a/packages/client/components/ResponseReplied.tsx b/packages/client/components/ResponseReplied.tsx index 9c36ebd249e..3f84dbfa717 100644 --- a/packages/client/components/ResponseReplied.tsx +++ b/packages/client/components/ResponseReplied.tsx @@ -4,12 +4,12 @@ import {Editor} from 'draft-js' import React from 'react' import {useFragment} from 'react-relay' import NotificationAction from '~/components/NotificationAction' +import {ResponseReplied_notification$key} from '../__generated__/ResponseReplied_notification.graphql' import useEditorState from '../hooks/useEditorState' import useRouter from '../hooks/useRouter' import {cardShadow} from '../styles/elevation' -import {ResponseReplied_notification$key} from '../__generated__/ResponseReplied_notification.graphql' -import NotificationTemplate from './NotificationTemplate' import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg' +import NotificationTemplate from './NotificationTemplate' const EditorWrapper = styled('div')({ backgroundColor: '#fff', diff --git a/packages/client/components/RetroDiscussPhase.tsx b/packages/client/components/RetroDiscussPhase.tsx index b765f19874f..36cb0a6cd65 100644 --- a/packages/client/components/RetroDiscussPhase.tsx +++ b/packages/client/components/RetroDiscussPhase.tsx @@ -4,20 +4,20 @@ import * as Sentry from '@sentry/browser' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {RetroDiscussPhase_meeting$key} from '~/__generated__/RetroDiscussPhase_meeting.graphql' import useBreakpoint from '~/hooks/useBreakpoint' import useCallbackRef from '~/hooks/useCallbackRef' -import {RetroDiscussPhase_meeting$key} from '~/__generated__/RetroDiscussPhase_meeting.graphql' import EditorHelpModalContainer from '../containers/EditorHelpModalContainer/EditorHelpModalContainer' import {PALETTE} from '../styles/paletteV3' import {Breakpoint} from '../types/constEnums' import {phaseLabelLookup} from '../utils/meetings/lookups' import plural from '../utils/plural' +import DiscussPhaseReflectionGrid from './DiscussPhaseReflectionGrid' +import DiscussPhaseSqueeze from './DiscussPhaseSqueeze' import {DiscussionThreadables} from './DiscussionThreadList' import DiscussionThreadListEmptyState from './DiscussionThreadListEmptyState' import DiscussionThreadListEmptyTranscriptState from './DiscussionThreadListEmptyTranscriptState' import DiscussionThreadRoot from './DiscussionThreadRoot' -import DiscussPhaseReflectionGrid from './DiscussPhaseReflectionGrid' -import DiscussPhaseSqueeze from './DiscussPhaseSqueeze' import LabelHeading from './LabelHeading/LabelHeading' import MeetingContent from './MeetingContent' import MeetingHeaderAndPhase from './MeetingHeaderAndPhase' @@ -26,9 +26,9 @@ import PhaseHeaderDescription from './PhaseHeaderDescription' import PhaseHeaderTitle from './PhaseHeaderTitle' import PhaseWrapper from './PhaseWrapper' import ReflectionGroup from './ReflectionGroup/ReflectionGroup' +import RetroDiscussionThreadHeader from './RetroDiscussionThreadHeader' import {RetroMeetingPhaseProps} from './RetroMeeting' import StageTimerDisplay from './StageTimerDisplay' -import RetroDiscussionThreadHeader from './RetroDiscussionThreadHeader' interface Props extends RetroMeetingPhaseProps { meeting: RetroDiscussPhase_meeting$key diff --git a/packages/client/components/RetroDiscussionThreadHeader.tsx b/packages/client/components/RetroDiscussionThreadHeader.tsx index 4317ba26d8b..15a0a29786b 100644 --- a/packages/client/components/RetroDiscussionThreadHeader.tsx +++ b/packages/client/components/RetroDiscussionThreadHeader.tsx @@ -1,13 +1,13 @@ -import React from 'react' -import FlatButton from './FlatButton' -import graphql from 'babel-plugin-relay/macro' import styled from '@emotion/styled' -import useAtmosphere from '../hooks/useAtmosphere' -import {commitLocalUpdate} from 'relay-runtime' +import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {useFragment} from 'react-relay' +import {commitLocalUpdate} from 'relay-runtime' +import {RetroDiscussionThreadHeader_organization$key} from '~/__generated__/RetroDiscussionThreadHeader_organization.graphql' +import useAtmosphere from '../hooks/useAtmosphere' import {PALETTE} from '../styles/paletteV3' import {Header} from './DiscussionThreadList' -import {RetroDiscussionThreadHeader_organization$key} from '~/__generated__/RetroDiscussionThreadHeader_organization.graphql' +import FlatButton from './FlatButton' const HeaderWrapper = styled('div')({ display: 'flex', diff --git a/packages/client/components/RetroDrawer.tsx b/packages/client/components/RetroDrawer.tsx index e03b4949533..bb877492d7c 100644 --- a/packages/client/components/RetroDrawer.tsx +++ b/packages/client/components/RetroDrawer.tsx @@ -2,13 +2,13 @@ import {Close} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {RetroDrawerQuery} from '../__generated__/RetroDrawerQuery.graphql' +import useBreakpoint from '../hooks/useBreakpoint' import {Breakpoint, DiscussionThreadEnum} from '../types/constEnums' -import ResponsiveDashSidebar from './ResponsiveDashSidebar' import MeetingOptions from './MeetingOptions' +import ResponsiveDashSidebar from './ResponsiveDashSidebar' import RetroDrawerTemplateCard from './RetroDrawerTemplateCard' import {Drawer} from './TeamPrompt/TeamPromptDrawer' -import {RetroDrawerQuery} from '../__generated__/RetroDrawerQuery.graphql' -import useBreakpoint from '../hooks/useBreakpoint' interface Props { setShowDrawer: (showDrawer: boolean) => void diff --git a/packages/client/components/RetroDrawerTemplateCard.tsx b/packages/client/components/RetroDrawerTemplateCard.tsx index 73fa7c30e3e..4d668edeab1 100644 --- a/packages/client/components/RetroDrawerTemplateCard.tsx +++ b/packages/client/components/RetroDrawerTemplateCard.tsx @@ -1,15 +1,14 @@ -import {ActivityBadge} from './ActivityLibrary/ActivityBadge' -import {ActivityLibraryCardDescription} from './ActivityLibrary/ActivityLibraryCardDescription' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {ActivityLibraryCard} from './ActivityLibrary/ActivityLibraryCard' -import {ActivityCardImage} from './ActivityLibrary/ActivityCard' import {RetroDrawerTemplateCard_template$key} from '~/__generated__/RetroDrawerTemplateCard_template.graphql' -import {CategoryID, CATEGORY_THEMES} from '././ActivityLibrary/Categories' -import UpdateMeetingTemplateMutation from '../mutations/UpdateMeetingTemplateMutation' -import useMutationProps from '../hooks/useMutationProps' import useAtmosphere from '../hooks/useAtmosphere' +import useMutationProps from '../hooks/useMutationProps' +import UpdateMeetingTemplateMutation from '../mutations/UpdateMeetingTemplateMutation' +import {CATEGORY_THEMES, CategoryID} from '././ActivityLibrary/Categories' +import {ActivityBadge} from './ActivityLibrary/ActivityBadge' +import {ActivityCard, ActivityCardImage} from './ActivityLibrary/ActivityCard' +import {ActivityLibraryCardDescription} from './ActivityLibrary/ActivityLibraryCardDescription' interface Props { templateRef: RetroDrawerTemplateCard_template$key @@ -49,27 +48,29 @@ const RetroDrawerTemplateCard = (props: Props) => { return (
- Premium - ) : null - } - > - - - +
+ Premium + ) : null + } + > + + + +
) } diff --git a/packages/client/components/RetroGroupPhase.tsx b/packages/client/components/RetroGroupPhase.tsx index e9a9fd6c827..52dafdf05a8 100644 --- a/packages/client/components/RetroGroupPhase.tsx +++ b/packages/client/components/RetroGroupPhase.tsx @@ -3,11 +3,19 @@ import graphql from 'babel-plugin-relay/macro' * Renders the UI for the reflection phase of the retrospective meeting * */ +import styled from '@emotion/styled' +import {Info as InfoIcon} from '@mui/icons-material' import React from 'react' import {useFragment} from 'react-relay' -import {Info as InfoIcon} from '@mui/icons-material' -import useCallbackRef from '~/hooks/useCallbackRef' import {RetroGroupPhase_meeting$key} from '~/__generated__/RetroGroupPhase_meeting.graphql' +import useCallbackRef from '~/hooks/useCallbackRef' +import useAtmosphere from '../hooks/useAtmosphere' +import {MenuPosition} from '../hooks/useCoords' +import useMutationProps from '../hooks/useMutationProps' +import useTooltip from '../hooks/useTooltip' +import AutogroupMutation from '../mutations/AutogroupMutation' +import ResetReflectionGroupsMutation from '../mutations/ResetReflectionGroupsMutation' +import {Elevation} from '../styles/elevation' import {phaseLabelLookup} from '../utils/meetings/lookups' import GroupingKanban from './GroupingKanban' import MeetingContent from './MeetingContent' @@ -17,17 +25,9 @@ import MeetingTopBar from './MeetingTopBar' import PhaseHeaderDescription from './PhaseHeaderDescription' import PhaseHeaderTitle from './PhaseHeaderTitle' import PhaseWrapper from './PhaseWrapper' +import PrimaryButton from './PrimaryButton' import {RetroMeetingPhaseProps} from './RetroMeeting' import StageTimerDisplay from './StageTimerDisplay' -import PrimaryButton from './PrimaryButton' -import styled from '@emotion/styled' -import AutogroupMutation from '../mutations/AutogroupMutation' -import ResetReflectionGroupsMutation from '../mutations/ResetReflectionGroupsMutation' -import useAtmosphere from '../hooks/useAtmosphere' -import useMutationProps from '../hooks/useMutationProps' -import {Elevation} from '../styles/elevation' -import useTooltip from '../hooks/useTooltip' -import {MenuPosition} from '../hooks/useCoords' const ButtonWrapper = styled('div')({ display: 'flex', diff --git a/packages/client/components/RetroMeetingSidebar.tsx b/packages/client/components/RetroMeetingSidebar.tsx index 01722e479bd..a77fbd832ee 100644 --- a/packages/client/components/RetroMeetingSidebar.tsx +++ b/packages/client/components/RetroMeetingSidebar.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import React, {Fragment, useState} from 'react' import {useFragment} from 'react-relay' -import useRouter from '~/hooks/useRouter' -import isDemoRoute from '~/utils/isDemoRoute' import { NewMeetingPhaseTypeEnum, RetroMeetingSidebar_meeting$key } from '~/__generated__/RetroMeetingSidebar_meeting.graphql' +import useRouter from '~/hooks/useRouter' +import isDemoRoute from '~/utils/isDemoRoute' import useAtmosphere from '../hooks/useAtmosphere' import useGotoStageId from '../hooks/useGotoStageId' import getSidebarItemStage from '../utils/getSidebarItemStage' diff --git a/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx b/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx index 1053c5b95bc..d5ce339b896 100644 --- a/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx +++ b/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx @@ -4,6 +4,7 @@ import {EditorState} from 'draft-js' import React, {RefObject, useEffect, useMemo, useRef} from 'react' import {useFragment} from 'react-relay' import {PhaseItemColumn_prompt$key} from '~/__generated__/PhaseItemColumn_prompt.graphql' +import {PhaseItemColumn_meeting$key} from '../../__generated__/PhaseItemColumn_meeting.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import {MenuPosition} from '../../hooks/useCoords' import useForceUpdate from '../../hooks/useForceUpdate' @@ -13,7 +14,6 @@ import {DECELERATE} from '../../styles/animation' import {PALETTE} from '../../styles/paletteV3' import {BezierCurve, ElementWidth, Gutters} from '../../types/constEnums' import getNextSortOrder from '../../utils/getNextSortOrder' -import {PhaseItemColumn_meeting$key} from '../../__generated__/PhaseItemColumn_meeting.graphql' import RetroPrompt from '../RetroPrompt' import PhaseItemChits from './PhaseItemChits' import PhaseItemEditor from './PhaseItemEditor' diff --git a/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx b/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx index 4edc7791790..51dfc541425 100644 --- a/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx +++ b/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx @@ -1,10 +1,12 @@ import styled from '@emotion/styled' -import {Stack} from 'immutable' import graphql from 'babel-plugin-relay/macro' -import {convertFromRaw, convertToRaw, EditorState, ContentState} from 'draft-js' +import {ContentState, EditorState, convertFromRaw, convertToRaw} from 'draft-js' +import {Stack} from 'immutable' import React, {MutableRefObject, RefObject, useEffect, useRef, useState} from 'react' import {useFragment} from 'react-relay' +import {PhaseItemEditor_meeting$key} from '../../__generated__/PhaseItemEditor_meeting.graphql' import useAtmosphere from '../../hooks/useAtmosphere' +import useEditorState from '../../hooks/useEditorState' import useMutationProps from '../../hooks/useMutationProps' import usePortal from '../../hooks/usePortal' import CreateReflectionMutation from '../../mutations/CreateReflectionMutation' @@ -13,13 +15,11 @@ import {Elevation} from '../../styles/elevation' import {PALETTE} from '../../styles/paletteV3' import {BezierCurve, ZIndex} from '../../types/constEnums' import convertToTaskContent from '../../utils/draftjs/convertToTaskContent' -import {PhaseItemEditor_meeting$key} from '../../__generated__/PhaseItemEditor_meeting.graphql' import ReflectionCardAuthor from '../ReflectionCard/ReflectionCardAuthor' import ReflectionCardRoot from '../ReflectionCard/ReflectionCardRoot' import ReflectionEditorWrapper from '../ReflectionEditorWrapper' -import getBBox from './getBBox' import {ReflectColumnCardInFlight} from './PhaseItemColumn' -import useEditorState from '../../hooks/useEditorState' +import getBBox from './getBBox' const FLIGHT_TIME = 500 const CardInFlightStyles = styled(ReflectionCardRoot)<{transform: string; isStart: boolean}>( diff --git a/packages/client/components/RetroReflectPhase/ReflectionStack.tsx b/packages/client/components/RetroReflectPhase/ReflectionStack.tsx index d68242aadad..7a64cad67f4 100644 --- a/packages/client/components/RetroReflectPhase/ReflectionStack.tsx +++ b/packages/client/components/RetroReflectPhase/ReflectionStack.tsx @@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro' import React, {RefObject, useRef} from 'react' import {useFragment} from 'react-relay' import {ReflectionStack_meeting$key} from '~/__generated__/ReflectionStack_meeting.graphql' +import {PhaseItemColumn_meeting$data} from '../../__generated__/PhaseItemColumn_meeting.graphql' import useExpandedReflections from '../../hooks/useExpandedReflections' import { Breakpoint, @@ -10,7 +11,6 @@ import { ElementWidth, ReflectionStackPerspective } from '../../types/constEnums' -import {PhaseItemColumn_meeting$data} from '../../__generated__/PhaseItemColumn_meeting.graphql' import ReflectionCard from '../ReflectionCard/ReflectionCard' import ExpandedReflectionStack from './ExpandedReflectionStack' import ReflectionStackPlaceholder from './ReflectionStackPlaceholder' diff --git a/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx b/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx index 493ae73247c..9fa7a86cfab 100644 --- a/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx +++ b/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {useFragment} from 'react-relay' -import useCallbackRef from '~/hooks/useCallbackRef' import {RetroReflectPhase_meeting$key} from '~/__generated__/RetroReflectPhase_meeting.graphql' +import useCallbackRef from '~/hooks/useCallbackRef' import useBreakpoint from '../../hooks/useBreakpoint' import {Breakpoint} from '../../types/constEnums' import {phaseLabelLookup} from '../../utils/meetings/lookups' @@ -15,8 +15,8 @@ import PhaseWrapper from '../PhaseWrapper' import {RetroMeetingPhaseProps} from '../RetroMeeting' import StageTimerDisplay from '../StageTimerDisplay' import PhaseItemColumn from './PhaseItemColumn' -import ReflectWrapperMobile from './ReflectionWrapperMobile' import ReflectWrapperDesktop from './ReflectWrapperDesktop' +import ReflectWrapperMobile from './ReflectionWrapperMobile' interface Props extends RetroMeetingPhaseProps { meeting: RetroReflectPhase_meeting$key diff --git a/packages/client/components/RetroSidebarDiscussSection.tsx b/packages/client/components/RetroSidebarDiscussSection.tsx index 4730d138d1c..d83e63fb5f6 100644 --- a/packages/client/components/RetroSidebarDiscussSection.tsx +++ b/packages/client/components/RetroSidebarDiscussSection.tsx @@ -4,13 +4,13 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' +import { + RetroSidebarDiscussSection_meeting$data, + RetroSidebarDiscussSection_meeting$key +} from '~/__generated__/RetroSidebarDiscussSection_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useGotoStageId from '~/hooks/useGotoStageId' import {DeepNonNullable} from '~/types/generics' -import { - RetroSidebarDiscussSection_meeting$key, - RetroSidebarDiscussSection_meeting$data -} from '~/__generated__/RetroSidebarDiscussSection_meeting.graphql' import DragDiscussionTopicMutation from '../mutations/DragDiscussionTopicMutation' import {navItemRaised} from '../styles/elevation' import {PALETTE} from '../styles/paletteV3' diff --git a/packages/client/components/RetroSidebarPhaseListItemChildren.tsx b/packages/client/components/RetroSidebarPhaseListItemChildren.tsx index 5ff5d86d4cf..83428fdb9e5 100644 --- a/packages/client/components/RetroSidebarPhaseListItemChildren.tsx +++ b/packages/client/components/RetroSidebarPhaseListItemChildren.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import useGotoStageId from '~/hooks/useGotoStageId' import { NewMeetingPhaseTypeEnum, RetroSidebarPhaseListItemChildren_meeting$key } from '~/__generated__/RetroSidebarPhaseListItemChildren_meeting.graphql' +import useGotoStageId from '~/hooks/useGotoStageId' import isPhaseComplete from '../utils/meetings/isPhaseComplete' import MeetingSidebarTeamMemberStageItems from './MeetingSidebarTeamMemberStageItems' import RetroSidebarDiscussSection from './RetroSidebarDiscussSection' diff --git a/packages/client/components/RetroVoteMetaHeader.tsx b/packages/client/components/RetroVoteMetaHeader.tsx index 0231438d5e6..38148c32f0d 100644 --- a/packages/client/components/RetroVoteMetaHeader.tsx +++ b/packages/client/components/RetroVoteMetaHeader.tsx @@ -3,11 +3,11 @@ import {ExpandMore} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {RetroVoteMetaHeader_meeting$key} from '~/__generated__/RetroVoteMetaHeader_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import {MenuPosition} from '~/hooks/useCoords' import useMenu from '~/hooks/useMenu' import lazyPreload from '~/utils/lazyPreload' -import {RetroVoteMetaHeader_meeting$key} from '~/__generated__/RetroVoteMetaHeader_meeting.graphql' import {PALETTE} from '../styles/paletteV3' import {FONT_FAMILY} from '../styles/typographyV2' import {Breakpoint} from '../types/constEnums' diff --git a/packages/client/components/ReviewRequestToJoinOrgModal.tsx b/packages/client/components/ReviewRequestToJoinOrgModal.tsx index 2604455e6f6..dcdd9844a2f 100644 --- a/packages/client/components/ReviewRequestToJoinOrgModal.tsx +++ b/packages/client/components/ReviewRequestToJoinOrgModal.tsx @@ -1,14 +1,14 @@ import graphql from 'babel-plugin-relay/macro' -import React, {useState, useMemo} from 'react' -import {PreloadedQuery, usePreloadedQuery, useFragment} from 'react-relay' +import React, {useMemo, useState} from 'react' +import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay' +import {ReviewRequestToJoinOrgModalQuery} from '../__generated__/ReviewRequestToJoinOrgModalQuery.graphql' +import {ReviewRequestToJoinOrgModal_viewer$key} from '../__generated__/ReviewRequestToJoinOrgModal_viewer.graphql' +import useAcceptRequestToJoinDomainMutation from '../mutations/useAcceptRequestToJoinDomainMutation' +import Checkbox from './Checkbox' import DialogContainer from './DialogContainer' import DialogTitle from './DialogTitle' import PrimaryButton from './PrimaryButton' import SecondaryButton from './SecondaryButton' -import {ReviewRequestToJoinOrgModalQuery} from '../__generated__/ReviewRequestToJoinOrgModalQuery.graphql' -import {ReviewRequestToJoinOrgModal_viewer$key} from '../__generated__/ReviewRequestToJoinOrgModal_viewer.graphql' -import Checkbox from './Checkbox' -import useAcceptRequestToJoinDomainMutation from '../mutations/useAcceptRequestToJoinDomainMutation' const ReviewRequestToJoinOrgModalViewerFragment = graphql` fragment ReviewRequestToJoinOrgModal_viewer on User diff --git a/packages/client/components/ReviewRequestToJoinOrgRoot.tsx b/packages/client/components/ReviewRequestToJoinOrgRoot.tsx index e35f9011012..d4a4d018008 100644 --- a/packages/client/components/ReviewRequestToJoinOrgRoot.tsx +++ b/packages/client/components/ReviewRequestToJoinOrgRoot.tsx @@ -1,12 +1,12 @@ import React, {Suspense, useCallback, useEffect} from 'react' import {useHistory, useLocation} from 'react-router' -import useRouter from '../hooks/useRouter' -import useModal from '../hooks/useModal' import ReviewRequestToJoinOrgModal from '~/components/ReviewRequestToJoinOrgModal' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import reviewRequestToJoinOrgModalQuery, { ReviewRequestToJoinOrgModalQuery } from '../__generated__/ReviewRequestToJoinOrgModalQuery.graphql' +import useModal from '../hooks/useModal' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' +import useRouter from '../hooks/useRouter' const ReviewRequestToJoinOrgRoot = () => { const {match} = useRouter<{requestId: string}>() diff --git a/packages/client/components/ScheduleDialog.tsx b/packages/client/components/ScheduleDialog.tsx index 39f484dbff1..b3c6d5f6724 100644 --- a/packages/client/components/ScheduleDialog.tsx +++ b/packages/client/components/ScheduleDialog.tsx @@ -1,34 +1,34 @@ -import React, {ChangeEvent, useState} from 'react' -import {RecurrenceSettings} from './Recurrence/RecurrenceSettings' -import * as Collapsible from '@radix-ui/react-collapsible' import {EventRepeat, ExpandMore} from '@mui/icons-material' -import PrimaryButton from './PrimaryButton' -import {DialogActions} from '../ui/Dialog/DialogActions' -import SecondaryButton from './SecondaryButton' -import GcalSettings, { - GcalEventInput -} from '../modules/userDashboard/components/GcalModal/GcalSettings' -import logo from '../styles/theme/images/graphics/google.svg' -import gcalLogo from '../styles/theme/images/graphics/google-calendar.svg' -import useForm from '../hooks/useForm' -import StyledError from './StyledError' -import GcalClientManager from '../utils/GcalClientManager' -import SendClientSideEvent from '../utils/SendClientSideEvent' +import * as Collapsible from '@radix-ui/react-collapsible' import graphql from 'babel-plugin-relay/macro' +import clsx from 'clsx' +import dayjs from 'dayjs' +import React, {ChangeEvent, useState} from 'react' import {useFragment} from 'react-relay' +import {RRule} from 'rrule' import {ScheduleDialog_team$key} from '~/__generated__/ScheduleDialog_team.graphql' -import useAtmosphere from '../hooks/useAtmosphere' -import {MenuMutationProps} from '../hooks/useMutationProps' -import Legitity from '../validation/Legitity' import { CreateGcalEventInput, RecurrenceSettingsInput } from '../__generated__/StartRetrospectiveMutation.graphql' -import {RRule} from 'rrule' -import dayjs from 'dayjs' -import {toHumanReadable} from './Recurrence/HumanReadableRecurrenceRule' -import clsx from 'clsx' +import useAtmosphere from '../hooks/useAtmosphere' +import useForm from '../hooks/useForm' +import {MenuMutationProps} from '../hooks/useMutationProps' +import GcalSettings, { + GcalEventInput +} from '../modules/userDashboard/components/GcalModal/GcalSettings' +import gcalLogo from '../styles/theme/images/graphics/google-calendar.svg' +import logo from '../styles/theme/images/graphics/google.svg' +import {DialogActions} from '../ui/Dialog/DialogActions' +import GcalClientManager from '../utils/GcalClientManager' +import SendClientSideEvent from '../utils/SendClientSideEvent' import plural from '../utils/plural' +import Legitity from '../validation/Legitity' +import PrimaryButton from './PrimaryButton' +import {toHumanReadable} from './Recurrence/HumanReadableRecurrenceRule' +import {RecurrenceSettings} from './Recurrence/RecurrenceSettings' +import SecondaryButton from './SecondaryButton' +import StyledError from './StyledError' const validateTitle = (title: string) => new Legitity(title).trim().min(2, `C’mon, you call that a title?`) diff --git a/packages/client/components/ScopePhase.tsx b/packages/client/components/ScopePhase.tsx index dd90d6bc720..978338259c7 100644 --- a/packages/client/components/ScopePhase.tsx +++ b/packages/client/components/ScopePhase.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import useGotoStageId from '~/hooks/useGotoStageId' import {ScopePhase_meeting$key} from '~/__generated__/ScopePhase_meeting.graphql' +import useGotoStageId from '~/hooks/useGotoStageId' import {phaseLabelLookup} from '../utils/meetings/lookups' import MeetingContent from './MeetingContent' import MeetingHeaderAndPhase from './MeetingHeaderAndPhase' diff --git a/packages/client/components/ScopePhaseArea.tsx b/packages/client/components/ScopePhaseArea.tsx index 44702ccb239..7279ffb5e71 100644 --- a/packages/client/components/ScopePhaseArea.tsx +++ b/packages/client/components/ScopePhaseArea.tsx @@ -3,16 +3,16 @@ import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {useFragment} from 'react-relay' import SwipeableViews from 'react-swipeable-views' +import {ScopePhaseArea_meeting$key} from '~/__generated__/ScopePhaseArea_meeting.graphql' import useBreakpoint from '~/hooks/useBreakpoint' import {Breakpoint} from '~/types/constEnums' -import {ScopePhaseArea_meeting$key} from '~/__generated__/ScopePhaseArea_meeting.graphql' import {Elevation} from '../styles/elevation' import {PALETTE} from '../styles/paletteV3' import AzureDevOpsSVG from './AzureDevOpsSVG' import GitHubSVG from './GitHubSVG' import GitLabSVG from './GitLabSVG' -import JiraServerSVG from './JiraServerSVG' import JiraSVG from './JiraSVG' +import JiraServerSVG from './JiraServerSVG' import ParabolLogoSVG from './ParabolLogoSVG' import ScopePhaseAreaAzureDevOps from './ScopePhaseAreaAzureDevOps' import ScopePhaseAreaGitHub from './ScopePhaseAreaGitHub' diff --git a/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx b/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx index 29a69d42b6e..02a3ed859bb 100644 --- a/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx +++ b/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx @@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import AzureDevOpsClientManager from '~/utils/AzureDevOpsClientManager' +import {ScopePhaseAreaAddAzureDevOps_meeting$key} from '../__generated__/ScopePhaseAreaAddAzureDevOps_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import {PALETTE} from '../styles/paletteV3' -import {ScopePhaseAreaAddAzureDevOps_meeting$key} from '../__generated__/ScopePhaseAreaAddAzureDevOps_meeting.graphql' import AzureDevOpsSVG from './AzureDevOpsSVG' import RaisedButton from './RaisedButton' diff --git a/packages/client/components/ScopePhaseAreaAddGitHub.tsx b/packages/client/components/ScopePhaseAreaAddGitHub.tsx index 8984f860735..d761088d452 100644 --- a/packages/client/components/ScopePhaseAreaAddGitHub.tsx +++ b/packages/client/components/ScopePhaseAreaAddGitHub.tsx @@ -2,11 +2,11 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {ScopePhaseAreaAddGitHub_meeting$key} from '../__generated__/ScopePhaseAreaAddGitHub_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import {PALETTE} from '../styles/paletteV3' import GitHubClientManager from '../utils/GitHubClientManager' -import {ScopePhaseAreaAddGitHub_meeting$key} from '../__generated__/ScopePhaseAreaAddGitHub_meeting.graphql' import GitHubSVG from './GitHubSVG' import RaisedButton from './RaisedButton' diff --git a/packages/client/components/ScopePhaseAreaAddGitLab.tsx b/packages/client/components/ScopePhaseAreaAddGitLab.tsx index 0625642c838..e589573c47d 100644 --- a/packages/client/components/ScopePhaseAreaAddGitLab.tsx +++ b/packages/client/components/ScopePhaseAreaAddGitLab.tsx @@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import GitLabClientManager from '~/utils/GitLabClientManager' +import {ScopePhaseAreaAddGitLab_meeting$key} from '../__generated__/ScopePhaseAreaAddGitLab_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import {PALETTE} from '../styles/paletteV3' -import {ScopePhaseAreaAddGitLab_meeting$key} from '../__generated__/ScopePhaseAreaAddGitLab_meeting.graphql' import GitLabSVG from './GitLabSVG' import RaisedButton from './RaisedButton' diff --git a/packages/client/components/ScopePhaseAreaAddJira.tsx b/packages/client/components/ScopePhaseAreaAddJira.tsx index 7fda1f3697c..2d48d5e7da7 100644 --- a/packages/client/components/ScopePhaseAreaAddJira.tsx +++ b/packages/client/components/ScopePhaseAreaAddJira.tsx @@ -1,13 +1,13 @@ -import React, {useMemo} from 'react' import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' +import React, {useMemo} from 'react' import {useFragment} from 'react-relay' +import {ScopePhaseAreaAddJira_meeting$key} from '../__generated__/ScopePhaseAreaAddJira_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import {PALETTE} from '../styles/paletteV3' -import AtlassianClientManager, {ERROR_POPUP_CLOSED} from '../utils/AtlassianClientManager' import {ExternalLinks} from '../types/constEnums' -import {ScopePhaseAreaAddJira_meeting$key} from '../__generated__/ScopePhaseAreaAddJira_meeting.graphql' +import AtlassianClientManager, {ERROR_POPUP_CLOSED} from '../utils/AtlassianClientManager' import JiraSVG from './JiraSVG' import RaisedButton from './RaisedButton' diff --git a/packages/client/components/ScopePhaseAreaAddJiraServer.tsx b/packages/client/components/ScopePhaseAreaAddJiraServer.tsx index 634be0a1158..4eec0b82e43 100644 --- a/packages/client/components/ScopePhaseAreaAddJiraServer.tsx +++ b/packages/client/components/ScopePhaseAreaAddJiraServer.tsx @@ -2,11 +2,11 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {ScopePhaseAreaAddJiraServer_meeting$key} from '../__generated__/ScopePhaseAreaAddJiraServer_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import {PALETTE} from '../styles/paletteV3' import JiraServerClientManager from '../utils/JiraServerClientManager' -import {ScopePhaseAreaAddJiraServer_meeting$key} from '../__generated__/ScopePhaseAreaAddJiraServer_meeting.graphql' import JiraServerSVG from './JiraServerSVG' import RaisedButton from './RaisedButton' diff --git a/packages/client/components/ScopePhaseAreaGitHub.tsx b/packages/client/components/ScopePhaseAreaGitHub.tsx index ce15a0cd54e..7b6e5b10f09 100644 --- a/packages/client/components/ScopePhaseAreaGitHub.tsx +++ b/packages/client/components/ScopePhaseAreaGitHub.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {Providers} from '../types/constEnums' import {ScopePhaseAreaGitHub_meeting$key} from '../__generated__/ScopePhaseAreaGitHub_meeting.graphql' +import {Providers} from '../types/constEnums' import ScopePhaseAreaAddGitHub from './ScopePhaseAreaAddGitHub' import ScopePhaseAreaGitHubScoping from './ScopePhaseAreaGitHubScoping' diff --git a/packages/client/components/ScopingSearchInput.tsx b/packages/client/components/ScopingSearchInput.tsx index 1e6a21250e2..6343a6718f4 100644 --- a/packages/client/components/ScopingSearchInput.tsx +++ b/packages/client/components/ScopingSearchInput.tsx @@ -1,11 +1,11 @@ import styled from '@emotion/styled' import {Close} from '@mui/icons-material' +import {ServiceEnumType} from 'parabol-server/graphql/types/ServiceEnum' import React, {useEffect, useRef} from 'react' import {commitLocalUpdate} from 'react-relay' import useAtmosphere from '../hooks/useAtmosphere' -import SendClientSideEvent from '../utils/SendClientSideEvent' import {PALETTE} from '../styles/paletteV3' -import {ServiceEnumType} from 'parabol-server/graphql/types/ServiceEnum' +import SendClientSideEvent from '../utils/SendClientSideEvent' const SearchInput = styled('input')({ appearance: 'none', diff --git a/packages/client/components/ScopingSearchResultItem.tsx b/packages/client/components/ScopingSearchResultItem.tsx index 8b63233f05d..819571522e0 100644 --- a/packages/client/components/ScopingSearchResultItem.tsx +++ b/packages/client/components/ScopingSearchResultItem.tsx @@ -1,12 +1,12 @@ import styled from '@emotion/styled' import React from 'react' +import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation' import {PALETTE} from '../styles/paletteV3' import {Threshold} from '../types/constEnums' import isTempId from '../utils/relay/isTempId' -import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql' import Checkbox from './Checkbox' import Ellipsis from './Ellipsis/Ellipsis' diff --git a/packages/client/components/SelectMeetingDropdown.tsx b/packages/client/components/SelectMeetingDropdown.tsx index 0f992d2b09b..c6179d9c990 100644 --- a/packages/client/components/SelectMeetingDropdown.tsx +++ b/packages/client/components/SelectMeetingDropdown.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {SelectMeetingDropdown_meetings$key} from '~/__generated__/SelectMeetingDropdown_meetings.graphql' import useRouter from '~/hooks/useRouter' import {PALETTE} from '~/styles/paletteV3' import plural from '~/utils/plural' -import {SelectMeetingDropdown_meetings$key} from '~/__generated__/SelectMeetingDropdown_meetings.graphql' import {MenuProps} from '../hooks/useMenu' import Menu from './Menu' import MenuItem from './MenuItem' diff --git a/packages/client/components/SelectMeetingDropdownItem.tsx b/packages/client/components/SelectMeetingDropdownItem.tsx index b0883078e38..ba8e7114daf 100644 --- a/packages/client/components/SelectMeetingDropdownItem.tsx +++ b/packages/client/components/SelectMeetingDropdownItem.tsx @@ -9,11 +9,11 @@ import * as Sentry from '@sentry/browser' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {SelectMeetingDropdownItem_meeting$key} from '~/__generated__/SelectMeetingDropdownItem_meeting.graphql' import useRouter from '~/hooks/useRouter' import {PALETTE} from '~/styles/paletteV3' import getMeetingPhase from '~/utils/getMeetingPhase' import {meetingTypeToIcon, phaseLabelLookup} from '~/utils/meetings/lookups' -import {SelectMeetingDropdownItem_meeting$key} from '~/__generated__/SelectMeetingDropdownItem_meeting.graphql' const Wrapper = styled('div')({ alignItems: 'center', diff --git a/packages/client/components/SelectSharingScopeDropdown.tsx b/packages/client/components/SelectSharingScopeDropdown.tsx index 2ca135a9214..57d2af47173 100644 --- a/packages/client/components/SelectSharingScopeDropdown.tsx +++ b/packages/client/components/SelectSharingScopeDropdown.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {SelectSharingScopeDropdown_template$key} from '../__generated__/SelectSharingScopeDropdown_template.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' import useMutationProps from '../hooks/useMutationProps' import UpdatePokerTemplateScopeMutation from '../mutations/UpdatePokerTemplateScopeMutation' import UpdateReflectTemplateScopeMutation from '../mutations/UpdateReflectTemplateScopeMutation' -import {SelectSharingScopeDropdown_template$key} from '../__generated__/SelectSharingScopeDropdown_template.graphql' import DropdownMenuIconItemLabel from './DropdownMenuIconItemLabel' import Menu from './Menu' import MenuItem from './MenuItem' diff --git a/packages/client/components/ShareTopicModal.tsx b/packages/client/components/ShareTopicModal.tsx index 2d80a9dc959..98fe17407de 100644 --- a/packages/client/components/ShareTopicModal.tsx +++ b/packages/client/components/ShareTopicModal.tsx @@ -1,27 +1,27 @@ +import graphql from 'babel-plugin-relay/macro' import React from 'react' -import {PreloadedQuery, usePreloadedQuery, useFragment} from 'react-relay' -import PrimaryButton from './PrimaryButton' -import SecondaryButton from './SecondaryButton' +import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay' +import {ShareTopicModalQuery} from '../__generated__/ShareTopicModalQuery.graphql' +import {ShareTopicModal_viewer$key} from '../__generated__/ShareTopicModal_viewer.graphql' +import useAtmosphere from '../hooks/useAtmosphere' +import useMutationProps from '../hooks/useMutationProps' +import useSlackChannels from '../hooks/useSlackChannels' +import useShareTopicMutation from '../mutations/useShareTopicMutation' import {Dialog} from '../ui/Dialog/Dialog' +import {DialogActions} from '../ui/Dialog/DialogActions' import {DialogContent} from '../ui/Dialog/DialogContent' -import {DialogTitle} from '../ui/Dialog/DialogTitle' import {DialogDescription} from '../ui/Dialog/DialogDescription' -import {DialogActions} from '../ui/Dialog/DialogActions' -import useShareTopicMutation from '../mutations/useShareTopicMutation' +import {DialogTitle} from '../ui/Dialog/DialogTitle' import {Select} from '../ui/Select/Select' +import {SelectContent} from '../ui/Select/SelectContent' +import {SelectGroup} from '../ui/Select/SelectGroup' import {SelectItem} from '../ui/Select/SelectItem' import {SelectTrigger} from '../ui/Select/SelectTrigger' -import {SelectGroup} from '../ui/Select/SelectGroup' import {SelectValue} from '../ui/Select/SelectValue' -import {SelectContent} from '../ui/Select/SelectContent' -import graphql from 'babel-plugin-relay/macro' -import {ShareTopicModalQuery} from '../__generated__/ShareTopicModalQuery.graphql' -import {ShareTopicModal_viewer$key} from '../__generated__/ShareTopicModal_viewer.graphql' import SlackClientManager from '../utils/SlackClientManager' -import useMutationProps from '../hooks/useMutationProps' -import useAtmosphere from '../hooks/useAtmosphere' -import useSlackChannels from '../hooks/useSlackChannels' import findStageById from '../utils/meetings/findStageById' +import PrimaryButton from './PrimaryButton' +import SecondaryButton from './SecondaryButton' interface Props { isOpen: boolean diff --git a/packages/client/components/ShareTopicRoot.tsx b/packages/client/components/ShareTopicRoot.tsx index 66da72f76d5..04f248254c2 100644 --- a/packages/client/components/ShareTopicRoot.tsx +++ b/packages/client/components/ShareTopicRoot.tsx @@ -1,10 +1,10 @@ import React, {Suspense} from 'react' import ShareTopicModal from '~/components/ShareTopicModal' -import {Loader} from '../utils/relay/renderLoader' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import shareTopicModalQuery, { ShareTopicModalQuery } from '../__generated__/ShareTopicModalQuery.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' +import {Loader} from '../utils/relay/renderLoader' interface Props { onClose: () => void diff --git a/packages/client/components/ShareTopicRouterRoot.tsx b/packages/client/components/ShareTopicRouterRoot.tsx index 7f13c349bbf..de90986081c 100644 --- a/packages/client/components/ShareTopicRouterRoot.tsx +++ b/packages/client/components/ShareTopicRouterRoot.tsx @@ -1,12 +1,12 @@ import React, {Suspense, useCallback} from 'react' import {useHistory, useLocation} from 'react-router' -import useRouter from '../hooks/useRouter' import ShareTopicModal from '~/components/ShareTopicModal' -import {Loader} from '../utils/relay/renderLoader' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import shareTopicModalQuery, { ShareTopicModalQuery } from '../__generated__/ShareTopicModalQuery.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' +import useRouter from '../hooks/useRouter' +import {Loader} from '../utils/relay/renderLoader' const ShareTopicRouterRoot = () => { const {match} = useRouter<{stageId: string; meetingId: string}>() diff --git a/packages/client/components/SpotlightModal.tsx b/packages/client/components/SpotlightModal.tsx index a204ae380ee..e885b01250a 100644 --- a/packages/client/components/SpotlightModal.tsx +++ b/packages/client/components/SpotlightModal.tsx @@ -5,10 +5,10 @@ import {useFragment} from 'react-relay' import {PortalStatus} from '~/hooks/usePortal' import {MAX_SPOTLIGHT_COLUMNS, SPOTLIGHT_TOP_SECTION_HEIGHT} from '~/utils/constants' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' +import {SpotlightModal_meeting$key} from '../__generated__/SpotlightModal_meeting.graphql' import {Elevation} from '../styles/elevation' import {PALETTE} from '../styles/paletteV3' import {BezierCurve, Breakpoint, ElementWidth, Times, ZIndex} from '../types/constEnums' -import {SpotlightModal_meeting$key} from '../__generated__/SpotlightModal_meeting.graphql' import SpotlightResultsRoot from './SpotlightResultsRoot' import SpotlightSearchBar from './SpotlightSearchBar' import SpotlightSourceGroup from './SpotlightSourceGroup' diff --git a/packages/client/components/SpotlightResults.tsx b/packages/client/components/SpotlightResults.tsx index 2c6bf66b5f5..cd2b0c88f9b 100644 --- a/packages/client/components/SpotlightResults.tsx +++ b/packages/client/components/SpotlightResults.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {RefObject, useRef} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {SpotlightResultsQuery} from '~/__generated__/SpotlightResultsQuery.graphql' import useResultsHeight from '~/hooks/useResultsHeight' import {ElementHeight, ElementWidth} from '~/types/constEnums' -import {SpotlightResultsQuery} from '~/__generated__/SpotlightResultsQuery.graphql' import useGroupMatrix from '../hooks/useGroupMatrix' import ReflectionGroup from './ReflectionGroup/ReflectionGroup' import SpotlightResultsEmptyState from './SpotlightResultsEmptyState' diff --git a/packages/client/components/SpotlightSearchBar.tsx b/packages/client/components/SpotlightSearchBar.tsx index d2e689326e6..a85b2e21b30 100644 --- a/packages/client/components/SpotlightSearchBar.tsx +++ b/packages/client/components/SpotlightSearchBar.tsx @@ -5,10 +5,10 @@ import React, {useRef} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' import SendClientSideEvent from '~/utils/SendClientSideEvent' import Atmosphere from '../Atmosphere' +import {SpotlightSearchBar_meeting$key} from '../__generated__/SpotlightSearchBar_meeting.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {PALETTE} from '../styles/paletteV3' import {ElementHeight, ElementWidth} from '../types/constEnums' -import {SpotlightSearchBar_meeting$key} from '../__generated__/SpotlightSearchBar_meeting.graphql' import MenuItemComponentAvatar from './MenuItemComponentAvatar' import MenuItemLabel from './MenuItemLabel' diff --git a/packages/client/components/SpotlightSourceGroup.tsx b/packages/client/components/SpotlightSourceGroup.tsx index 0caaa45f145..5d23a6a38a7 100644 --- a/packages/client/components/SpotlightSourceGroup.tsx +++ b/packages/client/components/SpotlightSourceGroup.tsx @@ -2,8 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {RefObject} from 'react' import {useFragment} from 'react-relay' -import {ElementHeight} from '../types/constEnums' import {SpotlightSourceGroup_meeting$key} from '../__generated__/SpotlightSourceGroup_meeting.graphql' +import {ElementHeight} from '../types/constEnums' import ReflectionGroup from './ReflectionGroup/ReflectionGroup' const Source = styled('div')({ diff --git a/packages/client/components/StageTimerControl.tsx b/packages/client/components/StageTimerControl.tsx index b541e7a3be5..9ac8d00ec9d 100644 --- a/packages/client/components/StageTimerControl.tsx +++ b/packages/client/components/StageTimerControl.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {TransitionStatus} from '~/hooks/useTransition' import {StageTimerControl_meeting$key} from '~/__generated__/StageTimerControl_meeting.graphql' +import {TransitionStatus} from '~/hooks/useTransition' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import {MeetingLabels} from '../types/constEnums' diff --git a/packages/client/components/StageTimerDisplay.tsx b/packages/client/components/StageTimerDisplay.tsx index ad654014eb2..5edba7dd6c5 100644 --- a/packages/client/components/StageTimerDisplay.tsx +++ b/packages/client/components/StageTimerDisplay.tsx @@ -2,12 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {StageTimerDisplay_meeting$key} from '~/__generated__/StageTimerDisplay_meeting.graphql' import PhaseCompleteTag from '~/components/Tag/PhaseCompleteTag' import UndoableGroupPhaseControl from '~/components/UndoableGroupPhaseControl' import useAtmosphere from '~/hooks/useAtmosphere' import {Breakpoint} from '~/types/constEnums' import isDemoRoute from '~/utils/isDemoRoute' -import {StageTimerDisplay_meeting$key} from '~/__generated__/StageTimerDisplay_meeting.graphql' import StageTimerDisplayGauge from './StageTimerDisplayGauge' interface Props { diff --git a/packages/client/components/StageTimerModal.tsx b/packages/client/components/StageTimerModal.tsx index 06aff10725a..e9f30b379fb 100644 --- a/packages/client/components/StageTimerModal.tsx +++ b/packages/client/components/StageTimerModal.tsx @@ -4,10 +4,10 @@ import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {useFragment} from 'react-relay' import SwipeableViews from 'react-swipeable-views' -import {MenuProps} from '../hooks/useMenu' -import {PALETTE} from '../styles/paletteV3' import {StageTimerModal_facilitator$key} from '../__generated__/StageTimerModal_facilitator.graphql' import {StageTimerModal_stage$key} from '../__generated__/StageTimerModal_stage.graphql' +import {MenuProps} from '../hooks/useMenu' +import {PALETTE} from '../styles/paletteV3' import StageTimerModalEditTimeEnd from './StageTimerModalEditTimeEnd' import StageTimerModalEditTimeLimit from './StageTimerModalEditTimeLimit' import StageTimerModalEndTime from './StageTimerModalEndTime' diff --git a/packages/client/components/StageTimerModalEditTimeEnd.tsx b/packages/client/components/StageTimerModalEditTimeEnd.tsx index b680cb7f876..d1857b20ed9 100644 --- a/packages/client/components/StageTimerModalEditTimeEnd.tsx +++ b/packages/client/components/StageTimerModalEditTimeEnd.tsx @@ -3,13 +3,13 @@ import {Stop} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {StageTimerModalEditTimeEnd_facilitator$key} from '../__generated__/StageTimerModalEditTimeEnd_facilitator.graphql' +import {StageTimerModalEditTimeEnd_stage$key} from '../__generated__/StageTimerModalEditTimeEnd_stage.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import SetStageTimerMutation from '../mutations/SetStageTimerMutation' import {PALETTE} from '../styles/paletteV3' import {MeetingLabels} from '../types/constEnums' -import {StageTimerModalEditTimeEnd_facilitator$key} from '../__generated__/StageTimerModalEditTimeEnd_facilitator.graphql' -import {StageTimerModalEditTimeEnd_stage$key} from '../__generated__/StageTimerModalEditTimeEnd_stage.graphql' import MenuItemHR from './MenuItemHR' import PlainButton from './PlainButton/PlainButton' import StageTimerModalEndTime from './StageTimerModalEndTime' diff --git a/packages/client/components/StageTimerModalEditTimeLimit.tsx b/packages/client/components/StageTimerModalEditTimeLimit.tsx index 0c001e7d0d2..827e3f56b7a 100644 --- a/packages/client/components/StageTimerModalEditTimeLimit.tsx +++ b/packages/client/components/StageTimerModalEditTimeLimit.tsx @@ -3,12 +3,12 @@ import {TimerOff} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {StageTimerModalEditTimeLimit_stage$key} from '../__generated__/StageTimerModalEditTimeLimit_stage.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import SetStageTimerMutation from '../mutations/SetStageTimerMutation' import {PALETTE} from '../styles/paletteV3' import {MeetingLabels} from '../types/constEnums' -import {StageTimerModalEditTimeLimit_stage$key} from '../__generated__/StageTimerModalEditTimeLimit_stage.graphql' import MenuItemHR from './MenuItemHR' import PlainButton from './PlainButton/PlainButton' import StageTimerModalTimeLimit from './StageTimerModalTimeLimit' diff --git a/packages/client/components/StageTimerModalEndTime.tsx b/packages/client/components/StageTimerModalEndTime.tsx index cabe5ecfaaf..c6c3e10fbd9 100644 --- a/packages/client/components/StageTimerModalEndTime.tsx +++ b/packages/client/components/StageTimerModalEndTime.tsx @@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro' import ms from 'ms' import React, {useState} from 'react' import {useFragment} from 'react-relay' +import {StageTimerModalEndTime_facilitator$key} from '../__generated__/StageTimerModalEndTime_facilitator.graphql' +import {StageTimerModalEndTime_stage$key} from '../__generated__/StageTimerModalEndTime_stage.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import NotificationErrorMessage from '../modules/notifications/components/NotificationErrorMessage' import SetStageTimerMutation from '../mutations/SetStageTimerMutation' import {MeetingLabels} from '../types/constEnums' import roundDateToNearestHalfHour from '../utils/roundDateToNearestHalfHour' -import {StageTimerModalEndTime_facilitator$key} from '../__generated__/StageTimerModalEndTime_facilitator.graphql' -import {StageTimerModalEndTime_stage$key} from '../__generated__/StageTimerModalEndTime_stage.graphql' import SecondaryButton from './SecondaryButton' import StageTimerModalEndTimeDate from './StageTimerModalEndTimeDate' import StageTimerModalEndTimeHour from './StageTimerModalEndTimeHour' diff --git a/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx b/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx index e3eda4a664e..39b695a17fd 100644 --- a/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx +++ b/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx @@ -2,14 +2,14 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {SetSlackNotificationMutation as TSetSlackNotificationMutation} from '../__generated__/SetSlackNotificationMutation.graphql' +import {StageTimerModalEndTimeSlackToggle_facilitator$key} from '../__generated__/StageTimerModalEndTimeSlackToggle_facilitator.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useMutationProps from '../hooks/useMutationProps' import NotificationErrorMessage from '../modules/notifications/components/NotificationErrorMessage' import SetSlackNotificationMutation from '../mutations/SetSlackNotificationMutation' import {ICON_SIZE} from '../styles/typographyV2' import SlackClientManager from '../utils/SlackClientManager' -import {SetSlackNotificationMutation as TSetSlackNotificationMutation} from '../__generated__/SetSlackNotificationMutation.graphql' -import {StageTimerModalEndTimeSlackToggle_facilitator$key} from '../__generated__/StageTimerModalEndTimeSlackToggle_facilitator.graphql' import Checkbox from './Checkbox' import PlainButton from './PlainButton/PlainButton' diff --git a/packages/client/components/StageTimerModalTimeLimit.tsx b/packages/client/components/StageTimerModalTimeLimit.tsx index 1dc913e7b52..8e2f52f78ca 100644 --- a/packages/client/components/StageTimerModalTimeLimit.tsx +++ b/packages/client/components/StageTimerModalTimeLimit.tsx @@ -4,6 +4,7 @@ import graphql from 'babel-plugin-relay/macro' import ms from 'ms' import React, {useState} from 'react' import {useFragment} from 'react-relay' +import {StageTimerModalTimeLimit_stage$key} from '../__generated__/StageTimerModalTimeLimit_stage.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' @@ -12,7 +13,6 @@ import SetStageTimerMutation from '../mutations/SetStageTimerMutation' import {PALETTE} from '../styles/paletteV3' import {MeetingLabels} from '../types/constEnums' import plural from '../utils/plural' -import {StageTimerModalTimeLimit_stage$key} from '../__generated__/StageTimerModalTimeLimit_stage.graphql' import DropdownMenuToggle from './DropdownMenuToggle' import SecondaryButton from './SecondaryButton' import StageTimerMinutePicker from './StageTimerMinutePicker' diff --git a/packages/client/components/StandardHubUserMenu.tsx b/packages/client/components/StandardHubUserMenu.tsx index 86a84d358f3..00c0c2f9e35 100644 --- a/packages/client/components/StandardHubUserMenu.tsx +++ b/packages/client/components/StandardHubUserMenu.tsx @@ -4,10 +4,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {Link} from 'react-router-dom' +import {StandardHubUserMenu_viewer$key} from '../__generated__/StandardHubUserMenu_viewer.graphql' import {MenuProps} from '../hooks/useMenu' import {PALETTE} from '../styles/paletteV3' import {SIGNOUT_LABEL, SIGNOUT_SLUG} from '../utils/constants' -import {StandardHubUserMenu_viewer$key} from '../__generated__/StandardHubUserMenu_viewer.graphql' import DropdownMenuLabel from './DropdownMenuLabel' import Menu from './Menu' import MenuItem from './MenuItem' diff --git a/packages/client/components/SubmittedForgotPasswordPage.tsx b/packages/client/components/SubmittedForgotPasswordPage.tsx index c4cb6d42e2f..9a6fd89394d 100644 --- a/packages/client/components/SubmittedForgotPasswordPage.tsx +++ b/packages/client/components/SubmittedForgotPasswordPage.tsx @@ -8,8 +8,8 @@ import AuthenticationDialog from './AuthenticationDialog' import DialogTitle from './DialogTitle' import {AuthPageSlug, GotoAuthPage} from './GenericAuthentication' import GoogleOAuthButtonBlock from './GoogleOAuthButtonBlock' -import MicrosoftOAuthButtonBlock from './MicrosoftOAuthButtonBlock' import IconLabel from './IconLabel' +import MicrosoftOAuthButtonBlock from './MicrosoftOAuthButtonBlock' import PlainButton from './PlainButton/PlainButton' import PrimaryButton from './PrimaryButton' diff --git a/packages/client/components/SuggestMentionableUsers.tsx b/packages/client/components/SuggestMentionableUsers.tsx index 30e9cc7796c..8a1fad5aac1 100644 --- a/packages/client/components/SuggestMentionableUsers.tsx +++ b/packages/client/components/SuggestMentionableUsers.tsx @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import stringScore from 'string-score' -import {BBox} from '../types/animations' import {SuggestMentionableUsersQuery} from '../__generated__/SuggestMentionableUsersQuery.graphql' +import {BBox} from '../types/animations' import EditorSuggestions from './EditorSuggestions/EditorSuggestions' import {MentionSuggestion} from './TaskEditor/useSuggestions' diff --git a/packages/client/components/SuggestMentionableUsersRoot.tsx b/packages/client/components/SuggestMentionableUsersRoot.tsx index efa94f84e21..9f7d4207a4f 100644 --- a/packages/client/components/SuggestMentionableUsersRoot.tsx +++ b/packages/client/components/SuggestMentionableUsersRoot.tsx @@ -1,9 +1,9 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../hooks/useQueryLoaderNow' -import {BBox} from '../types/animations' import suggestMentionableUsersQuery, { SuggestMentionableUsersQuery } from '../__generated__/SuggestMentionableUsersQuery.graphql' +import useQueryLoaderNow from '../hooks/useQueryLoaderNow' +import {BBox} from '../types/animations' import SuggestMentionableUsers from './SuggestMentionableUsers' import {MentionSuggestion} from './TaskEditor/useSuggestions' diff --git a/packages/client/components/SuggestedActionCreateNewTeam.tsx b/packages/client/components/SuggestedActionCreateNewTeam.tsx index d8835bf59df..b7f9eb440ed 100644 --- a/packages/client/components/SuggestedActionCreateNewTeam.tsx +++ b/packages/client/components/SuggestedActionCreateNewTeam.tsx @@ -2,9 +2,9 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {RouteComponentProps, withRouter} from 'react-router' +import {SuggestedActionCreateNewTeam_suggestedAction$key} from '../__generated__/SuggestedActionCreateNewTeam_suggestedAction.graphql' import {PALETTE} from '../styles/paletteV3' import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps' -import {SuggestedActionCreateNewTeam_suggestedAction$key} from '../__generated__/SuggestedActionCreateNewTeam_suggestedAction.graphql' import SuggestedActionButton from './SuggestedActionButton' import SuggestedActionCard from './SuggestedActionCard' import SuggestedActionCopy from './SuggestedActionCopy' diff --git a/packages/client/components/SuggestedActionInviteYourTeam.tsx b/packages/client/components/SuggestedActionInviteYourTeam.tsx index ec8879e69d2..3ba3bc1d9a3 100644 --- a/packages/client/components/SuggestedActionInviteYourTeam.tsx +++ b/packages/client/components/SuggestedActionInviteYourTeam.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {lazy} from 'react' import {useFragment} from 'react-relay' +import {SuggestedActionInviteYourTeam_suggestedAction$key} from '../__generated__/SuggestedActionInviteYourTeam_suggestedAction.graphql' import useModal from '../hooks/useModal' import {PALETTE} from '../styles/paletteV3' -import {SuggestedActionInviteYourTeam_suggestedAction$key} from '../__generated__/SuggestedActionInviteYourTeam_suggestedAction.graphql' import SuggestedActionButton from './SuggestedActionButton' import SuggestedActionCard from './SuggestedActionCard' import SuggestedActionCopy from './SuggestedActionCopy' diff --git a/packages/client/components/SuggestedActionTryActionMeeting.tsx b/packages/client/components/SuggestedActionTryActionMeeting.tsx index ac26fe9ec9d..2f2264d2e78 100644 --- a/packages/client/components/SuggestedActionTryActionMeeting.tsx +++ b/packages/client/components/SuggestedActionTryActionMeeting.tsx @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {RouteComponentProps, withRouter} from 'react-router' -import {PALETTE} from '../styles/paletteV3' import {SuggestedActionTryActionMeeting_suggestedAction$key} from '../__generated__/SuggestedActionTryActionMeeting_suggestedAction.graphql' +import {PALETTE} from '../styles/paletteV3' import SuggestedActionButton from './SuggestedActionButton' import SuggestedActionCard from './SuggestedActionCard' import SuggestedActionCopy from './SuggestedActionCopy' diff --git a/packages/client/components/SuggestedActionTryRetroMeeting.tsx b/packages/client/components/SuggestedActionTryRetroMeeting.tsx index e9f9c1e5072..8290a1f9078 100644 --- a/packages/client/components/SuggestedActionTryRetroMeeting.tsx +++ b/packages/client/components/SuggestedActionTryRetroMeeting.tsx @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {RouteComponentProps, withRouter} from 'react-router' -import {PALETTE} from '../styles/paletteV3' import {SuggestedActionTryRetroMeeting_suggestedAction$key} from '../__generated__/SuggestedActionTryRetroMeeting_suggestedAction.graphql' +import {PALETTE} from '../styles/paletteV3' import SuggestedActionButton from './SuggestedActionButton' import SuggestedActionCard from './SuggestedActionCard' import SuggestedActionCopy from './SuggestedActionCopy' diff --git a/packages/client/components/SuggestedActionTryTheDemo.tsx b/packages/client/components/SuggestedActionTryTheDemo.tsx index 2bf920bf38b..a6e1ef8bc43 100644 --- a/packages/client/components/SuggestedActionTryTheDemo.tsx +++ b/packages/client/components/SuggestedActionTryTheDemo.tsx @@ -3,10 +3,10 @@ import React from 'react' import {useFragment} from 'react-relay' import {RouteComponentProps, withRouter} from 'react-router' import useAtmosphere from '~/hooks/useAtmosphere' +import {SuggestedActionTryTheDemo_suggestedAction$key} from '../__generated__/SuggestedActionTryTheDemo_suggestedAction.graphql' import DismissSuggestedActionMutation from '../mutations/DismissSuggestedActionMutation' import {PALETTE} from '../styles/paletteV3' import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps' -import {SuggestedActionTryTheDemo_suggestedAction$key} from '../__generated__/SuggestedActionTryTheDemo_suggestedAction.graphql' import SuggestedActionButton from './SuggestedActionButton' import SuggestedActionCard from './SuggestedActionCard' import SuggestedActionCopy from './SuggestedActionCopy' diff --git a/packages/client/components/Tag/TierTag.tsx b/packages/client/components/Tag/TierTag.tsx index 89dff6ea7e6..221c526972b 100644 --- a/packages/client/components/Tag/TierTag.tsx +++ b/packages/client/components/Tag/TierTag.tsx @@ -1,8 +1,8 @@ import styled from '@emotion/styled' import React from 'react' +import {TierEnum} from '../../__generated__/OrganizationSubscription.graphql' import {PALETTE} from '../../styles/paletteV3' import {TierLabel} from '../../types/constEnums' -import {TierEnum} from '../../__generated__/OrganizationSubscription.graphql' import BaseTag from './BaseTag' interface Props { diff --git a/packages/client/components/TaskColumns/TaskColumns.tsx b/packages/client/components/TaskColumns/TaskColumns.tsx index 18d664d91ce..bd42a583e8f 100644 --- a/packages/client/components/TaskColumns/TaskColumns.tsx +++ b/packages/client/components/TaskColumns/TaskColumns.tsx @@ -4,18 +4,18 @@ import React, {useMemo} from 'react' import {DragDropContext, DropResult} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' import {TaskColumns_teams$key} from '~/__generated__/TaskColumns_teams.graphql' +import {TaskStatusEnum} from '../../__generated__/CreateTaskMutation.graphql' +import {TaskColumns_tasks$key} from '../../__generated__/TaskColumns_tasks.graphql' +import {AreaEnum} from '../../__generated__/UpdateTaskMutation.graphql' import EditorHelpModalContainer from '../../containers/EditorHelpModalContainer/EditorHelpModalContainer' import useAtmosphere from '../../hooks/useAtmosphere' import useEventCallback from '../../hooks/useEventCallback' import TaskColumn from '../../modules/teamDashboard/components/TaskColumn/TaskColumn' import UpdateTaskMutation from '../../mutations/UpdateTaskMutation' import {Layout} from '../../types/constEnums' -import {columnArray, MEETING, meetingColumnArray, SORT_STEP} from '../../utils/constants' +import {MEETING, SORT_STEP, columnArray, meetingColumnArray} from '../../utils/constants' import dndNoise from '../../utils/dndNoise' import makeTasksByStatus from '../../utils/makeTasksByStatus' -import {TaskStatusEnum} from '../../__generated__/CreateTaskMutation.graphql' -import {TaskColumns_tasks$key} from '../../__generated__/TaskColumns_tasks.graphql' -import {AreaEnum} from '../../__generated__/UpdateTaskMutation.graphql' const ColumnsBlock = styled('div')({ display: 'flex', diff --git a/packages/client/components/TaskEditor/CommentEditor.tsx b/packages/client/components/TaskEditor/CommentEditor.tsx index bb75b4da787..cb7378613bb 100644 --- a/packages/client/components/TaskEditor/CommentEditor.tsx +++ b/packages/client/components/TaskEditor/CommentEditor.tsx @@ -16,8 +16,8 @@ import isAndroid from '../../utils/draftjs/isAndroid' import isRichDraft from '../../utils/draftjs/isRichDraft' import lazyPreload from '../../utils/lazyPreload' import linkify from '../../utils/linkify' -import blockStyleFn from './blockStyleFn' import './Draft.css' +import blockStyleFn from './blockStyleFn' import useCommentPlugins from './useCommentPlugins' const RootEditor = styled('div')({ diff --git a/packages/client/components/TaskEditor/TaskEditor.tsx b/packages/client/components/TaskEditor/TaskEditor.tsx index 075054bba5b..3e85bb6fec8 100644 --- a/packages/client/components/TaskEditor/TaskEditor.tsx +++ b/packages/client/components/TaskEditor/TaskEditor.tsx @@ -17,8 +17,8 @@ import entitizeText from '../../utils/draftjs/entitizeText' import isAndroid from '../../utils/draftjs/isAndroid' import isRichDraft from '../../utils/draftjs/isRichDraft' import lazyPreload from '../../utils/lazyPreload' -import blockStyleFn from './blockStyleFn' import './Draft.css' +import blockStyleFn from './blockStyleFn' import useTaskPlugins from './useTaskPlugins' const RootEditor = styled('div')<{noText: boolean; readOnly: boolean | undefined}>( diff --git a/packages/client/components/TaskEditor/useSuggestions.tsx b/packages/client/components/TaskEditor/useSuggestions.tsx index 483d8bea660..ca381e7c5c9 100644 --- a/packages/client/components/TaskEditor/useSuggestions.tsx +++ b/packages/client/components/TaskEditor/useSuggestions.tsx @@ -1,5 +1,5 @@ import {EditorProps, EditorState} from 'draft-js' -import React, {lazy, Suspense, useState} from 'react' +import React, {Suspense, lazy, useState} from 'react' import useForceUpdate from '../../hooks/useForceUpdate' import {SetEditorState} from '../../types/draft' import completeEntity from '../../utils/draftjs/completeEntity' diff --git a/packages/client/components/TaskFooterIntegrateMenu.tsx b/packages/client/components/TaskFooterIntegrateMenu.tsx index f989bc6072c..06e19980674 100644 --- a/packages/client/components/TaskFooterIntegrateMenu.tsx +++ b/packages/client/components/TaskFooterIntegrateMenu.tsx @@ -1,16 +1,16 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay' -import {MenuProps} from '../hooks/useMenu' -import {MenuMutationProps} from '../hooks/useMutationProps' +import {IntegrationProviderServiceEnum} from '../__generated__/CreateTaskIntegrationMutation.graphql' import {TaskFooterIntegrateMenuQuery} from '../__generated__/TaskFooterIntegrateMenuQuery.graphql' import {TaskFooterIntegrateMenu_task$key} from '../__generated__/TaskFooterIntegrateMenu_task.graphql' -import TaskFooterIntegrateMenuList from './TaskFooterIntegrateMenuList' -import TaskFooterIntegrateMenuSignup from './TaskFooterIntegrateMenuSignup' -import {IntegrationProviderServiceEnum} from '../__generated__/CreateTaskIntegrationMutation.graphql' -import CreateTaskIntegrationMutation from '../mutations/CreateTaskIntegrationMutation' import useAtmosphere from '../hooks/useAtmosphere' import {makePlaceholder, useIsIntegrated} from '../hooks/useIsIntegrated' +import {MenuProps} from '../hooks/useMenu' +import {MenuMutationProps} from '../hooks/useMutationProps' +import CreateTaskIntegrationMutation from '../mutations/CreateTaskIntegrationMutation' +import TaskFooterIntegrateMenuList from './TaskFooterIntegrateMenuList' +import TaskFooterIntegrateMenuSignup from './TaskFooterIntegrateMenuSignup' interface Props { menuProps: MenuProps diff --git a/packages/client/components/TaskFooterIntegrateMenuList.tsx b/packages/client/components/TaskFooterIntegrateMenuList.tsx index 0c5c470e7f5..0ac264f345a 100644 --- a/packages/client/components/TaskFooterIntegrateMenuList.tsx +++ b/packages/client/components/TaskFooterIntegrateMenuList.tsx @@ -4,15 +4,15 @@ import React, {useEffect, useState} from 'react' import {useLazyLoadQuery} from 'react-relay' import useSearchFilter from '~/hooks/useSearchFilter' import IntegrationRepoId from '~/shared/gqlIds/IntegrationRepoId' +import {TaskServiceEnum} from '../__generated__/CreateTaskMutation.graphql' +import {TaskFooterIntegrateMenuListLocalQuery} from '../__generated__/TaskFooterIntegrateMenuListLocalQuery.graphql' import {MenuProps} from '../hooks/useMenu' import {PALETTE} from '../styles/paletteV3' -import {TaskFooterIntegrateMenuListLocalQuery} from '../__generated__/TaskFooterIntegrateMenuListLocalQuery.graphql' import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel' import Menu from './Menu' import MenuItemHR from './MenuItemHR' import {SearchMenuItem} from './SearchMenuItem' import TaskIntegrationMenuItem from './TaskIntegrationMenuItem' -import {TaskServiceEnum} from '../__generated__/CreateTaskMutation.graphql' interface Props { menuProps: MenuProps diff --git a/packages/client/components/TaskFooterIntegrateMenuRoot.tsx b/packages/client/components/TaskFooterIntegrateMenuRoot.tsx index 6dddbb894a1..d9dd8740cc7 100644 --- a/packages/client/components/TaskFooterIntegrateMenuRoot.tsx +++ b/packages/client/components/TaskFooterIntegrateMenuRoot.tsx @@ -1,15 +1,15 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' +import taskFooterIntegrateMenuQuery, { + TaskFooterIntegrateMenuQuery +} from '../__generated__/TaskFooterIntegrateMenuQuery.graphql' +import {TaskFooterIntegrateMenuRoot_task$key} from '../__generated__/TaskFooterIntegrateMenuRoot_task.graphql' import {MenuProps} from '../hooks/useMenu' import {MenuMutationProps} from '../hooks/useMutationProps' import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import {UseTaskChild} from '../hooks/useTaskChildFocus' import {LoaderSize} from '../types/constEnums' -import taskFooterIntegrateMenuQuery, { - TaskFooterIntegrateMenuQuery -} from '../__generated__/TaskFooterIntegrateMenuQuery.graphql' -import {TaskFooterIntegrateMenuRoot_task$key} from '../__generated__/TaskFooterIntegrateMenuRoot_task.graphql' import LoadingComponent from './LoadingComponent/LoadingComponent' import TaskFooterIntegrateMenu from './TaskFooterIntegrateMenu' diff --git a/packages/client/components/TaskFooterIntegrateMenuSignup.tsx b/packages/client/components/TaskFooterIntegrateMenuSignup.tsx index e69b1af3ae7..4455346f7a4 100644 --- a/packages/client/components/TaskFooterIntegrateMenuSignup.tsx +++ b/packages/client/components/TaskFooterIntegrateMenuSignup.tsx @@ -2,8 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {PALETTE} from '~/styles/paletteV3' import {TaskFooterIntegrateMenuSignup_TeamMemberIntegrations$key} from '~/__generated__/TaskFooterIntegrateMenuSignup_TeamMemberIntegrations.graphql' +import {PALETTE} from '~/styles/paletteV3' import {MenuProps} from '../hooks/useMenu' import {MenuMutationProps} from '../hooks/useMutationProps' import AddToAzureMenuItem from './AddToAzureMenuItem' diff --git a/packages/client/components/TaskIntegrationLink.tsx b/packages/client/components/TaskIntegrationLink.tsx index 8059177592d..050af864ad3 100644 --- a/packages/client/components/TaskIntegrationLink.tsx +++ b/packages/client/components/TaskIntegrationLink.tsx @@ -3,9 +3,9 @@ import graphql from 'babel-plugin-relay/macro' import React, {ReactNode} from 'react' import {useFragment} from 'react-relay' import {parseWebPath} from '~/utils/parseWebPath' +import {TaskIntegrationLink_integration$key} from '../__generated__/TaskIntegrationLink_integration.graphql' import {PALETTE} from '../styles/paletteV3' import {Card} from '../types/constEnums' -import {TaskIntegrationLink_integration$key} from '../__generated__/TaskIntegrationLink_integration.graphql' import JiraIssueLink from './JiraIssueLink' const StyledLink = styled('a')({ diff --git a/packages/client/components/TaskIntegrationMenuItem.tsx b/packages/client/components/TaskIntegrationMenuItem.tsx index b67910c4770..c8212b3b687 100644 --- a/packages/client/components/TaskIntegrationMenuItem.tsx +++ b/packages/client/components/TaskIntegrationMenuItem.tsx @@ -3,8 +3,8 @@ import {TaskServiceEnum} from '~/../server/database/types/Task' import AzureDevOpsSVG from './AzureDevOpsSVG' import GitHubSVG from './GitHubSVG' import GitLabSVG from './GitLabSVG' -import JiraServerSVG from './JiraServerSVG' import JiraSVG from './JiraSVG' +import JiraServerSVG from './JiraServerSVG' import MenuItem from './MenuItem' import MenuItemAvatar from './MenuItemAvatar' import MenuItemLabel from './MenuItemLabel' diff --git a/packages/client/components/TaskInvolves.tsx b/packages/client/components/TaskInvolves.tsx index 88e4dac4931..0fae1dbfdd9 100644 --- a/packages/client/components/TaskInvolves.tsx +++ b/packages/client/components/TaskInvolves.tsx @@ -7,13 +7,13 @@ import NotificationAction from '~/components/NotificationAction' import OutcomeCardStatusIndicator from '~/modules/outcomeCard/components/OutcomeCardStatusIndicator/OutcomeCardStatusIndicator' import {cardShadow} from '~/styles/elevation' import convertToTaskContent from '~/utils/draftjs/convertToTaskContent' +import {TaskInvolves_notification$key} from '../__generated__/TaskInvolves_notification.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useEditorState from '../hooks/useEditorState' import useMutationProps from '../hooks/useMutationProps' import useRouter from '../hooks/useRouter' import SetNotificationStatusMutation from '../mutations/SetNotificationStatusMutation' import {ASSIGNEE, MENTIONEE} from '../utils/constants' -import {TaskInvolves_notification$key} from '../__generated__/TaskInvolves_notification.graphql' import NotificationTemplate from './NotificationTemplate' const involvementWord = { diff --git a/packages/client/components/TaskWatermark.tsx b/packages/client/components/TaskWatermark.tsx index 83e7cd503d8..f98f8177ac4 100644 --- a/packages/client/components/TaskWatermark.tsx +++ b/packages/client/components/TaskWatermark.tsx @@ -3,8 +3,8 @@ import React from 'react' import AzureDevOpsSVG from './AzureDevOpsSVG' import GitHubSVG from './GitHubSVG' import GitLabSVG from './GitLabSVG' -import JiraServerSVG from './JiraServerSVG' import JiraSVG from './JiraSVG' +import JiraServerSVG from './JiraServerSVG' const iconLookup = { _xGitHubIssue: GitHubSVG, diff --git a/packages/client/components/TeamDashTeamMemberMenu.tsx b/packages/client/components/TeamDashTeamMemberMenu.tsx index 25c01145d3d..d4897ffd634 100644 --- a/packages/client/components/TeamDashTeamMemberMenu.tsx +++ b/packages/client/components/TeamDashTeamMemberMenu.tsx @@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useSearchFilter from '~/hooks/useSearchFilter' +import {TeamDashTeamMemberMenu_team$key} from '../__generated__/TeamDashTeamMemberMenu_team.graphql' import useAtmosphere from '../hooks/useAtmosphere' import {MenuProps} from '../hooks/useMenu' import filterTeamMember from '../utils/relay/filterTeamMember' -import {TeamDashTeamMemberMenu_team$key} from '../__generated__/TeamDashTeamMemberMenu_team.graphql' import DropdownMenuLabel from './DropdownMenuLabel' import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel' import Menu from './Menu' diff --git a/packages/client/components/TeamFilterMenu.tsx b/packages/client/components/TeamFilterMenu.tsx index c047c766518..375af20d163 100644 --- a/packages/client/components/TeamFilterMenu.tsx +++ b/packages/client/components/TeamFilterMenu.tsx @@ -1,16 +1,16 @@ import graphql from 'babel-plugin-relay/macro' import React, {useMemo, useRef} from 'react' import {useFragment} from 'react-relay' +import { + TeamFilterMenu_viewer$data, + TeamFilterMenu_viewer$key +} from '~/__generated__/TeamFilterMenu_viewer.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useRouter from '~/hooks/useRouter' import useSearchFilter from '~/hooks/useSearchFilter' import {FilterLabels} from '~/types/constEnums' import constructFilterQueryParamURL from '~/utils/constructFilterQueryParamURL' import {useQueryParameterParser} from '~/utils/useQueryParameterParser' -import { - TeamFilterMenu_viewer$data, - TeamFilterMenu_viewer$key -} from '~/__generated__/TeamFilterMenu_viewer.graphql' import {MenuProps} from '../hooks/useMenu' import DropdownMenuLabel from './DropdownMenuLabel' import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel' diff --git a/packages/client/components/TeamHealth.tsx b/packages/client/components/TeamHealth.tsx index 6c62b85061f..2f746c182cf 100644 --- a/packages/client/components/TeamHealth.tsx +++ b/packages/client/components/TeamHealth.tsx @@ -1,24 +1,24 @@ +import * as RadioGroup from '@radix-ui/react-radio-group' import graphql from 'babel-plugin-relay/macro' +import clsx from 'clsx' import React, {ReactElement} from 'react' import {useFragment} from 'react-relay' -import useGotoStageId from '~/hooks/useGotoStageId' import {TeamHealth_meeting$key} from '~/__generated__/TeamHealth_meeting.graphql' +import useGotoStageId from '~/hooks/useGotoStageId' +import useAtmosphere from '../hooks/useAtmosphere' +import useMutationProps from '../hooks/useMutationProps' +import RevealTeamHealthVotesMutation from '../mutations/RevealTeamHealthVotesMutation' +import SetTeamHealthVoteMutation from '../mutations/SetTeamHealthVoteMutation' +import getTeamHealthVoteColor from '../utils/getTeamHealthVoteColor' import {phaseLabelLookup} from '../utils/meetings/lookups' import MeetingContent from './MeetingContent' import MeetingHeaderAndPhase from './MeetingHeaderAndPhase' import MeetingTopBar from './MeetingTopBar' import PhaseHeaderTitle from './PhaseHeaderTitle' import PhaseWrapper from './PhaseWrapper' -import TeamHealthVotingRow from './TeamHealthVotingRow' -import useMutationProps from '../hooks/useMutationProps' -import useAtmosphere from '../hooks/useAtmosphere' -import SetTeamHealthVoteMutation from '../mutations/SetTeamHealthVoteMutation' -import RevealTeamHealthVotesMutation from '../mutations/RevealTeamHealthVotesMutation' -import * as RadioGroup from '@radix-ui/react-radio-group' -import clsx from 'clsx' import RaisedButton from './RaisedButton' -import getTeamHealthVoteColor from '../utils/getTeamHealthVoteColor' import StageTimerDisplay from './StageTimerDisplay' +import TeamHealthVotingRow from './TeamHealthVotingRow' interface Props { avatarGroup: ReactElement diff --git a/packages/client/components/TeamInvitationDialog.tsx b/packages/client/components/TeamInvitationDialog.tsx index f28a47d7950..2b14e65c979 100644 --- a/packages/client/components/TeamInvitationDialog.tsx +++ b/packages/client/components/TeamInvitationDialog.tsx @@ -3,8 +3,8 @@ import React, {useEffect} from 'react' import {useFragment} from 'react-relay' import {RouteComponentProps, withRouter} from 'react-router' import useAtmosphere from '~/hooks/useAtmosphere' -import {LocalStorageKey} from '../types/constEnums' import {TeamInvitationDialog_verifiedInvitation$key} from '../__generated__/TeamInvitationDialog_verifiedInvitation.graphql' +import {LocalStorageKey} from '../types/constEnums' import TeamInvitationAccept from './TeamInvitationAccept' import TeamInvitationEmailCreateAccount from './TeamInvitationEmailCreateAccount' import TeamInvitationEmailSignin from './TeamInvitationEmailSignin' diff --git a/packages/client/components/TeamInvitationEmailSignin.tsx b/packages/client/components/TeamInvitationEmailSignin.tsx index 092bcaf6894..fabd428ed54 100644 --- a/packages/client/components/TeamInvitationEmailSignin.tsx +++ b/packages/client/components/TeamInvitationEmailSignin.tsx @@ -2,8 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import useDocumentTitle from '../hooks/useDocumentTitle' import {TeamInvitationEmailSignin_verifiedInvitation$key} from '../__generated__/TeamInvitationEmailSignin_verifiedInvitation.graphql' +import useDocumentTitle from '../hooks/useDocumentTitle' +import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog' import DialogContent from './DialogContent' import DialogTitle from './DialogTitle' import EmailPasswordAuthForm from './EmailPasswordAuthForm' @@ -11,7 +12,6 @@ import ForgotPasswordOneClick from './ForgotPasswordOneClick' import InvitationCenteredCopy from './InvitationCenteredCopy' import InvitationDialogCopy from './InvitationDialogCopy' import InviteDialog from './InviteDialog' -import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog' interface Props { invitationToken: string diff --git a/packages/client/components/TeamInvitationErrorAccepted.tsx b/packages/client/components/TeamInvitationErrorAccepted.tsx index 62a901725f3..03788963fca 100644 --- a/packages/client/components/TeamInvitationErrorAccepted.tsx +++ b/packages/client/components/TeamInvitationErrorAccepted.tsx @@ -2,8 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import useDocumentTitle from '../hooks/useDocumentTitle' import {TeamInvitationErrorAccepted_verifiedInvitation$key} from '../__generated__/TeamInvitationErrorAccepted_verifiedInvitation.graphql' +import useDocumentTitle from '../hooks/useDocumentTitle' import DialogContent from './DialogContent' import DialogTitle from './DialogTitle' import InvitationDialogCopy from './InvitationDialogCopy' diff --git a/packages/client/components/TeamInvitationErrorExpired.tsx b/packages/client/components/TeamInvitationErrorExpired.tsx index b3003497c2e..119e96987a2 100644 --- a/packages/client/components/TeamInvitationErrorExpired.tsx +++ b/packages/client/components/TeamInvitationErrorExpired.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TeamInvitationErrorExpired_verifiedInvitation$key} from '../__generated__/TeamInvitationErrorExpired_verifiedInvitation.graphql' import useDocumentTitle from '../hooks/useDocumentTitle' import {PALETTE} from '../styles/paletteV3' -import {TeamInvitationErrorExpired_verifiedInvitation$key} from '../__generated__/TeamInvitationErrorExpired_verifiedInvitation.graphql' import DialogContent from './DialogContent' import DialogTitle from './DialogTitle' import InvitationDialogCopy from './InvitationDialogCopy' diff --git a/packages/client/components/TeamInvitationGoogleCreateAccount.tsx b/packages/client/components/TeamInvitationGoogleCreateAccount.tsx index e0df5c4b409..f55d4d11a9a 100644 --- a/packages/client/components/TeamInvitationGoogleCreateAccount.tsx +++ b/packages/client/components/TeamInvitationGoogleCreateAccount.tsx @@ -2,11 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {useFragment} from 'react-relay' +import {TeamInvitationGoogleCreateAccount_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleCreateAccount_verifiedInvitation.graphql' import useDocumentTitle from '../hooks/useDocumentTitle' import useRouter from '../hooks/useRouter' import {PALETTE} from '../styles/paletteV3' -import {TeamInvitationGoogleCreateAccount_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleCreateAccount_verifiedInvitation.graphql' import AuthPrivacyFooter from './AuthPrivacyFooter' +import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog' import DialogContent from './DialogContent' import DialogTitle from './DialogTitle' import EmailPasswordAuthForm from './EmailPasswordAuthForm' @@ -16,7 +17,6 @@ import InvitationCenteredCopy from './InvitationCenteredCopy' import InvitationDialogCopy from './InvitationDialogCopy' import InviteDialog from './InviteDialog' import PlainButton from './PlainButton/PlainButton' -import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog' interface Props { invitationToken: string diff --git a/packages/client/components/TeamInvitationGoogleSignin.tsx b/packages/client/components/TeamInvitationGoogleSignin.tsx index 463ade9ac2d..d7695aa5c49 100644 --- a/packages/client/components/TeamInvitationGoogleSignin.tsx +++ b/packages/client/components/TeamInvitationGoogleSignin.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TeamInvitationGoogleSignin_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleSignin_verifiedInvitation.graphql' import useDocumentTitle from '../hooks/useDocumentTitle' import useRouter from '../hooks/useRouter' -import {TeamInvitationGoogleSignin_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleSignin_verifiedInvitation.graphql' import DialogContent from './DialogContent' import DialogTitle from './DialogTitle' import GoogleOAuthButtonBlock from './GoogleOAuthButtonBlock' diff --git a/packages/client/components/TeamInvitationNotification.tsx b/packages/client/components/TeamInvitationNotification.tsx index 4f8a5156e04..cd51db6de15 100644 --- a/packages/client/components/TeamInvitationNotification.tsx +++ b/packages/client/components/TeamInvitationNotification.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TeamInvitationNotification_notification$key} from '~/__generated__/TeamInvitationNotification_notification.graphql' import NotificationAction from '~/components/NotificationAction' import useAtmosphere from '~/hooks/useAtmosphere' import useMutationProps from '~/hooks/useMutationProps' import useRouter from '~/hooks/useRouter' -import {TeamInvitationNotification_notification$key} from '~/__generated__/TeamInvitationNotification_notification.graphql' import AcceptTeamInvitationMutation from '../mutations/AcceptTeamInvitationMutation' import NotificationTemplate from './NotificationTemplate' diff --git a/packages/client/components/TeamInvitationRoot.tsx b/packages/client/components/TeamInvitationRoot.tsx index 6dbf2011256..f64b07f2923 100644 --- a/packages/client/components/TeamInvitationRoot.tsx +++ b/packages/client/components/TeamInvitationRoot.tsx @@ -1,7 +1,7 @@ import React, {Suspense} from 'react' import {RouteComponentProps} from 'react-router' -import useNoIndex from '~/hooks/useNoIndex' import teamInvitationQuery, {TeamInvitationQuery} from '~/__generated__/TeamInvitationQuery.graphql' +import useNoIndex from '~/hooks/useNoIndex' import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import TeamInvitation from './TeamInvitation' diff --git a/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx index df0281c13b3..3392a34bcb7 100644 --- a/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx +++ b/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx @@ -2,16 +2,16 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' -import useAtmosphere from '~/hooks/useAtmosphere' import {TeamPromptDrawer_meeting$key} from '~/__generated__/TeamPromptDrawer_meeting.graphql' +import useAtmosphere from '~/hooks/useAtmosphere' +import useBreakpoint from '../../hooks/useBreakpoint' import {desktopSidebarShadow} from '../../styles/elevation' import {BezierCurve, Breakpoint, DiscussionThreadEnum, ZIndex} from '../../types/constEnums' +import SendClientSideEvent from '../../utils/SendClientSideEvent' +import findStageById from '../../utils/meetings/findStageById' import ResponsiveDashSidebar from '../ResponsiveDashSidebar' import TeamPromptDiscussionDrawer from './TeamPromptDiscussionDrawer' import TeamPromptWorkDrawer from './TeamPromptWorkDrawer' -import useBreakpoint from '../../hooks/useBreakpoint' -import findStageById from '../../utils/meetings/findStageById' -import SendClientSideEvent from '../../utils/SendClientSideEvent' export const Drawer = styled('div')<{isDesktop: boolean; isMobile: boolean; isOpen: boolean}>( ({isDesktop, isMobile, isOpen}) => ({ diff --git a/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx b/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx index e9d870fd4ea..c31f0c79eaa 100644 --- a/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx +++ b/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx @@ -3,12 +3,12 @@ import {Edit} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TeamPromptEditablePrompt_meeting$key} from '~/__generated__/TeamPromptEditablePrompt_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useModal from '~/hooks/useModal' import useMutationProps from '~/hooks/useMutationProps' import UpdateMeetingPromptMutation from '~/mutations/UpdateMeetingPromptMutation' import {PALETTE} from '~/styles/paletteV3' -import {TeamPromptEditablePrompt_meeting$key} from '~/__generated__/TeamPromptEditablePrompt_meeting.graphql' import TeamPromptEditablePromptModal from './TeamPromptEditablePromptModal' const Prompt = styled('h1')<{isEditable?: boolean}>(({isEditable = false}) => ({ diff --git a/packages/client/components/TeamPrompt/TeamPromptOptions.tsx b/packages/client/components/TeamPrompt/TeamPromptOptions.tsx index bef32e09be0..cf307d37157 100644 --- a/packages/client/components/TeamPrompt/TeamPromptOptions.tsx +++ b/packages/client/components/TeamPrompt/TeamPromptOptions.tsx @@ -2,11 +2,11 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TeamPromptOptions_meeting$key} from '~/__generated__/TeamPromptOptions_meeting.graphql' import {MenuPosition} from '~/hooks/useCoords' import useMenu from '~/hooks/useMenu' import {PALETTE} from '~/styles/paletteV3' import {mergeRefs} from '~/utils/react/mergeRefs' -import {TeamPromptOptions_meeting$key} from '~/__generated__/TeamPromptOptions_meeting.graphql' import useTooltip from '../../hooks/useTooltip' import BaseButton from '../BaseButton' import IconLabel from '../IconLabel' diff --git a/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx b/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx index d0d1d211609..ce8ed1e29df 100644 --- a/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx +++ b/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx @@ -2,16 +2,16 @@ import styled from '@emotion/styled' import {Flag, Link as MuiLink, OpenInNew, Replay} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' -import {Link} from 'react-router-dom' import {useFragment} from 'react-relay' +import {Link} from 'react-router-dom' +import {TeamPromptOptionsMenu_meeting$key} from '~/__generated__/TeamPromptOptionsMenu_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import {MenuProps} from '~/hooks/useMenu' import useMutationProps from '~/hooks/useMutationProps' import useRouter from '~/hooks/useRouter' import EndTeamPromptMutation from '~/mutations/EndTeamPromptMutation' -import {TeamPromptOptionsMenu_meeting$key} from '~/__generated__/TeamPromptOptionsMenu_meeting.graphql' -import SendClientSideEvent from '../../utils/SendClientSideEvent' import {PALETTE} from '../../styles/paletteV3' +import SendClientSideEvent from '../../utils/SendClientSideEvent' import makeAppURL from '../../utils/makeAppURL' import Menu from '../Menu' import MenuItem from '../MenuItem' diff --git a/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx b/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx index 712858a306c..69c435bb3a7 100644 --- a/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx +++ b/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {useFragment} from 'react-relay' import {TeamPromptResponseEmojis_response$key} from '~/__generated__/TeamPromptResponseEmojis_response.graphql' import useAtmosphere from '../../hooks/useAtmosphere' import useMutationProps from '../../hooks/useMutationProps' import AddReactjiToReactableMutation from '../../mutations/AddReactjiToReactableMutation' import ReactjiId from '../../shared/gqlIds/ReactjiId' -import React from 'react' import ReactjiSection from '../ReflectionCard/ReactjiSection' interface Props { diff --git a/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx b/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx index d99f03661ef..bcf1ff3477f 100644 --- a/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx +++ b/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx @@ -1,25 +1,25 @@ import styled from '@emotion/styled' +import {KeyboardArrowLeft, KeyboardArrowRight} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' -import {Link} from 'react-router-dom' import React from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' +import {Link} from 'react-router-dom' +import {TeamPromptTopBar_meeting$key} from '~/__generated__/TeamPromptTopBar_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import {useRenameMeeting} from '~/hooks/useRenameMeeting' import NewMeetingAvatarGroup from '~/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup' -import {TeamPromptTopBar_meeting$key} from '~/__generated__/TeamPromptTopBar_meeting.graphql' import useModal from '../../hooks/useModal' import {meetingAvatarMediaQueries, meetingTopBarMediaQuery} from '../../styles/meeting' +import SendClientSideEvent from '../../utils/SendClientSideEvent' import EditableText from '../EditableText' +import IconLabel from '../IconLabel' import LogoBlock from '../LogoBlock/LogoBlock' import {IconGroupBlock, MeetingTopBarStyles} from '../MeetingTopBar' +import {EndRecurringMeetingModal} from '../Recurrence/EndRecurringMeetingModal' import {HumanReadableRecurrenceRule} from '../Recurrence/HumanReadableRecurrenceRule' import {UpdateRecurrenceSettingsModal} from '../Recurrence/UpdateRecurrenceSettingsModal' -import {EndRecurringMeetingModal} from '../Recurrence/EndRecurringMeetingModal' import {TeamPromptMeetingStatus} from './TeamPromptMeetingStatus' import TeamPromptOptions from './TeamPromptOptions' -import {KeyboardArrowLeft, KeyboardArrowRight} from '@mui/icons-material' -import IconLabel from '../IconLabel' -import SendClientSideEvent from '../../utils/SendClientSideEvent' const TeamPromptLogoBlock = styled(LogoBlock)({ marginRight: '8px', diff --git a/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx index b095e66d6f9..9f51d4e28cd 100644 --- a/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx +++ b/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx @@ -3,18 +3,18 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect, useState} from 'react' import {useFragment} from 'react-relay' import {TeamPromptWorkDrawer_meeting$key} from '../../__generated__/TeamPromptWorkDrawer_meeting.graphql' -import Tabs from '../Tabs/Tabs' -import Tab from '../Tab/Tab' -import ParabolLogoSVG from '../ParabolLogoSVG' +import useAtmosphere from '../../hooks/useAtmosphere' +import gcalLogo from '../../styles/theme/images/graphics/google-calendar.svg' +import SendClientSideEvent from '../../utils/SendClientSideEvent' import GitHubSVG from '../GitHubSVG' -import ParabolTasksPanel from './WorkDrawer/ParabolTasksPanel' -import GitHubIntegrationPanel from './WorkDrawer/GitHubIntegrationPanel' import JiraSVG from '../JiraSVG' -import JiraIntegrationPanel from './WorkDrawer/JiraIntegrationPanel' -import gcalLogo from '../../styles/theme/images/graphics/google-calendar.svg' +import ParabolLogoSVG from '../ParabolLogoSVG' +import Tab from '../Tab/Tab' +import Tabs from '../Tabs/Tabs' import GCalIntegrationPanel from './WorkDrawer/GCalIntegrationPanel' -import SendClientSideEvent from '../../utils/SendClientSideEvent' -import useAtmosphere from '../../hooks/useAtmosphere' +import GitHubIntegrationPanel from './WorkDrawer/GitHubIntegrationPanel' +import JiraIntegrationPanel from './WorkDrawer/JiraIntegrationPanel' +import ParabolTasksPanel from './WorkDrawer/ParabolTasksPanel' interface Props { meetingRef: TeamPromptWorkDrawer_meeting$key diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx index d07a773d4a9..0c975f1f8a9 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx @@ -1,16 +1,16 @@ +import {ContentCopy} from '@mui/icons-material' +import graphql from 'babel-plugin-relay/macro' +import clsx from 'clsx' +import ms from 'ms' import React from 'react' import CopyToClipboard from 'react-copy-to-clipboard' -import useTooltip from '../../../hooks/useTooltip' -import {MenuPosition} from '../../../hooks/useCoords' import {useFragment} from 'react-relay' -import graphql from 'babel-plugin-relay/macro' import {GCalEventCard_event$key} from '../../../__generated__/GCalEventCard_event.graphql' -import {mergeRefs} from '../../../utils/react/mergeRefs' -import clsx from 'clsx' -import {ContentCopy} from '@mui/icons-material' -import ms from 'ms' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' import useAtmosphere from '../../../hooks/useAtmosphere' +import {MenuPosition} from '../../../hooks/useCoords' +import useTooltip from '../../../hooks/useTooltip' +import SendClientSideEvent from '../../../utils/SendClientSideEvent' +import {mergeRefs} from '../../../utils/react/mergeRefs' interface Props { eventRef: GCalEventCard_event$key diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx index f27505d9411..88ce942c7ec 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx @@ -1,14 +1,14 @@ -import React, {useState} from 'react' import graphql from 'babel-plugin-relay/macro' +import clsx from 'clsx' +import React, {useState} from 'react' import {useFragment} from 'react-relay' import {GCalIntegrationPanel_meeting$key} from '../../../__generated__/GCalIntegrationPanel_meeting.graphql' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' -import GCalIntegrationResultsRoot from './GCalIntegrationResultsRoot' -import GcalClientManager from '../../../utils/GcalClientManager' import gcalSVG from '../../../styles/theme/images/graphics/google-calendar.svg' -import clsx from 'clsx' +import GcalClientManager from '../../../utils/GcalClientManager' import SendClientSideEvent from '../../../utils/SendClientSideEvent' +import GCalIntegrationResultsRoot from './GCalIntegrationResultsRoot' const GCAL_QUERY_TABS = [ { diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx index 5f007cd29f8..3d125709b65 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx @@ -1,11 +1,11 @@ -import React from 'react' +import {OpenInNew} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' -import {GCalIntegrationResultsQuery} from '../../../__generated__/GCalIntegrationResultsQuery.graphql' +import {Link} from 'react-router-dom' import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png' +import {GCalIntegrationResultsQuery} from '../../../__generated__/GCalIntegrationResultsQuery.graphql' import GCalEventCard from './GCalEventCard' -import {OpenInNew} from '@mui/icons-material' -import {Link} from 'react-router-dom' interface Props { queryRef: PreloadedQuery diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx index abb92e6da8c..b9f6a2f7362 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx @@ -1,12 +1,12 @@ +import ms from 'ms' import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' +import {Loader} from '~/utils/relay/renderLoader' import gcalIntegrationResultsQuery, { GCalIntegrationResultsQuery } from '../../../__generated__/GCalIntegrationResultsQuery.graphql' +import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' import ErrorBoundary from '../../ErrorBoundary' import GCalIntegrationResults from './GCalIntegrationResults' -import {Loader} from '~/utils/relay/renderLoader' -import ms from 'ms' interface Props { teamId: string diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx index f683a5d4187..5f7bfd142e7 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx @@ -1,15 +1,15 @@ -import React, {useState} from 'react' import graphql from 'babel-plugin-relay/macro' +import clsx from 'clsx' +import React, {useState} from 'react' import {useFragment} from 'react-relay' import {GitHubIntegrationPanel_meeting$key} from '../../../__generated__/GitHubIntegrationPanel_meeting.graphql' -import clsx from 'clsx' -import gitHubSVG from '../../../styles/theme/images/graphics/github-circle.svg' -import GitHubClientManager from '../../../utils/GitHubClientManager' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' +import gitHubSVG from '../../../styles/theme/images/graphics/github-circle.svg' +import GitHubClientManager from '../../../utils/GitHubClientManager' +import SendClientSideEvent from '../../../utils/SendClientSideEvent' import GitHubIntegrationResultsRoot from './GitHubIntegrationResultsRoot' import GitHubRepoFilterBar from './GitHubRepoFilterBar' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' const GITHUB_QUERY_TABS: {key: 'issue' | 'pullRequest'; label: string}[] = [ { diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx index b8e5b88d804..cf9914e1d4a 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx @@ -1,14 +1,14 @@ -import React from 'react' import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {PreloadedQuery, usePaginationFragment, usePreloadedQuery} from 'react-relay' +import {Link} from 'react-router-dom' +import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png' import {GitHubIntegrationResultsQuery} from '../../../__generated__/GitHubIntegrationResultsQuery.graphql' import {GitHubIntegrationResultsSearchPaginationQuery} from '../../../__generated__/GitHubIntegrationResultsSearchPaginationQuery.graphql' import {GitHubIntegrationResults_search$key} from '../../../__generated__/GitHubIntegrationResults_search.graphql' import useLoadNextOnScrollBottom from '../../../hooks/useLoadNextOnScrollBottom' -import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png' -import GitHubObjectCard from './GitHubObjectCard' import Ellipsis from '../../Ellipsis/Ellipsis' -import {Link} from 'react-router-dom' +import GitHubObjectCard from './GitHubObjectCard' interface Props { queryRef: PreloadedQuery diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx index 32b3c8c8d90..394487eb5ed 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx @@ -1,11 +1,11 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' +import {Loader} from '~/utils/relay/renderLoader' import gitHubIntegrationResultsQuery, { GitHubIntegrationResultsQuery } from '../../../__generated__/GitHubIntegrationResultsQuery.graphql' +import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' import ErrorBoundary from '../../ErrorBoundary' import GitHubIntegrationResults from './GitHubIntegrationResults' -import {Loader} from '~/utils/relay/renderLoader' interface Props { teamId: string diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx index 266a9e459f3..678ab58dffb 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx @@ -1,22 +1,22 @@ +import {Link} from '@mui/icons-material' +import graphql from 'babel-plugin-relay/macro' import React from 'react' import CopyToClipboard from 'react-copy-to-clipboard' +import {useFragment} from 'react-relay' +import {GitHubObjectCard_result$key} from '../../../__generated__/GitHubObjectCard_result.graphql' +import useAtmosphere from '../../../hooks/useAtmosphere' +import {MenuPosition} from '../../../hooks/useCoords' +import useTooltip from '../../../hooks/useTooltip' import gitHubSVG from '../../../styles/theme/images/graphics/github-circle.svg' -import gitHubMerged from '../../../styles/theme/images/graphics/github-merged.svg' import githubIssueClosed from '../../../styles/theme/images/graphics/github-issue-closed.svg' import githubIssueOpen from '../../../styles/theme/images/graphics/github-issue-open.svg' -import githubPROpen from '../../../styles/theme/images/graphics/github-pr-open.svg' -import githubPRDraft from '../../../styles/theme/images/graphics/github-pr-draft.svg' +import gitHubMerged from '../../../styles/theme/images/graphics/github-merged.svg' import githubPRClosed from '../../../styles/theme/images/graphics/github-pr-closed.svg' +import githubPRDraft from '../../../styles/theme/images/graphics/github-pr-draft.svg' +import githubPROpen from '../../../styles/theme/images/graphics/github-pr-open.svg' +import SendClientSideEvent from '../../../utils/SendClientSideEvent' import relativeDate from '../../../utils/date/relativeDate' -import {Link} from '@mui/icons-material' -import useTooltip from '../../../hooks/useTooltip' -import {MenuPosition} from '../../../hooks/useCoords' -import {useFragment} from 'react-relay' -import graphql from 'babel-plugin-relay/macro' -import {GitHubObjectCard_result$key} from '../../../__generated__/GitHubObjectCard_result.graphql' import {mergeRefs} from '../../../utils/react/mergeRefs' -import useAtmosphere from '../../../hooks/useAtmosphere' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' const ISSUE_STATUS_MAP: Record = { OPEN: githubIssueOpen, diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx index b845085f343..8cae46ae645 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx @@ -1,15 +1,14 @@ -import React from 'react' +import {ExpandMore, FilterList} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' -import {FilterList} from '@mui/icons-material' -import useMenu from '../../../hooks/useMenu' -import {MenuPosition} from '../../../hooks/useCoords' -import GitHubRepoSearchFilterMenu from '../../GitHubRepoSearchFilterMenu' +import clsx from 'clsx' +import React from 'react' import {useFragment} from 'react-relay' import {GitHubRepoFilterBar_teamMember$key} from '../../../__generated__/GitHubRepoFilterBar_teamMember.graphql' -import {ExpandMore} from '@mui/icons-material' +import {MenuPosition} from '../../../hooks/useCoords' +import useMenu from '../../../hooks/useMenu' import {PortalStatus} from '../../../hooks/usePortal' -import clsx from 'clsx' import plural from '../../../utils/plural' +import GitHubRepoSearchFilterMenu from '../../GitHubRepoSearchFilterMenu' interface Props { teamMemberRef: GitHubRepoFilterBar_teamMember$key diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx index 88901f01b9b..6430d4724b0 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx @@ -1,12 +1,12 @@ -import React from 'react' import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {useFragment} from 'react-relay' import {JiraIntegrationPanel_meeting$key} from '../../../__generated__/JiraIntegrationPanel_meeting.graphql' -import AtlassianClientManager from '../../../utils/AtlassianClientManager' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' -import JiraIntegrationResultsRoot from './JiraIntegrationResultsRoot' +import AtlassianClientManager from '../../../utils/AtlassianClientManager' import SendClientSideEvent from '../../../utils/SendClientSideEvent' +import JiraIntegrationResultsRoot from './JiraIntegrationResultsRoot' interface Props { meetingRef: JiraIntegrationPanel_meeting$key diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx index 1d01c707b37..6da260ddbc4 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx @@ -1,14 +1,14 @@ -import React from 'react' import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {PreloadedQuery, usePaginationFragment, usePreloadedQuery} from 'react-relay' +import {Link} from 'react-router-dom' +import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png' import {JiraIntegrationResultsQuery} from '../../../__generated__/JiraIntegrationResultsQuery.graphql' import {JiraIntegrationResultsSearchPaginationQuery} from '../../../__generated__/JiraIntegrationResultsSearchPaginationQuery.graphql' import {JiraIntegrationResults_search$key} from '../../../__generated__/JiraIntegrationResults_search.graphql' -import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png' -import JiraObjectCard from './JiraObjectCard' import useLoadNextOnScrollBottom from '../../../hooks/useLoadNextOnScrollBottom' import Ellipsis from '../../Ellipsis/Ellipsis' -import {Link} from 'react-router-dom' +import JiraObjectCard from './JiraObjectCard' interface Props { queryRef: PreloadedQuery diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx index cadccb256d2..dac120c9396 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx @@ -1,11 +1,11 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' +import {Loader} from '~/utils/relay/renderLoader' import jiraIntegrationResultsQuery, { JiraIntegrationResultsQuery } from '../../../__generated__/JiraIntegrationResultsQuery.graphql' +import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' import ErrorBoundary from '../../ErrorBoundary' import JiraIntegrationResults from './JiraIntegrationResults' -import {Loader} from '~/utils/relay/renderLoader' interface Props { teamId: string diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx index 97974a53660..76e35dbb96f 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx @@ -1,16 +1,16 @@ +import {Link} from '@mui/icons-material' +import graphql from 'babel-plugin-relay/macro' import React from 'react' import CopyToClipboard from 'react-copy-to-clipboard' -import jiraSVG from '../../../styles/theme/images/graphics/jira.svg' -import relativeDate from '../../../utils/date/relativeDate' -import {Link} from '@mui/icons-material' -import useTooltip from '../../../hooks/useTooltip' -import {MenuPosition} from '../../../hooks/useCoords' import {useFragment} from 'react-relay' -import graphql from 'babel-plugin-relay/macro' import {JiraObjectCard_result$key} from '../../../__generated__/JiraObjectCard_result.graphql' -import {mergeRefs} from '../../../utils/react/mergeRefs' import useAtmosphere from '../../../hooks/useAtmosphere' +import {MenuPosition} from '../../../hooks/useCoords' +import useTooltip from '../../../hooks/useTooltip' +import jiraSVG from '../../../styles/theme/images/graphics/jira.svg' import SendClientSideEvent from '../../../utils/SendClientSideEvent' +import relativeDate from '../../../utils/date/relativeDate' +import {mergeRefs} from '../../../utils/react/mergeRefs' interface Props { resultRef: JiraObjectCard_result$key diff --git a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx index 1099adffba0..e3538eb5db4 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx @@ -1,18 +1,18 @@ -import React, {useState} from 'react' import graphql from 'babel-plugin-relay/macro' +import clsx from 'clsx' +import React, {useState} from 'react' import {useFragment} from 'react-relay' -import {TaskStatusEnum} from '../../../__generated__/ParabolTasksResultsQuery.graphql' import {ParabolTasksPanel_meeting$key} from '../../../__generated__/ParabolTasksPanel_meeting.graphql' -import {TaskStatus} from '../../../types/constEnums' -import {meetingColumnArray} from '../../../utils/constants' -import {taskStatusLabels} from '../../../utils/taskStatus' +import {TaskStatusEnum} from '../../../__generated__/ParabolTasksResultsQuery.graphql' import useAtmosphere from '../../../hooks/useAtmosphere' import CreateTaskMutation from '../../../mutations/CreateTaskMutation' +import {TaskStatus} from '../../../types/constEnums' +import SendClientSideEvent from '../../../utils/SendClientSideEvent' +import {meetingColumnArray} from '../../../utils/constants' import dndNoise from '../../../utils/dndNoise' +import {taskStatusLabels} from '../../../utils/taskStatus' import AddTaskButton from '../../AddTaskButton' import ParabolTasksResultsRoot from './ParabolTasksResultsRoot' -import clsx from 'clsx' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' interface Props { meetingRef: ParabolTasksPanel_meeting$key diff --git a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx index 107ce9f2ab4..d6cb4fbee39 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx @@ -1,14 +1,14 @@ -import React from 'react' import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png' import { ParabolTasksResultsQuery, TaskStatusEnum } from '../../../__generated__/ParabolTasksResultsQuery.graphql' -import NullableTask from '../../NullableTask/NullableTask' -import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png' -import {taskStatusLabels} from '../../../utils/taskStatus' import useAtmosphere from '../../../hooks/useAtmosphere' +import {taskStatusLabels} from '../../../utils/taskStatus' +import NullableTask from '../../NullableTask/NullableTask' interface Props { queryRef: PreloadedQuery diff --git a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx index 4e508ab58e5..3fa964fba44 100644 --- a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx +++ b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx @@ -1,13 +1,13 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' +import {Loader} from '~/utils/relay/renderLoader' import parabolTasksResultsQuery, { ParabolTasksResultsQuery, TaskStatusEnum } from '../../../__generated__/ParabolTasksResultsQuery.graphql' +import useAtmosphere from '../../../hooks/useAtmosphere' +import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' import ErrorBoundary from '../../ErrorBoundary' import ParabolTasksResults from './ParabolTasksResults' -import {Loader} from '~/utils/relay/renderLoader' -import useAtmosphere from '../../../hooks/useAtmosphere' interface Props { selectedStatus: TaskStatusEnum diff --git a/packages/client/components/TeamPromptMeeting.tsx b/packages/client/components/TeamPromptMeeting.tsx index bc5cdbfdbf0..203a1b25fb9 100644 --- a/packages/client/components/TeamPromptMeeting.tsx +++ b/packages/client/components/TeamPromptMeeting.tsx @@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense, useEffect, useMemo} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' import {useHistory} from 'react-router' +import {TeamPromptMeeting_meeting$key} from '~/__generated__/TeamPromptMeeting_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useMeeting from '~/hooks/useMeeting' import useTransition from '~/hooks/useTransition' import {DiscussionThreadEnum} from '~/types/constEnums' import {isNotNull} from '~/utils/predicates' import sortByISO8601Date from '~/utils/sortByISO8601Date' -import {TeamPromptMeeting_meeting$key} from '~/__generated__/TeamPromptMeeting_meeting.graphql' import getPhaseByTypename from '../utils/getPhaseByTypename' import ErrorBoundary from './ErrorBoundary' import MeetingArea from './MeetingArea' diff --git a/packages/client/components/TeamsLimitExceededNotification.tsx b/packages/client/components/TeamsLimitExceededNotification.tsx index 36edacb7c0b..4238767e500 100644 --- a/packages/client/components/TeamsLimitExceededNotification.tsx +++ b/packages/client/components/TeamsLimitExceededNotification.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TeamsLimitExceededNotification_notification$key} from '~/__generated__/TeamsLimitExceededNotification_notification.graphql' import useRouter from '~/hooks/useRouter' import defaultOrgAvatar from '~/styles/theme/images/avatar-organization.svg' -import {TeamsLimitExceededNotification_notification$key} from '~/__generated__/TeamsLimitExceededNotification_notification.graphql' +import {Threshold} from '../types/constEnums' import NotificationAction from './NotificationAction' import NotificationTemplate from './NotificationTemplate' -import {Threshold} from '../types/constEnums' interface Props { notification: TeamsLimitExceededNotification_notification$key diff --git a/packages/client/components/TeamsLimitReminderNotification.tsx b/packages/client/components/TeamsLimitReminderNotification.tsx index afdc9d8e403..b432f4c812a 100644 --- a/packages/client/components/TeamsLimitReminderNotification.tsx +++ b/packages/client/components/TeamsLimitReminderNotification.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {useFragment} from 'react-relay' +import {TeamsLimitReminderNotification_notification$key} from '~/__generated__/TeamsLimitReminderNotification_notification.graphql' import useRouter from '~/hooks/useRouter' import defaultOrgAvatar from '~/styles/theme/images/avatar-organization.svg' -import {TeamsLimitReminderNotification_notification$key} from '~/__generated__/TeamsLimitReminderNotification_notification.graphql' import useAtmosphere from '../hooks/useAtmosphere' -import SendClientSideEvent from '../utils/SendClientSideEvent' import {Threshold} from '../types/constEnums' +import SendClientSideEvent from '../utils/SendClientSideEvent' import makeDateString from '../utils/makeDateString' import NotificationAction from './NotificationAction' import NotificationTemplate from './NotificationTemplate' diff --git a/packages/client/components/ThreadedCommentBase.tsx b/packages/client/components/ThreadedCommentBase.tsx index 0b46cfb7682..e592c81116e 100644 --- a/packages/client/components/ThreadedCommentBase.tsx +++ b/packages/client/components/ThreadedCommentBase.tsx @@ -3,6 +3,9 @@ import graphql from 'babel-plugin-relay/macro' import {convertToRaw, EditorState} from 'draft-js' import React, {ReactNode, useEffect, useRef, useState} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' +import {ThreadedCommentBase_comment$key} from '~/__generated__/ThreadedCommentBase_comment.graphql' +import {ThreadedCommentBase_discussion$key} from '~/__generated__/ThreadedCommentBase_discussion.graphql' +import {ThreadedCommentBase_viewer$key} from '~/__generated__/ThreadedCommentBase_viewer.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useEditorState from '~/hooks/useEditorState' import useMutationProps from '~/hooks/useMutationProps' @@ -11,13 +14,10 @@ import UpdateCommentContentMutation from '~/mutations/UpdateCommentContentMutati import convertToTaskContent from '~/utils/draftjs/convertToTaskContent' import isAndroid from '~/utils/draftjs/isAndroid' import isTempId from '~/utils/relay/isTempId' -import {ThreadedCommentBase_comment$key} from '~/__generated__/ThreadedCommentBase_comment.graphql' -import {ThreadedCommentBase_discussion$key} from '~/__generated__/ThreadedCommentBase_discussion.graphql' -import {ThreadedCommentBase_viewer$key} from '~/__generated__/ThreadedCommentBase_viewer.graphql' -import SendClientSideEvent from '../utils/SendClientSideEvent' import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg' import deletedAvatar from '../styles/theme/images/deleted-avatar-placeholder.svg' import {PARABOL_AI_USER_ID} from '../utils/constants' +import SendClientSideEvent from '../utils/SendClientSideEvent' import {DiscussionThreadables} from './DiscussionThreadList' import CommentEditor from './TaskEditor/CommentEditor' import ThreadedAvatarColumn from './ThreadedAvatarColumn' diff --git a/packages/client/components/ThreadedCommentFooter.tsx b/packages/client/components/ThreadedCommentFooter.tsx index bfaf75f403e..9178c2cb77e 100644 --- a/packages/client/components/ThreadedCommentFooter.tsx +++ b/packages/client/components/ThreadedCommentFooter.tsx @@ -2,8 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {PALETTE} from '~/styles/paletteV3' import {ThreadedCommentFooter_reactjis$key} from '~/__generated__/ThreadedCommentFooter_reactjis.graphql' +import {PALETTE} from '~/styles/paletteV3' import ReactjiSection from './ReflectionCard/ReactjiSection' import ThreadedReplyButton from './ThreadedReplyButton' diff --git a/packages/client/components/ThreadedCommentHeader.tsx b/packages/client/components/ThreadedCommentHeader.tsx index 0b33e7f92ef..5a902055eaa 100644 --- a/packages/client/components/ThreadedCommentHeader.tsx +++ b/packages/client/components/ThreadedCommentHeader.tsx @@ -2,12 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {PALETTE} from '~/styles/paletteV3' -import relativeDate from '~/utils/date/relativeDate' import { - ThreadedCommentHeader_comment$key, - ThreadedCommentHeader_comment$data + ThreadedCommentHeader_comment$data, + ThreadedCommentHeader_comment$key } from '~/__generated__/ThreadedCommentHeader_comment.graphql' +import {PALETTE} from '~/styles/paletteV3' +import relativeDate from '~/utils/date/relativeDate' import {PARABOL_AI_USER_ID} from '../utils/constants' import CommentAuthorOptionsButton from './CommentAuthorOptionsButton' import AddReactjiButton from './ReflectionCard/AddReactjiButton' diff --git a/packages/client/components/ThreadedItemReply.tsx b/packages/client/components/ThreadedItemReply.tsx index f0a0999a832..590d02e8f19 100644 --- a/packages/client/components/ThreadedItemReply.tsx +++ b/packages/client/components/ThreadedItemReply.tsx @@ -2,12 +2,12 @@ import graphql from 'babel-plugin-relay/macro' import {Editor} from 'draft-js' import React, {RefObject, useRef} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' -import useAtmosphere from '~/hooks/useAtmosphere' -import useClickAway from '~/hooks/useClickAway' -import isAndroid from '~/utils/draftjs/isAndroid' import {ThreadedItemReply_discussion$key} from '~/__generated__/ThreadedItemReply_discussion.graphql' import {ThreadedItemReply_threadable$key} from '~/__generated__/ThreadedItemReply_threadable.graphql' import {ThreadedItemReply_viewer$key} from '~/__generated__/ThreadedItemReply_viewer.graphql' +import useAtmosphere from '~/hooks/useAtmosphere' +import useClickAway from '~/hooks/useClickAway' +import isAndroid from '~/utils/draftjs/isAndroid' import DiscussionThreadInput from './DiscussionThreadInput' import {DiscussionThreadables} from './DiscussionThreadList' import {ReplyMention, SetReplyMention} from './ThreadedItem' diff --git a/packages/client/components/ThreadedPollBase.tsx b/packages/client/components/ThreadedPollBase.tsx index bde8b9840e7..7e19e8b3958 100644 --- a/packages/client/components/ThreadedPollBase.tsx +++ b/packages/client/components/ThreadedPollBase.tsx @@ -13,11 +13,11 @@ import PlainButton from './PlainButton/PlainButton' import {AddPollOptionButton} from './Poll/AddPollOptionButton' import EditablePollOption from './Poll/EditablePollOption' import EditablePollTitle from './Poll/EditablePollTitle' -import {addLocalPollOption} from './Poll/local/newPoll' import Poll from './Poll/Poll' import PollOption from './Poll/PollOption' import {getPollState} from './Poll/PollState' import PollTitle from './Poll/PollTitle' +import {addLocalPollOption} from './Poll/local/newPoll' const PollOptions = styled('div')({ fontSize: '14px', diff --git a/packages/client/components/ThreadedTaskBase.tsx b/packages/client/components/ThreadedTaskBase.tsx index 176f8dfdd06..eb05e3a2f99 100644 --- a/packages/client/components/ThreadedTaskBase.tsx +++ b/packages/client/components/ThreadedTaskBase.tsx @@ -2,11 +2,11 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {ReactNode, useRef} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' -import useAtmosphere from '~/hooks/useAtmosphere' -import {PALETTE} from '~/styles/paletteV3' import {ThreadedTaskBase_discussion$key} from '~/__generated__/ThreadedTaskBase_discussion.graphql' import {ThreadedTaskBase_task$key} from '~/__generated__/ThreadedTaskBase_task.graphql' import {ThreadedTaskBase_viewer$key} from '~/__generated__/ThreadedTaskBase_viewer.graphql' +import useAtmosphere from '~/hooks/useAtmosphere' +import {PALETTE} from '~/styles/paletteV3' import {DiscussionThreadables} from './DiscussionThreadList' import NullableTask from './NullableTask/NullableTask' import ThreadedAvatarColumn from './ThreadedAvatarColumn' diff --git a/packages/client/components/TimelineEvent.tsx b/packages/client/components/TimelineEvent.tsx index 0a3596d74a3..05c9e906aea 100644 --- a/packages/client/components/TimelineEvent.tsx +++ b/packages/client/components/TimelineEvent.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React, {lazy, Suspense} from 'react' import {useFragment} from 'react-relay' -import {ValueOf} from '../types/generics' import {TimelineEvent_timelineEvent$key} from '../__generated__/TimelineEvent_timelineEvent.graphql' +import {ValueOf} from '../types/generics' import DelayUnmount from './DelayUnmount' import TimelineEventMock from './TimelineEventMock' diff --git a/packages/client/components/TimelineEventCard.tsx b/packages/client/components/TimelineEventCard.tsx index 7cb80393a73..86ab45b8154 100644 --- a/packages/client/components/TimelineEventCard.tsx +++ b/packages/client/components/TimelineEventCard.tsx @@ -2,8 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {ReactNode} from 'react' import {useFragment} from 'react-relay' -import {cardShadow} from '../styles/elevation' import {TimelineEventCard_timelineEvent$key} from '../__generated__/TimelineEventCard_timelineEvent.graphql' +import {cardShadow} from '../styles/elevation' import TimelineEventDate from './TimelineEventDate' import TimelineEventHeaderMenuToggle from './TimelineEventHeaderMenuToggle' import TimelineEventTypeIcon from './TimelineEventTypeIcon' diff --git a/packages/client/components/TimelineEventCompletedActionMeeting.tsx b/packages/client/components/TimelineEventCompletedActionMeeting.tsx index 77b4465806a..d9d0b1ca00f 100644 --- a/packages/client/components/TimelineEventCompletedActionMeeting.tsx +++ b/packages/client/components/TimelineEventCompletedActionMeeting.tsx @@ -2,15 +2,15 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TimelineEventCompletedActionMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedActionMeeting_timelineEvent.graphql' import useAtmosphere from '../hooks/useAtmosphere' import SendClientSideEvent from '../utils/SendClientSideEvent' import relativeDate from '../utils/date/relativeDate' import plural from '../utils/plural' -import {TimelineEventCompletedActionMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedActionMeeting_timelineEvent.graphql' import StyledLink from './StyledLink' +import TimelineEventTitle from './TImelineEventTitle' import TimelineEventBody from './TimelineEventBody' import TimelineEventCard from './TimelineEventCard' -import TimelineEventTitle from './TImelineEventTitle' interface Props { timelineEvent: TimelineEventCompletedActionMeeting_timelineEvent$key diff --git a/packages/client/components/TimelineEventCompletedRetroMeeting.tsx b/packages/client/components/TimelineEventCompletedRetroMeeting.tsx index 1391de3e57a..e555203ee63 100644 --- a/packages/client/components/TimelineEventCompletedRetroMeeting.tsx +++ b/packages/client/components/TimelineEventCompletedRetroMeeting.tsx @@ -2,14 +2,14 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TimelineEventCompletedRetroMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedRetroMeeting_timelineEvent.graphql' import useAtmosphere from '../hooks/useAtmosphere' import SendClientSideEvent from '../utils/SendClientSideEvent' import plural from '../utils/plural' -import {TimelineEventCompletedRetroMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedRetroMeeting_timelineEvent.graphql' import StyledLink from './StyledLink' +import TimelineEventTitle from './TImelineEventTitle' import TimelineEventBody from './TimelineEventBody' import TimelineEventCard from './TimelineEventCard' -import TimelineEventTitle from './TImelineEventTitle' interface Props { timelineEvent: TimelineEventCompletedRetroMeeting_timelineEvent$key diff --git a/packages/client/components/TimelineEventJoinedParabol.tsx b/packages/client/components/TimelineEventJoinedParabol.tsx index ba9a5cb17dc..9da3265431e 100644 --- a/packages/client/components/TimelineEventJoinedParabol.tsx +++ b/packages/client/components/TimelineEventJoinedParabol.tsx @@ -4,9 +4,9 @@ import React from 'react' import {useFragment} from 'react-relay' import {TimelineEventJoinedParabol_timelineEvent$key} from '../__generated__/TimelineEventJoinedParabol_timelineEvent.graphql' import StyledLink from './StyledLink' +import TimelineEventTitle from './TImelineEventTitle' import TimelineEventBody from './TimelineEventBody' import TimelineEventCard from './TimelineEventCard' -import TimelineEventTitle from './TImelineEventTitle' interface Props { timelineEvent: TimelineEventJoinedParabol_timelineEvent$key diff --git a/packages/client/components/TimelineEventPokerComplete.tsx b/packages/client/components/TimelineEventPokerComplete.tsx index 1cc02fe7a8e..02c8935011e 100644 --- a/packages/client/components/TimelineEventPokerComplete.tsx +++ b/packages/client/components/TimelineEventPokerComplete.tsx @@ -2,15 +2,15 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TimelineEventPokerComplete_timelineEvent$key} from '../__generated__/TimelineEventPokerComplete_timelineEvent.graphql' import useAtmosphere from '../hooks/useAtmosphere' import SendClientSideEvent from '../utils/SendClientSideEvent' import plural from '../utils/plural' -import {TimelineEventPokerComplete_timelineEvent$key} from '../__generated__/TimelineEventPokerComplete_timelineEvent.graphql' +import CardsSVG from './CardsSVG' import StyledLink from './StyledLink' +import TimelineEventTitle from './TImelineEventTitle' import TimelineEventBody from './TimelineEventBody' import TimelineEventCard from './TimelineEventCard' -import TimelineEventTitle from './TImelineEventTitle' -import CardsSVG from './CardsSVG' interface Props { timelineEvent: TimelineEventPokerComplete_timelineEvent$key diff --git a/packages/client/components/TimelineEventTeamCreated.tsx b/packages/client/components/TimelineEventTeamCreated.tsx index 8c7f43f0821..2a922fd9c40 100644 --- a/packages/client/components/TimelineEventTeamCreated.tsx +++ b/packages/client/components/TimelineEventTeamCreated.tsx @@ -4,9 +4,9 @@ import React from 'react' import {useFragment} from 'react-relay' import {TimelineEventTeamCreated_timelineEvent$key} from '../__generated__/TimelineEventTeamCreated_timelineEvent.graphql' import StyledLink from './StyledLink' +import TimelineEventTitle from './TImelineEventTitle' import TimelineEventBody from './TimelineEventBody' import TimelineEventCard from './TimelineEventCard' -import TimelineEventTitle from './TImelineEventTitle' interface Props { timelineEvent: TimelineEventTeamCreated_timelineEvent$key diff --git a/packages/client/components/TimelineEventTeamPromptComplete.tsx b/packages/client/components/TimelineEventTeamPromptComplete.tsx index 9bf42575646..d74a9671494 100644 --- a/packages/client/components/TimelineEventTeamPromptComplete.tsx +++ b/packages/client/components/TimelineEventTeamPromptComplete.tsx @@ -2,14 +2,14 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TimelineEventTeamPromptComplete_timelineEvent$key} from '../__generated__/TimelineEventTeamPromptComplete_timelineEvent.graphql' import useAtmosphere from '../hooks/useAtmosphere' import SendClientSideEvent from '../utils/SendClientSideEvent' import plural from '../utils/plural' -import {TimelineEventTeamPromptComplete_timelineEvent$key} from '../__generated__/TimelineEventTeamPromptComplete_timelineEvent.graphql' import StyledLink from './StyledLink' +import TimelineEventTitle from './TImelineEventTitle' import TimelineEventBody from './TimelineEventBody' import TimelineEventCard from './TimelineEventCard' -import TimelineEventTitle from './TImelineEventTitle' interface Props { timelineEvent: TimelineEventTeamPromptComplete_timelineEvent$key diff --git a/packages/client/components/TimelineEventTypeIcon.tsx b/packages/client/components/TimelineEventTypeIcon.tsx index d896df2ed98..a957f1b8eaf 100644 --- a/packages/client/components/TimelineEventTypeIcon.tsx +++ b/packages/client/components/TimelineEventTypeIcon.tsx @@ -9,8 +9,8 @@ import { Style, Timeline } from '@mui/icons-material' -import {PALETTE} from '../styles/paletteV3' import React from 'react' +import {PALETTE} from '../styles/paletteV3' interface Props { iconName?: string diff --git a/packages/client/components/TimelineEventTypeMenu.tsx b/packages/client/components/TimelineEventTypeMenu.tsx index 24ff1d0745a..2194f374570 100644 --- a/packages/client/components/TimelineEventTypeMenu.tsx +++ b/packages/client/components/TimelineEventTypeMenu.tsx @@ -3,12 +3,12 @@ import useAtmosphere from '~/hooks/useAtmosphere' import useRouter from '~/hooks/useRouter' import constructFilterQueryParamURL from '~/utils/constructFilterQueryParamURL' import {useQueryParameterParser} from '~/utils/useQueryParameterParser' +import TimelineEventTypeEnum from '../../server/graphql/types/TimelineEventTypeEnum' import {MenuProps} from '../hooks/useMenu' import DropdownMenuLabel from './DropdownMenuLabel' +import EventTypeFilterMenuItemLabel from './EventTypeFilterMenuItemLabel' import Menu from './Menu' import MenuItem from './MenuItem' -import TimelineEventTypeEnum from '../../server/graphql/types/TimelineEventTypeEnum' -import EventTypeFilterMenuItemLabel from './EventTypeFilterMenuItemLabel' interface Props { menuProps: MenuProps diff --git a/packages/client/components/TimelineFeedList.tsx b/packages/client/components/TimelineFeedList.tsx index 9b175bf45db..b0c1159f355 100644 --- a/packages/client/components/TimelineFeedList.tsx +++ b/packages/client/components/TimelineFeedList.tsx @@ -2,12 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {usePaginationFragment} from 'react-relay' +import {Link} from 'react-router-dom' import useLoadNextOnScrollBottom from '~/hooks/useLoadNextOnScrollBottom' import {TimelineFeedListPaginationQuery} from '../__generated__/TimelineFeedListPaginationQuery.graphql' import {TimelineFeedList_query$key} from '../__generated__/TimelineFeedList_query.graphql' import TimelineEvent from './TimelineEvent' import TimelineHistoryLockedCard from './TimelineHistoryLockedCard' -import {Link} from 'react-router-dom' const ResultScroller = styled('div')({ overflow: 'auto' diff --git a/packages/client/components/TimelineHeader.tsx b/packages/client/components/TimelineHeader.tsx index a659e0f3248..003a0b3bde4 100644 --- a/packages/client/components/TimelineHeader.tsx +++ b/packages/client/components/TimelineHeader.tsx @@ -1,17 +1,17 @@ import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' +import {useFragment} from 'react-relay' +import {TimelineHeader_viewer$key} from '../__generated__/TimelineHeader_viewer.graphql' +import useAtmosphere from '../hooks/useAtmosphere' import {MenuPosition} from '../hooks/useCoords' import useMenu from '../hooks/useMenu' import {FilterLabels} from '../types/constEnums' +import {timelineEventTypeMenuLabels} from '../utils/constants' import lazyPreload from '../utils/lazyPreload' +import {useQueryParameterParser} from '../utils/useQueryParameterParser' +import DashFilterToggle from './DashFilterToggle/DashFilterToggle' import DashSectionControls from './Dashboard/DashSectionControls' import DashSectionHeader from './Dashboard/DashSectionHeader' -import DashFilterToggle from './DashFilterToggle/DashFilterToggle' -import {useQueryParameterParser} from '../utils/useQueryParameterParser' -import useAtmosphere from '../hooks/useAtmosphere' -import {timelineEventTypeMenuLabels} from '../utils/constants' -import {useFragment} from 'react-relay' -import {TimelineHeader_viewer$key} from '../__generated__/TimelineHeader_viewer.graphql' const TeamFilterMenu = lazyPreload( () => diff --git a/packages/client/components/TimelineHistoryLockedCard.tsx b/packages/client/components/TimelineHistoryLockedCard.tsx index c6d052e68f1..020ae2730ce 100644 --- a/packages/client/components/TimelineHistoryLockedCard.tsx +++ b/packages/client/components/TimelineHistoryLockedCard.tsx @@ -3,13 +3,13 @@ import {Lock} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {useEffect, useRef} from 'react' import {useFragment} from 'react-relay' +import {TimelineHistoryLockedCard_organization$key} from '../__generated__/TimelineHistoryLockedCard_organization.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useIsVisible from '../hooks/useIsVisible' import useRouter from '../hooks/useRouter' -import SendClientSideEvent from '../utils/SendClientSideEvent' import {cardShadow} from '../styles/elevation' import {PALETTE} from '../styles/paletteV3' -import {TimelineHistoryLockedCard_organization$key} from '../__generated__/TimelineHistoryLockedCard_organization.graphql' +import SendClientSideEvent from '../utils/SendClientSideEvent' import PrimaryButton from './PrimaryButton' interface Props { diff --git a/packages/client/components/TimelinePriorityTasks.tsx b/packages/client/components/TimelinePriorityTasks.tsx index 3834aff904b..554ba4ba218 100644 --- a/packages/client/components/TimelinePriorityTasks.tsx +++ b/packages/client/components/TimelinePriorityTasks.tsx @@ -4,6 +4,7 @@ import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {DragDropContext, Droppable, DroppableProvided, DropResult} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' +import {TimelinePriorityTasks_viewer$key} from '../__generated__/TimelinePriorityTasks_viewer.graphql' import DraggableTask from '../containers/TaskCard/DraggableTask' import useAtmosphere from '../hooks/useAtmosphere' import useEventCallback from '../hooks/useEventCallback' @@ -12,7 +13,6 @@ import {PALETTE} from '../styles/paletteV3' import {DroppableType} from '../types/constEnums' import {ACTIVE, ACTIVE_TASK, SORT_STEP} from '../utils/constants' import dndNoise from '../utils/dndNoise' -import {TimelinePriorityTasks_viewer$key} from '../__generated__/TimelinePriorityTasks_viewer.graphql' import TimelineNoTasks from './TimelineNoTasks' interface Props { diff --git a/packages/client/components/TimelineRightDrawer.tsx b/packages/client/components/TimelineRightDrawer.tsx index 5f6f4b3838a..f634ecc9387 100644 --- a/packages/client/components/TimelineRightDrawer.tsx +++ b/packages/client/components/TimelineRightDrawer.tsx @@ -3,9 +3,9 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' +import {TimelineRightDrawer_viewer$key} from '../__generated__/TimelineRightDrawer_viewer.graphql' import {PALETTE} from '../styles/paletteV3' import {DashTimeline, NavSidebar} from '../types/constEnums' -import {TimelineRightDrawer_viewer$key} from '../__generated__/TimelineRightDrawer_viewer.graphql' import ErrorBoundary from './ErrorBoundary' import TimelinePriorityTasks from './TimelinePriorityTasks' diff --git a/packages/client/components/TimelineSuggestedAction.tsx b/packages/client/components/TimelineSuggestedAction.tsx index d0623439e7e..5f192adb47a 100644 --- a/packages/client/components/TimelineSuggestedAction.tsx +++ b/packages/client/components/TimelineSuggestedAction.tsx @@ -2,8 +2,8 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {lazy} from 'react' import {useFragment} from 'react-relay' -import {ValueOf} from '../types/generics' import {TimelineSuggestedAction_viewer$key} from '../__generated__/TimelineSuggestedAction_viewer.graphql' +import {ValueOf} from '../types/generics' import DelayUnmount from './DelayUnmount' interface Props { diff --git a/packages/client/components/TopBarNotifications.tsx b/packages/client/components/TopBarNotifications.tsx index 5586877a812..d4f3322fa36 100644 --- a/packages/client/components/TopBarNotifications.tsx +++ b/packages/client/components/TopBarNotifications.tsx @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect, useRef} from 'react' import {useFragment} from 'react-relay' +import {TopBarNotifications_query$key} from '~/__generated__/TopBarNotifications_query.graphql' import {MenuPosition} from '~/hooks/useCoords' import useMenu from '~/hooks/useMenu' import lazyPreload from '~/utils/lazyPreload' -import {TopBarNotifications_query$key} from '~/__generated__/TopBarNotifications_query.graphql' import useRouter from '../hooks/useRouter' import TopBarIcon from './TopBarIcon' diff --git a/packages/client/components/TopBarSearch.tsx b/packages/client/components/TopBarSearch.tsx index d87394ce467..db7b7045f3f 100644 --- a/packages/client/components/TopBarSearch.tsx +++ b/packages/client/components/TopBarSearch.tsx @@ -3,12 +3,12 @@ import {Close, Search} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {useRef} from 'react' import {useFragment} from 'react-relay' -import {matchPath, RouteProps} from 'react-router' +import {RouteProps, matchPath} from 'react-router' import {commitLocalUpdate} from 'relay-runtime' +import {TopBarSearch_viewer$key} from '~/__generated__/TopBarSearch_viewer.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useRouter from '~/hooks/useRouter' import {PALETTE} from '~/styles/paletteV3' -import {TopBarSearch_viewer$key} from '~/__generated__/TopBarSearch_viewer.graphql' import Atmosphere from '../Atmosphere' const getShowSearch = (location: NonNullable) => { diff --git a/packages/client/components/UserDashTeamMemberMenu.tsx b/packages/client/components/UserDashTeamMemberMenu.tsx index f466c0c29ae..af1f60138e8 100644 --- a/packages/client/components/UserDashTeamMemberMenu.tsx +++ b/packages/client/components/UserDashTeamMemberMenu.tsx @@ -7,11 +7,11 @@ import useSearchFilter from '~/hooks/useSearchFilter' import {FilterLabels} from '~/types/constEnums' import constructFilterQueryParamURL from '~/utils/constructFilterQueryParamURL' import {useQueryParameterParser} from '~/utils/useQueryParameterParser' -import {MenuProps} from '../hooks/useMenu' import { - UserDashTeamMemberMenu_viewer$key, - UserDashTeamMemberMenu_viewer$data + UserDashTeamMemberMenu_viewer$data, + UserDashTeamMemberMenu_viewer$key } from '../__generated__/UserDashTeamMemberMenu_viewer.graphql' +import {MenuProps} from '../hooks/useMenu' import DropdownMenuLabel from './DropdownMenuLabel' import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel' import Menu from './Menu' diff --git a/packages/client/components/ViewerNotOnTeam.tsx b/packages/client/components/ViewerNotOnTeam.tsx index cd67491fe62..cddcd3e536a 100644 --- a/packages/client/components/ViewerNotOnTeam.tsx +++ b/packages/client/components/ViewerNotOnTeam.tsx @@ -1,13 +1,13 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {ViewerNotOnTeamQuery} from '../__generated__/ViewerNotOnTeamQuery.graphql' import useAtmosphere from '../hooks/useAtmosphere' import useDocumentTitle from '../hooks/useDocumentTitle' import useMutationProps from '../hooks/useMutationProps' import useRouter from '../hooks/useRouter' import AcceptTeamInvitationMutation from '../mutations/AcceptTeamInvitationMutation' import PushInvitationMutation from '../mutations/PushInvitationMutation' -import {ViewerNotOnTeamQuery} from '../__generated__/ViewerNotOnTeamQuery.graphql' import DialogContent from './DialogContent' import DialogTitle from './DialogTitle' import Ellipsis from './Ellipsis/Ellipsis' diff --git a/packages/client/components/ViewerNotOnTeamRoot.tsx b/packages/client/components/ViewerNotOnTeamRoot.tsx index a90bc899b09..174650f60c0 100644 --- a/packages/client/components/ViewerNotOnTeamRoot.tsx +++ b/packages/client/components/ViewerNotOnTeamRoot.tsx @@ -1,12 +1,12 @@ import React, {Suspense} from 'react' +import viewerNotOnTeamQuery, { + ViewerNotOnTeamQuery +} from '../__generated__/ViewerNotOnTeamQuery.graphql' import useQueryLoaderNow from '../hooks/useQueryLoaderNow' import useSubscription from '../hooks/useSubscription' import NotificationSubscription from '../subscriptions/NotificationSubscription' import {LoaderSize} from '../types/constEnums' import {Loader} from '../utils/relay/renderLoader' -import viewerNotOnTeamQuery, { - ViewerNotOnTeamQuery -} from '../__generated__/ViewerNotOnTeamQuery.graphql' import ViewerNotOnTeam from './ViewerNotOnTeam' const ViewerNotOnTeamRoot = () => { diff --git a/packages/client/components/VoteSettingsMenu.tsx b/packages/client/components/VoteSettingsMenu.tsx index 55fbe472d7b..cfc99fffb85 100644 --- a/packages/client/components/VoteSettingsMenu.tsx +++ b/packages/client/components/VoteSettingsMenu.tsx @@ -2,12 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {VoteSettingsMenu_meeting$key} from '~/__generated__/VoteSettingsMenu_meeting.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useMutationProps from '~/hooks/useMutationProps' import UpdateRetroMaxVotesMutation from '~/mutations/UpdateRetroMaxVotesMutation' import {PALETTE} from '~/styles/paletteV3' import {MeetingSettingsThreshold} from '~/types/constEnums' -import {VoteSettingsMenu_meeting$key} from '~/__generated__/VoteSettingsMenu_meeting.graphql' import {MenuProps} from '../hooks/useMenu' import Menu from './Menu' import StyledError from './StyledError' diff --git a/packages/client/components/promptResponse/PromptResponseEditor.tsx b/packages/client/components/promptResponse/PromptResponseEditor.tsx index 43cd588ad79..fcb7c1e60ca 100644 --- a/packages/client/components/promptResponse/PromptResponseEditor.tsx +++ b/packages/client/components/promptResponse/PromptResponseEditor.tsx @@ -11,8 +11,8 @@ import EditorLinkChangerTipTap from '../EditorLinkChanger/EditorLinkChangerTipTa import EditorLinkViewerTipTap from '../EditorLinkViewer/EditorLinkViewerTipTap' import EmojiMenuTipTap from './EmojiMenuTipTap' import MentionsTipTap from './MentionsTipTap' -import {createEditorExtensions, getLinkProps, LinkMenuProps, LinkPreviewProps} from './tiptapConfig' import {unfurlLoomLinks} from './loomExtension' +import {LinkMenuProps, LinkPreviewProps, createEditorExtensions, getLinkProps} from './tiptapConfig' const LinkIcon = styled(Link)({ height: 18, diff --git a/packages/client/components/useSetTaskEstimate.ts b/packages/client/components/useSetTaskEstimate.ts index 717fc423d31..1ca9cb39046 100644 --- a/packages/client/components/useSetTaskEstimate.ts +++ b/packages/client/components/useSetTaskEstimate.ts @@ -1,11 +1,11 @@ -import useAtmosphere from '../hooks/useAtmosphere' -import useMutationProps from '../hooks/useMutationProps' -import SetTaskEstimateMutation from '../mutations/SetTaskEstimateMutation' -import {CompletedHandler} from '../types/relayMutations' import { SetTaskEstimateMutation as TSetTaskEstimateMutation, TaskEstimateInput } from '../__generated__/SetTaskEstimateMutation.graphql' +import useAtmosphere from '../hooks/useAtmosphere' +import useMutationProps from '../hooks/useMutationProps' +import SetTaskEstimateMutation from '../mutations/SetTaskEstimateMutation' +import {CompletedHandler} from '../types/relayMutations' const useSetTaskEstimate = () => { const {submitMutation, submitting, error, onError, onCompleted} = useMutationProps() diff --git a/packages/client/containers/Signout/signout.ts b/packages/client/containers/Signout/signout.ts index e32cba1b1f3..ceca7c3a68e 100644 --- a/packages/client/containers/Signout/signout.ts +++ b/packages/client/containers/Signout/signout.ts @@ -1,6 +1,6 @@ import Atmosphere from '../../Atmosphere' -import SendClientSideEvent from '../../utils/SendClientSideEvent' import {LocalStorageKey} from '../../types/constEnums' +import SendClientSideEvent from '../../utils/SendClientSideEvent' const signout = (atmosphere: Atmosphere, history: any) => { window.localStorage.removeItem(LocalStorageKey.APP_TOKEN_KEY) diff --git a/packages/client/containers/TaskCard/DraggableTask.tsx b/packages/client/containers/TaskCard/DraggableTask.tsx index 75e124abacf..a0a0183b746 100644 --- a/packages/client/containers/TaskCard/DraggableTask.tsx +++ b/packages/client/containers/TaskCard/DraggableTask.tsx @@ -4,8 +4,8 @@ import React from 'react' import {Draggable, DraggableProvided, DraggableStateSnapshot} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql' -import NullableTask from '../../components/NullableTask/NullableTask' import {DraggableTask_task$key} from '../../__generated__/DraggableTask_task.graphql' +import NullableTask from '../../components/NullableTask/NullableTask' const DraggableStyles = styled('div')({ // sometimes the default blue fuzzies show up around the containing div diff --git a/packages/client/hooks/useAnimatedSpotlightSource.ts b/packages/client/hooks/useAnimatedSpotlightSource.ts index b974ec36a24..2eeb2d60e76 100644 --- a/packages/client/hooks/useAnimatedSpotlightSource.ts +++ b/packages/client/hooks/useAnimatedSpotlightSource.ts @@ -2,10 +2,10 @@ import {Times} from 'parabol-client/types/constEnums' import {MutableRefObject, useLayoutEffect, useRef} from 'react' import useAtmosphere from '~/hooks/useAtmosphere' import {PortalStatus} from '~/hooks/usePortal' -import SendClientSideEvent from '~/utils/SendClientSideEvent' import StartDraggingReflectionMutation from '~/mutations/StartDraggingReflectionMutation' import {Elevation} from '~/styles/elevation' import {BezierCurve, ElementWidth} from '~/types/constEnums' +import SendClientSideEvent from '~/utils/SendClientSideEvent' import clientTempId from '~/utils/relay/clientTempId' import cloneReflection from '~/utils/retroGroup/cloneReflection' diff --git a/packages/client/hooks/useClientSideTrack.ts b/packages/client/hooks/useClientSideTrack.ts index f498bfb5a6c..7824e059659 100644 --- a/packages/client/hooks/useClientSideTrack.ts +++ b/packages/client/hooks/useClientSideTrack.ts @@ -1,6 +1,6 @@ import {useEffect, useRef} from 'react' -import useAtmosphere from './useAtmosphere' import SendClientSideEvent from '../utils/SendClientSideEvent' +import useAtmosphere from './useAtmosphere' // certain users keep sending this non-stop. not sure why. // include an eventId so we know if it's the component. if it's not here, then in must be in trebuchet diff --git a/packages/client/hooks/useDraggableReflectionCard.tsx b/packages/client/hooks/useDraggableReflectionCard.tsx index 8d4d0e2df69..6e6e82e83c5 100644 --- a/packages/client/hooks/useDraggableReflectionCard.tsx +++ b/packages/client/hooks/useDraggableReflectionCard.tsx @@ -1,8 +1,9 @@ import React, {useContext, useEffect, useRef, useState} from 'react' import {commitLocalUpdate} from 'relay-runtime' -import SendClientSideEvent from '~/utils/SendClientSideEvent' import {DraggableReflectionCard_meeting$data} from '~/__generated__/DraggableReflectionCard_meeting.graphql' import {DragReflectionDropTargetTypeEnum} from '~/__generated__/EndDraggingReflectionMutation_meeting.graphql' +import SendClientSideEvent from '~/utils/SendClientSideEvent' +import {DraggableReflectionCard_reflection$data} from '../__generated__/DraggableReflectionCard_reflection.graphql' import {PortalContext, SetPortal} from '../components/AtmosphereProvider/PortalProvider' import {SwipeColumn} from '../components/GroupingKanban' import {ReflectionDragState} from '../components/ReflectionGroup/DraggableReflectionCard' @@ -23,7 +24,6 @@ import updateClonePosition, { getDroppingStyles, getSpotlightAnimation } from '../utils/retroGroup/updateClonePosition' -import {DraggableReflectionCard_reflection$data} from '../__generated__/DraggableReflectionCard_reflection.graphql' import useAtmosphere from './useAtmosphere' import useEventCallback from './useEventCallback' import useSpotlightResults from './useSpotlightResults' diff --git a/packages/client/hooks/useEndMeetingHotkey.ts b/packages/client/hooks/useEndMeetingHotkey.ts index 6122816cf2e..92668697366 100644 --- a/packages/client/hooks/useEndMeetingHotkey.ts +++ b/packages/client/hooks/useEndMeetingHotkey.ts @@ -1,7 +1,7 @@ +import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql' import EndCheckInMutation from '~/mutations/EndCheckInMutation' import EndRetrospectiveMutation from '~/mutations/EndRetrospectiveMutation' import EndSprintPokerMutation from '~/mutations/EndSprintPokerMutation' -import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql' import handleHotkey from '../utils/meetings/handleHotkey' import useAtmosphere from './useAtmosphere' import useHotkey from './useHotkey' diff --git a/packages/client/hooks/useGotoStageId.ts b/packages/client/hooks/useGotoStageId.ts index 73d6aeb219e..b73eac1e94a 100644 --- a/packages/client/hooks/useGotoStageId.ts +++ b/packages/client/hooks/useGotoStageId.ts @@ -3,8 +3,8 @@ import {useCallback} from 'react' import {readInlineData} from 'relay-runtime' import {NavigateMeetingMutation as TNavigateMeetingMutation} from '~/__generated__/NavigateMeetingMutation.graphql' import {useGotoStageId_meeting$key} from '~/__generated__/useGotoStageId_meeting.graphql' -import {demoTeamId} from '../modules/demo/initDB' import LocalAtmosphere from '../modules/demo/LocalAtmosphere' +import {demoTeamId} from '../modules/demo/initDB' import NavigateMeetingMutation from '../mutations/NavigateMeetingMutation' import findStageById from '../utils/meetings/findStageById' import isForwardProgress from '../utils/meetings/isForwardProgress' diff --git a/packages/client/hooks/useInitialSafeRoute.ts b/packages/client/hooks/useInitialSafeRoute.ts index 4210c177ef4..84d3e7fb75b 100644 --- a/packages/client/hooks/useInitialSafeRoute.ts +++ b/packages/client/hooks/useInitialSafeRoute.ts @@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro' import {Dispatch, SetStateAction, useEffect} from 'react' import {readInlineData} from 'relay-runtime' import {useInitialSafeRoute_meeting$key} from '~/__generated__/useInitialSafeRoute_meeting.graphql' +import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql' import {RetroDemo} from '../types/constEnums' import findKeyByValue from '../utils/findKeyByValue' import findStageById from '../utils/meetings/findStageById' @@ -9,7 +10,6 @@ import fromStageIdToUrl from '../utils/meetings/fromStageIdToUrl' import getMeetingPathParams from '../utils/meetings/getMeetingPathParams' import {phaseTypeToSlug} from '../utils/meetings/lookups' import updateLocalStage from '../utils/relay/updateLocalStage' -import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql' import useAtmosphere from './useAtmosphere' import useRouter from './useRouter' diff --git a/packages/client/hooks/useIsIntegrated.ts b/packages/client/hooks/useIsIntegrated.ts index cd05f887bed..e7ac801b8ca 100644 --- a/packages/client/hooks/useIsIntegrated.ts +++ b/packages/client/hooks/useIsIntegrated.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' -import {useIsIntegrated_integrations$key} from '../__generated__/useIsIntegrated_integrations.graphql' import {useFragment} from 'react-relay' +import {useIsIntegrated_integrations$key} from '../__generated__/useIsIntegrated_integrations.graphql' type IntegrationLookup = { hasGitHub: boolean diff --git a/packages/client/hooks/useMeeting.ts b/packages/client/hooks/useMeeting.ts index 6f5f16d2e5b..e5f00e7db34 100644 --- a/packages/client/hooks/useMeeting.ts +++ b/packages/client/hooks/useMeeting.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {readInlineData} from 'relay-runtime' -import isDemoRoute from '~/utils/isDemoRoute' import {useMeeting_meeting$key} from '~/__generated__/useMeeting_meeting.graphql' +import isDemoRoute from '~/utils/isDemoRoute' import {Breakpoint} from '../types/constEnums' import useAutoCheckIn from './useAutoCheckIn' import useBreakpoint from './useBreakpoint' diff --git a/packages/client/hooks/useNewFeatureSnackbar.ts b/packages/client/hooks/useNewFeatureSnackbar.ts index 6e4d103bc62..30f6730b342 100644 --- a/packages/client/hooks/useNewFeatureSnackbar.ts +++ b/packages/client/hooks/useNewFeatureSnackbar.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {useEffect} from 'react' import {useFragment} from 'react-relay' -import DismissNewFeatureMutation from '../mutations/DismissNewFeatureMutation' import {useNewFeatureSnackbar_viewer$key} from '../__generated__/useNewFeatureSnackbar_viewer.graphql' +import DismissNewFeatureMutation from '../mutations/DismissNewFeatureMutation' import useAtmosphere from './useAtmosphere' import useMutationProps from './useMutationProps' diff --git a/packages/client/hooks/useQueryLoaderNow.tsx b/packages/client/hooks/useQueryLoaderNow.tsx index 4e7207e6a35..33f2bd2d36e 100644 --- a/packages/client/hooks/useQueryLoaderNow.tsx +++ b/packages/client/hooks/useQueryLoaderNow.tsx @@ -1,9 +1,9 @@ import areEqual from 'fbjs/lib/areEqual' import {useCallback, useEffect, useRef} from 'react' import { - fetchQuery, - PreloadableConcreteRequest, PreloadFetchPolicy, + PreloadableConcreteRequest, + fetchQuery, useQueryLoader } from 'react-relay' import {GraphQLTaggedNode, OperationType, VariablesOf} from 'relay-runtime' diff --git a/packages/client/hooks/useSnacksForNewMeetings.ts b/packages/client/hooks/useSnacksForNewMeetings.ts index c72f6b9bda7..2a41b9735ab 100644 --- a/packages/client/hooks/useSnacksForNewMeetings.ts +++ b/packages/client/hooks/useSnacksForNewMeetings.ts @@ -2,9 +2,9 @@ import graphql from 'babel-plugin-relay/macro' import ms from 'ms' import {useEffect, useState} from 'react' import {readInlineData} from 'relay-runtime' +import {useSnacksForNewMeetings_meetings$key} from '~/__generated__/useSnacksForNewMeetings_meetings.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useRouter from '~/hooks/useRouter' -import {useSnacksForNewMeetings_meetings$key} from '~/__generated__/useSnacksForNewMeetings_meetings.graphql' const useSnacksForNewMeetings = (meetingsRef: readonly useSnacksForNewMeetings_meetings$key[]) => { const [dismissedMeetingIds] = useState(() => new Set()) diff --git a/packages/client/hooks/useSpotlightSimulatedDrag.tsx b/packages/client/hooks/useSpotlightSimulatedDrag.tsx index ad9774ebb09..bf93a24cbe2 100644 --- a/packages/client/hooks/useSpotlightSimulatedDrag.tsx +++ b/packages/client/hooks/useSpotlightSimulatedDrag.tsx @@ -1,8 +1,8 @@ import {MutableRefObject, useCallback, useEffect, useMemo, useRef} from 'react' import {commitLocalUpdate} from 'react-relay' -import SendClientSideEvent from '~/utils/SendClientSideEvent' -import {Times} from '~/types/constEnums' import {GroupingKanban_meeting$data} from '~/__generated__/GroupingKanban_meeting.graphql' +import {Times} from '~/types/constEnums' +import SendClientSideEvent from '~/utils/SendClientSideEvent' import EndDraggingReflectionMutation from '../mutations/EndDraggingReflectionMutation' import useAtmosphere from './useAtmosphere' diff --git a/packages/client/hooks/useSubColumns.ts b/packages/client/hooks/useSubColumns.ts index 48e4ce6b9ef..7e653bf7441 100644 --- a/packages/client/hooks/useSubColumns.ts +++ b/packages/client/hooks/useSubColumns.ts @@ -1,8 +1,8 @@ import {RefObject, useMemo, useState} from 'react' import {commitLocalUpdate} from 'react-relay' +import {GroupingKanbanColumn_reflectionGroups$data} from '~/__generated__/GroupingKanbanColumn_reflectionGroups.graphql' import getBBox from '~/components/RetroReflectPhase/getBBox' import {Breakpoint, ElementHeight, ElementWidth} from '~/types/constEnums' -import {GroupingKanbanColumn_reflectionGroups$data} from '~/__generated__/GroupingKanbanColumn_reflectionGroups.graphql' import useAtmosphere from './useAtmosphere' import useBreakpoint from './useBreakpoint' import useResizeObserver from './useResizeObserver' diff --git a/packages/client/modules/demo/ClientGraphQLServer.ts b/packages/client/modules/demo/ClientGraphQLServer.ts index 1053d69b2b3..e58c5f10f22 100644 --- a/packages/client/modules/demo/ClientGraphQLServer.ts +++ b/packages/client/modules/demo/ClientGraphQLServer.ts @@ -5,17 +5,17 @@ import ms from 'ms' import {Variables} from 'relay-runtime' import StrictEventEmitter from 'strict-event-emitter-types' import stringSimilarity from 'string-similarity' -import {PALETTE} from '~/styles/paletteV3' import {ReactableEnum} from '~/__generated__/AddReactjiToReactableMutation.graphql' import {DragReflectionDropTargetTypeEnum} from '~/__generated__/EndDraggingReflectionMutation.graphql' +import {PALETTE} from '~/styles/paletteV3' import DiscussPhase from '../../../server/database/types/DiscussPhase' import DiscussStage from '../../../server/database/types/DiscussStage' import NewMeetingPhase from '../../../server/database/types/GenericMeetingPhase' import NewMeetingStage from '../../../server/database/types/GenericMeetingStage' import GoogleAnalyzedEntity from '../../../server/database/types/GoogleAnalyzedEntity' +import ReflectPhase from '../../../server/database/types/ReflectPhase' import Reflection from '../../../server/database/types/Reflection' import ReflectionGroup from '../../../server/database/types/ReflectionGroup' -import ReflectPhase from '../../../server/database/types/ReflectPhase' import ITask from '../../../server/database/types/Task' import { ExternalLinks, @@ -36,6 +36,7 @@ import startStage_ from '../../utils/startStage_' import unlockAllStagesForPhase from '../../utils/unlockAllStagesForPhase' import unlockNextStages from '../../utils/unlockNextStages' import normalizeRawDraftJS from '../../validation/normalizeRawDraftJS' +import LocalAtmosphere from './LocalAtmosphere' import entityLookup from './entityLookup' import getDemoEntities from './getDemoEntities' import handleCompletedDemoStage from './handleCompletedDemoStage' @@ -43,13 +44,12 @@ import initBotScript from './initBotScript' import initDB, { DemoComment, DemoDiscussion, - demoTeamId, DemoThreadableEdge, - demoViewerId, JiraProjectKeyLookup, - RetroDemoDB + RetroDemoDB, + demoTeamId, + demoViewerId } from './initDB' -import LocalAtmosphere from './LocalAtmosphere' export type DemoReflection = Omit & { __typename: string diff --git a/packages/client/modules/demo/DemoGenericMeetingStage.ts b/packages/client/modules/demo/DemoGenericMeetingStage.ts index 6429428d7d4..6e386d14f2d 100644 --- a/packages/client/modules/demo/DemoGenericMeetingStage.ts +++ b/packages/client/modules/demo/DemoGenericMeetingStage.ts @@ -1,5 +1,5 @@ -import {RetroDemo} from '../../types/constEnums' import {NewMeetingPhaseTypeEnum} from '../../__generated__/MeetingControlBar_meeting.graphql' +import {RetroDemo} from '../../types/constEnums' export default class DemoGenericMeetingStage { __typename = 'GenericMeetingStage' diff --git a/packages/client/modules/demo/handleCompletedDemoStage.ts b/packages/client/modules/demo/handleCompletedDemoStage.ts index f7b48422363..7589b1fe285 100644 --- a/packages/client/modules/demo/handleCompletedDemoStage.ts +++ b/packages/client/modules/demo/handleCompletedDemoStage.ts @@ -3,8 +3,8 @@ import {ACTIVE, GROUP, REFLECT, VOTE} from '../../utils/constants' import extractTextFromDraftString from '../../utils/draftjs/extractTextFromDraftString' import mapGroupsToStages from '../../utils/makeGroupsToStages' import clientTempId from '../../utils/relay/clientTempId' -import commentLookup from './commentLookup' import DemoDiscussStage from './DemoDiscussStage' +import commentLookup from './commentLookup' import {RetroDemoDB} from './initDB' import reactjiLookup from './reactjiLookup' import taskLookup from './taskLookup' diff --git a/packages/client/modules/demo/initBotScript.ts b/packages/client/modules/demo/initBotScript.ts index 8dc9cdd840a..151cc3524a2 100644 --- a/packages/client/modules/demo/initBotScript.ts +++ b/packages/client/modules/demo/initBotScript.ts @@ -1,5 +1,5 @@ -import {RetroDemo} from '~/types/constEnums' import {DragReflectionDropTargetTypeEnum} from '~/__generated__/EndDraggingReflectionMutation.graphql' +import {RetroDemo} from '~/types/constEnums' import {demoTeamId} from './initDB' // 3 -> 1 diff --git a/packages/client/modules/demo/initDB.ts b/packages/client/modules/demo/initDB.ts index 7d1b673b94c..d452d9ee3af 100644 --- a/packages/client/modules/demo/initDB.ts +++ b/packages/client/modules/demo/initDB.ts @@ -1,5 +1,5 @@ -import {PALETTE} from '~/styles/paletteV3' import {SlackNotificationEventEnum} from '~/__generated__/SlackNotificationList_viewer.graphql' +import {PALETTE} from '~/styles/paletteV3' import RetrospectiveMeeting from '../../../server/database/types/MeetingRetrospective' import RetrospectiveMeetingSettings from '../../../server/database/types/MeetingSettingsRetrospective' import ITask from '../../../server/database/types/Task' diff --git a/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx b/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx index 4322938195c..2a842df7432 100644 --- a/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx +++ b/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx @@ -1,6 +1,6 @@ import graphql from 'babel-plugin-relay/macro' -import typedLookup from 'parabol-client/types/typedLookup' import {EmailNotificationPicker_notification$key} from 'parabol-client/__generated__/EmailNotificationPicker_notification.graphql' +import typedLookup from 'parabol-client/types/typedLookup' import React from 'react' import {useFragment} from 'react-relay' import EmailDiscussionMentioned from './EmailDiscussionMentioned' diff --git a/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx b/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx index 257992f5800..942f993fe21 100644 --- a/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx +++ b/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx @@ -1,6 +1,6 @@ import graphql from 'babel-plugin-relay/macro' -import {ASSIGNEE, MENTIONEE} from 'parabol-client/utils/constants' import {EmailTaskInvolves_notification$key} from 'parabol-client/__generated__/EmailTaskInvolves_notification.graphql' +import {ASSIGNEE, MENTIONEE} from 'parabol-client/utils/constants' import React from 'react' import {useFragment} from 'react-relay' import makeAppURL from '../../../../utils/makeAppURL' diff --git a/packages/client/modules/email/components/NotificationSummaryEmail.tsx b/packages/client/modules/email/components/NotificationSummaryEmail.tsx index a989e981d32..09584b916a3 100644 --- a/packages/client/modules/email/components/NotificationSummaryEmail.tsx +++ b/packages/client/modules/email/components/NotificationSummaryEmail.tsx @@ -1,6 +1,6 @@ +import {EmailNotificationPicker_notification$key} from 'parabol-client/__generated__/EmailNotificationPicker_notification.graphql' import {ContactInfo, ExternalLinks} from 'parabol-client/types/constEnums' import plural from 'parabol-client/utils/plural' -import {EmailNotificationPicker_notification$key} from 'parabol-client/__generated__/EmailNotificationPicker_notification.graphql' import React from 'react' import {EMAIL_CORS_OPTIONS} from '../../../types/cors' import makeAppURL from '../../../utils/makeAppURL' diff --git a/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx b/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx index 1d5446caefc..fc69ed57121 100644 --- a/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx +++ b/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import type {Parser as JSON2CSVParser} from 'json2csv' import Parser from 'json2csv/lib/JSON2CSVParser' // only grab the sync parser +import {ExportToCSVQuery} from 'parabol-client/__generated__/ExportToCSVQuery.graphql' import {PALETTE} from 'parabol-client/styles/paletteV3' import extractTextFromDraftString from 'parabol-client/utils/draftjs/extractTextFromDraftString' import withMutationProps, {WithMutationProps} from 'parabol-client/utils/relay/withMutationProps' -import {ExportToCSVQuery} from 'parabol-client/__generated__/ExportToCSVQuery.graphql' import React, {useEffect} from 'react' import useAtmosphere from '~/hooks/useAtmosphere' import {ExternalLinks, PokerCards} from '../../../../types/constEnums' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx index 7b91722c527..dfb3bd67f4c 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import {convertFromRaw, Editor, EditorState} from 'draft-js' +import {EmailReflectionCard_reflection$key} from 'parabol-client/__generated__/EmailReflectionCard_reflection.graphql' import editorDecorators from 'parabol-client/components/TaskEditor/decorators' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' -import {EmailReflectionCard_reflection$key} from 'parabol-client/__generated__/EmailReflectionCard_reflection.graphql' import React, {useMemo, useRef} from 'react' import {useFragment} from 'react-relay' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx index 4dea1f88ef4..bb8ae51275f 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx @@ -1,14 +1,14 @@ import graphql from 'babel-plugin-relay/macro' import {convertFromRaw, Editor, EditorState} from 'draft-js' +import {EmailTaskCard_task$key} from 'parabol-client/__generated__/EmailTaskCard_task.graphql' import editorDecorators from 'parabol-client/components/TaskEditor/decorators' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' import {taskStatusColors} from 'parabol-client/utils/taskStatus' -import {EmailTaskCard_task$key} from 'parabol-client/__generated__/EmailTaskCard_task.graphql' import React, {useMemo, useRef} from 'react' import {useFragment} from 'react-relay' -import convertToTaskContent from '../../../../../utils/draftjs/convertToTaskContent' import {TaskStatusEnum} from '../../../../../__generated__/EmailTaskCard_task.graphql' +import convertToTaskContent from '../../../../../utils/draftjs/convertToTaskContent' interface Props { task: EmailTaskCard_task$key | null diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx index 1d83a71cd71..65ed83c6d83 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx @@ -1,24 +1,24 @@ +import {Loop} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' +import clsx from 'clsx' import React, {useState} from 'react' -import {Loop} from '@mui/icons-material' -import {MenuPosition} from '../../../../../hooks/useCoords' -import useMenu from '../../../../../hooks/useMenu' -import useMutationProps, {getOnCompletedError} from '../../../../../hooks/useMutationProps' -import lazyPreload from '../../../../../utils/lazyPreload' import {useFragment} from 'react-relay' import { ExportAllTasks_meeting$key, TaskServiceEnum } from '../../../../../__generated__/ExportAllTasks_meeting.graphql' -import CreateTaskIntegrationMutation from '../../../../../mutations/CreateTaskIntegrationMutation' -import useAtmosphere from '../../../../../hooks/useAtmosphere' -import {integrationSvgLookup} from '../../../../../components/TaskIntegrationMenuItem' -import {Providers} from '../../../../../types/constEnums' import GitHubSVG from '../../../../../components/GitHubSVG' -import JiraSVG from '../../../../../components/JiraSVG' import GitLabSVG from '../../../../../components/GitLabSVG' -import clsx from 'clsx' +import JiraSVG from '../../../../../components/JiraSVG' +import {integrationSvgLookup} from '../../../../../components/TaskIntegrationMenuItem' +import useAtmosphere from '../../../../../hooks/useAtmosphere' +import {MenuPosition} from '../../../../../hooks/useCoords' +import useMenu from '../../../../../hooks/useMenu' +import useMutationProps, {getOnCompletedError} from '../../../../../hooks/useMutationProps' +import CreateTaskIntegrationMutation from '../../../../../mutations/CreateTaskIntegrationMutation' +import {Providers} from '../../../../../types/constEnums' import SendClientSideEvent from '../../../../../utils/SendClientSideEvent' +import lazyPreload from '../../../../../utils/lazyPreload' const ExportAllTasksMenuRoot = lazyPreload( () => import(/* webpackChunkName: 'ExportAllTasksMenuRoot' */ './ExportAllTasksMenuRoot') diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx index 7ada66e8765..d96f590c3cb 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx @@ -1,14 +1,14 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay' -import {MenuProps} from '../../../../../hooks/useMenu' -import {MenuMutationProps} from '../../../../../hooks/useMutationProps' +import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql' import {ExportAllTasksMenuQuery} from '../../../../../__generated__/ExportAllTasksMenuQuery.graphql' import {ExportAllTasksMenu_meeting$key} from '../../../../../__generated__/ExportAllTasksMenu_meeting.graphql' import TaskFooterIntegrateMenuList from '../../../../../components/TaskFooterIntegrateMenuList' import TaskFooterIntegrateMenuSignup from '../../../../../components/TaskFooterIntegrateMenuSignup' -import {useIsIntegrated, makePlaceholder} from '../../../../../hooks/useIsIntegrated' -import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql' +import {makePlaceholder, useIsIntegrated} from '../../../../../hooks/useIsIntegrated' +import {MenuProps} from '../../../../../hooks/useMenu' +import {MenuMutationProps} from '../../../../../hooks/useMutationProps' interface Props { menuProps: MenuProps diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx index c0a5c4cc4be..df7a84f8220 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx @@ -1,17 +1,17 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' -import useQueryLoaderNow from '../../../../../hooks/useQueryLoaderNow' -import {LoaderSize} from '../../../../../types/constEnums' +import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql' import exportAllTasksMenuQuery, { ExportAllTasksMenuQuery } from '../../../../../__generated__/ExportAllTasksMenuQuery.graphql' import {ExportAllTasksMenuRoot_meeting$key} from '../../../../../__generated__/ExportAllTasksMenuRoot_meeting.graphql' import LoadingComponent from '../../../../../components/LoadingComponent/LoadingComponent' -import ExportAllTasksMenu from './ExportAllTasksMenu' import {MenuProps} from '../../../../../hooks/useMenu' import {MenuMutationProps} from '../../../../../hooks/useMutationProps' -import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql' +import useQueryLoaderNow from '../../../../../hooks/useQueryLoaderNow' +import {LoaderSize} from '../../../../../types/constEnums' +import ExportAllTasksMenu from './ExportAllTasksMenu' interface Props { menuProps: MenuProps diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx index 534279c9b9b..aeca571181d 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx @@ -1,6 +1,6 @@ import graphql from 'babel-plugin-relay/macro' -import plural from 'parabol-client/utils/plural' import {MeetingMemberTaskSummaryList_meetingMember$key} from 'parabol-client/__generated__/MeetingMemberTaskSummaryList_meetingMember.graphql' +import plural from 'parabol-client/utils/plural' import React from 'react' import {useFragment} from 'react-relay' import SummaryAvatarHeader from './SummaryAvatarHeader' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx index ee62beef884..5498b2565ab 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' -import useEmailItemGrid from 'parabol-client/hooks/useEmailItemGrid' -import {PALETTE} from 'parabol-client/styles/paletteV3' -import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' import { MeetingMembersWithoutTasks_meeting$key, MeetingTypeEnum } from 'parabol-client/__generated__/MeetingMembersWithoutTasks_meeting.graphql' +import useEmailItemGrid from 'parabol-client/hooks/useEmailItemGrid' +import {PALETTE} from 'parabol-client/styles/paletteV3' +import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' import React from 'react' import {useFragment} from 'react-relay' import EmailBorderBottom from './EmailBorderBottom' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx index 67b3e25f034..e3fb8fafd21 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' +import {QuickStats_meeting$key} from 'parabol-client/__generated__/QuickStats_meeting.graphql' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' import {ACTION, RETROSPECTIVE} from 'parabol-client/utils/constants' -import {QuickStats_meeting$key} from 'parabol-client/__generated__/QuickStats_meeting.graphql' import React from 'react' import {useFragment} from 'react-relay' import makeActionStats from './makeActionStats' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx index 15eb9aeb052..d89d5c32738 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx @@ -5,10 +5,10 @@ import {FONT_FAMILY, ICON_SIZE} from 'parabol-client/styles/typographyV2' import plural from 'parabol-client/utils/plural' import React from 'react' import {useFragment} from 'react-relay' +import {RetroTopic_meeting$key} from '../../../../../__generated__/RetroTopic_meeting.graphql' +import {RetroTopic_stage$key} from '../../../../../__generated__/RetroTopic_stage.graphql' import {ExternalLinks} from '../../../../../types/constEnums' import {APP_CORS_OPTIONS, EMAIL_CORS_OPTIONS} from '../../../../../types/cors' -import {RetroTopic_stage$key} from '../../../../../__generated__/RetroTopic_stage.graphql' -import {RetroTopic_meeting$key} from '../../../../../__generated__/RetroTopic_meeting.graphql' import AnchorIfEmail from './AnchorIfEmail' import EmailReflectionCard from './EmailReflectionCard' import ShareTopic from './ShareTopic' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx index 0c2b2805db9..123d02e2897 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' +import {RetroTopics_meeting$key} from 'parabol-client/__generated__/RetroTopics_meeting.graphql' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' import {RETRO_TOPIC_LABEL} from 'parabol-client/utils/constants' import plural from 'parabol-client/utils/plural' -import {RetroTopics_meeting$key} from 'parabol-client/__generated__/RetroTopics_meeting.graphql' import React from 'react' import {useFragment} from 'react-relay' import useEmailItemGrid from '../../../../../hooks/useEmailItemGrid' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx index 083e2a3f29c..2f72c71d09c 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx @@ -1,10 +1,10 @@ import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' import React from 'react' -import AnchorIfEmail from './AnchorIfEmail' -import makeAppURL from '../../../../../utils/makeAppURL' -import {useDialogState} from '../../../../../ui/Dialog/useDialogState' import ShareTopicRoot from '../../../../../components/ShareTopicRoot' +import {useDialogState} from '../../../../../ui/Dialog/useDialogState' +import makeAppURL from '../../../../../utils/makeAppURL' +import AnchorIfEmail from './AnchorIfEmail' interface Props { isEmail: boolean diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx index 287a18df668..2dffc5f88de 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' +import {SummaryAvatarHeader_meetingMember$key} from 'parabol-client/__generated__/SummaryAvatarHeader_meetingMember.graphql' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' -import {SummaryAvatarHeader_meetingMember$key} from 'parabol-client/__generated__/SummaryAvatarHeader_meetingMember.graphql' import React from 'react' import {useFragment} from 'react-relay' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx index 0f4a11b3147..3e5699f9460 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' +import {SummaryHeader_meeting$key} from 'parabol-client/__generated__/SummaryHeader_meeting.graphql' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' import makeDateString from 'parabol-client/utils/makeDateString' -import {SummaryHeader_meeting$key} from 'parabol-client/__generated__/SummaryHeader_meeting.graphql' import React from 'react' import {useFragment} from 'react-relay' import {ExternalLinks} from '../../../../../types/constEnums' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx index 3e386b23117..5df09279819 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' +import {SummaryPokerStories_meeting$key} from 'parabol-client/__generated__/SummaryPokerStories_meeting.graphql' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' -import {SummaryPokerStories_meeting$key} from 'parabol-client/__generated__/SummaryPokerStories_meeting.graphql' import React from 'react' import {useFragment} from 'react-relay' import makeAppURL from '../../../../../utils/makeAppURL' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx index 93d37ee81f7..138200b6327 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx @@ -1,33 +1,33 @@ -import graphql from 'babel-plugin-relay/macro' +import {TableChart} from '@mui/icons-material' import PictureAsPdf from '@mui/icons-material/PictureAsPdf' +import graphql from 'babel-plugin-relay/macro' +import {SummarySheet_meeting$key} from 'parabol-client/__generated__/SummarySheet_meeting.graphql' import CreateAccountSection from 'parabol-client/modules/demo/components/CreateAccountSection' import {sheetShadow} from 'parabol-client/styles/elevation' import {ACTION} from 'parabol-client/utils/constants' -import {SummarySheet_meeting$key} from 'parabol-client/__generated__/SummarySheet_meeting.graphql' import React from 'react' import {useFragment} from 'react-relay' +import {Link} from 'react-router-dom' +import useAtmosphere from '../../../../../hooks/useAtmosphere' +import {PALETTE} from '../../../../../styles/paletteV3' import {CorsOptions} from '../../../../../types/cors' +import SendClientSideEvent from '../../../../../utils/SendClientSideEvent' +import lazyPreload from '../../../../../utils/lazyPreload' import ExportToCSV from '../ExportToCSV' +import EmailBorderBottom from '../MeetingSummaryEmail/EmailBorderBottom' import ContactUsFooter from './ContactUsFooter' import LogoFooter from './LogoFooter' -import MeetingMembersWithoutTasks from './MeetingMembersWithoutTasks' import MeetingMembersWithTasks from './MeetingMembersWithTasks' +import MeetingMembersWithoutTasks from './MeetingMembersWithoutTasks' import {MeetingSummaryReferrer} from './MeetingSummaryEmail' import QuickStats from './QuickStats' -import TeamHealthSummary from './TeamHealthSummary' import RetroTopics from './RetroTopics' import SummaryHeader from './SummaryHeader' import SummaryPokerStories from './SummaryPokerStories' import SummarySheetCTA from './SummarySheetCTA' +import TeamHealthSummary from './TeamHealthSummary' import TeamPromptResponseSummary from './TeamPromptResponseSummary' import WholeMeetingSummary from './WholeMeetingSummary' -import lazyPreload from '../../../../../utils/lazyPreload' -import EmailBorderBottom from '../MeetingSummaryEmail/EmailBorderBottom' -import {PALETTE} from '../../../../../styles/paletteV3' -import {TableChart} from '@mui/icons-material' -import {Link} from 'react-router-dom' -import SendClientSideEvent from '../../../../../utils/SendClientSideEvent' -import useAtmosphere from '../../../../../hooks/useAtmosphere' const ExportAllTasks = lazyPreload(() => import('./ExportAllTasks')) diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx index 5a9906bfedd..05c56291daa 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' +import {TaskSummarySection_tasks$key} from 'parabol-client/__generated__/TaskSummarySection_tasks.graphql' import useEmailItemGrid from 'parabol-client/hooks/useEmailItemGrid' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' -import {TaskSummarySection_tasks$key} from 'parabol-client/__generated__/TaskSummarySection_tasks.graphql' import React from 'react' import {useFragment} from 'react-relay' import EmailTaskCard from './EmailTaskCard' diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx index ccbd216e355..ab8b8ae8e65 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' +import {TeamHealthSummary_meeting$key} from 'parabol-client/__generated__/TeamHealthSummary_meeting.graphql' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' -import {TeamHealthSummary_meeting$key} from 'parabol-client/__generated__/TeamHealthSummary_meeting.graphql' +import getTeamHealthVoteColor from 'parabol-client/utils/getTeamHealthVoteColor' import React from 'react' import {useFragment} from 'react-relay' -import getTeamHealthVoteColor from 'parabol-client/utils/getTeamHealthVoteColor' interface Props { meeting: TeamHealthSummary_meeting$key diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx index 76aba9a8828..56e30fea03b 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' +import {WholeMeetingSummaryResult_meeting$key} from 'parabol-client/__generated__/WholeMeetingSummaryResult_meeting.graphql' import {PALETTE} from 'parabol-client/styles/paletteV3' import {FONT_FAMILY} from 'parabol-client/styles/typographyV2' -import {WholeMeetingSummaryResult_meeting$key} from 'parabol-client/__generated__/WholeMeetingSummaryResult_meeting.graphql' import React, {useEffect} from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '../../../../../hooks/useAtmosphere' -import SendClientSideEvent from '../../../../../utils/SendClientSideEvent' import {AIExplainer} from '../../../../../types/constEnums' +import SendClientSideEvent from '../../../../../utils/SendClientSideEvent' import EmailBorderBottom from './EmailBorderBottom' const topicTitleStyle = { diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makePokerStats.ts b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makePokerStats.ts index 1c37f760f88..55957107842 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makePokerStats.ts +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makePokerStats.ts @@ -1,6 +1,6 @@ import graphql from 'babel-plugin-relay/macro' -import plural from 'parabol-client/utils/plural' import {makePokerStats_meeting$key} from 'parabol-client/__generated__/makePokerStats_meeting.graphql' +import plural from 'parabol-client/utils/plural' import {readInlineData} from 'react-relay' const makePokerStats = (meetingRef: makePokerStats_meeting$key) => { diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makeTeamPromptStats.ts b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makeTeamPromptStats.ts index cf1ac967e70..32606d8fdb8 100644 --- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makeTeamPromptStats.ts +++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makeTeamPromptStats.ts @@ -1,6 +1,6 @@ import graphql from 'babel-plugin-relay/macro' -import plural from 'parabol-client/utils/plural' import {makeTeamPromptStats_meeting$key} from 'parabol-client/__generated__/makeTeamPromptStats_meeting.graphql' +import plural from 'parabol-client/utils/plural' import {readInlineData} from 'react-relay' const makeTeamPromptStats = (meetingRef: makeTeamPromptStats_meeting$key) => { diff --git a/packages/client/modules/invoice/components/Invoice/Invoice.tsx b/packages/client/modules/invoice/components/Invoice/Invoice.tsx index 5fc39073e19..a50d9543b35 100644 --- a/packages/client/modules/invoice/components/Invoice/Invoice.tsx +++ b/packages/client/modules/invoice/components/Invoice/Invoice.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {InvoiceQuery, InvoiceStatusEnum} from '../../../../__generated__/InvoiceQuery.graphql' import EmphasisTag from '../../../../components/Tag/EmphasisTag' import useDocumentTitle from '../../../../hooks/useDocumentTitle' import {Elevation} from '../../../../styles/elevation' @@ -9,7 +10,6 @@ import {PALETTE} from '../../../../styles/paletteV3' import {Breakpoint} from '../../../../types/constEnums' import makeDateString from '../../../../utils/makeDateString' import makeMonthString from '../../../../utils/makeMonthString' -import {InvoiceQuery, InvoiceStatusEnum} from '../../../../__generated__/InvoiceQuery.graphql' import invoiceLineFormat from '../../helpers/invoiceLineFormat' import InvoiceFooter from '../InvoiceFooter/InvoiceFooter' import InvoiceHeader from '../InvoiceHeader/InvoiceHeader' diff --git a/packages/client/modules/invoice/components/InvoiceLineItem/InvoiceLineItemDetails.tsx b/packages/client/modules/invoice/components/InvoiceLineItem/InvoiceLineItemDetails.tsx index 54613866c6b..e92025814e1 100644 --- a/packages/client/modules/invoice/components/InvoiceLineItem/InvoiceLineItemDetails.tsx +++ b/packages/client/modules/invoice/components/InvoiceLineItem/InvoiceLineItemDetails.tsx @@ -3,8 +3,8 @@ import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {useFragment} from 'react-relay' import { - InvoiceLineItemDetails_details$key, - InvoiceLineItemDetails_details$data + InvoiceLineItemDetails_details$data, + InvoiceLineItemDetails_details$key } from '~/__generated__/InvoiceLineItemDetails_details.graphql' import {InvoiceLineItemEnum} from '~/__generated__/InvoiceLineItem_item.graphql' import {PALETTE} from '../../../../styles/paletteV3' diff --git a/packages/client/modules/invoice/containers/InvoiceRoot.tsx b/packages/client/modules/invoice/containers/InvoiceRoot.tsx index ae07a433979..b0db1125ae9 100644 --- a/packages/client/modules/invoice/containers/InvoiceRoot.tsx +++ b/packages/client/modules/invoice/containers/InvoiceRoot.tsx @@ -1,7 +1,7 @@ import React, {Suspense} from 'react' import {RouteComponentProps} from 'react-router' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' import invoiceQuery, {InvoiceQuery} from '../../../__generated__/InvoiceQuery.graphql' +import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' import Invoice from '../components/Invoice/Invoice' interface Props extends RouteComponentProps<{invoiceId: string}> {} diff --git a/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx b/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx index 23bbe6a7bf5..efb77f608d4 100644 --- a/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx +++ b/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember$key} from '../../../__generated__/ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember.graphql' import useAtmosphere from '../../../hooks/useAtmosphere' import {PALETTE} from '../../../styles/paletteV3' -import {ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember$key} from '../../../__generated__/ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember.graphql' const AgendaControl = styled('span')({ color: PALETTE.SKY_500, diff --git a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx b/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx deleted file mode 100644 index b1e4c9e5206..00000000000 --- a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx +++ /dev/null @@ -1,110 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React, {useEffect, useRef} from 'react' -import {useFragment} from 'react-relay' -import LinkButton from '../../../components/LinkButton' -import TooltipStyled from '../../../components/TooltipStyled' -import useAtmosphere from '../../../hooks/useAtmosphere' -import useMutationProps from '../../../hooks/useMutationProps' -import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation' -import {AddNewPokerTemplate_pokerTemplates$key} from '../../../__generated__/AddNewPokerTemplate_pokerTemplates.graphql' -import {AddNewPokerTemplate_team$key} from '../../../__generated__/AddNewPokerTemplate_team.graphql' - -const ErrorLine = styled(TooltipStyled)({ - margin: '0 0 8px' -}) - -const AddPokerTemplateLink = styled(LinkButton)({ - alignItems: 'center', - display: 'flex', - justifyContent: 'flex-start', - fontSize: 16, - fontWeight: 600, - lineHeight: '24px', - outline: 'none', - padding: '20px 16px', - width: '100%' -}) - -interface Props { - gotoTeamTemplates: () => void - pokerTemplatesRef: AddNewPokerTemplate_pokerTemplates$key - teamRef: AddNewPokerTemplate_team$key - displayUpgradeDetails: () => void -} - -const AddNewPokerTemplate = (props: Props) => { - const {gotoTeamTemplates, teamRef, pokerTemplatesRef, displayUpgradeDetails} = props - const atmosphere = useAtmosphere() - const pokerTemplates = useFragment( - graphql` - fragment AddNewPokerTemplate_pokerTemplates on PokerTemplate @relay(plural: true) { - name - } - `, - pokerTemplatesRef - ) - const team = useFragment( - graphql` - fragment AddNewPokerTemplate_team on Team { - id - tier - viewerTeamMember { - id - user { - id - freeCustomPokerTemplatesRemaining - } - } - } - `, - teamRef - ) - const {id: teamId, tier, viewerTeamMember} = team - const {user} = viewerTeamMember || {} - const {freeCustomPokerTemplatesRemaining} = user || {} - - const {onError, onCompleted, submitMutation, submitting, error} = useMutationProps() - const errorTimerId = useRef() - useEffect(() => { - return () => { - window.clearTimeout(errorTimerId.current) - } - }, []) - const canEditTemplates = - tier !== 'starter' || - (freeCustomPokerTemplatesRemaining && freeCustomPokerTemplatesRemaining > 0) - const addNewTemplate = () => { - if (submitting) return - if (!canEditTemplates) { - displayUpgradeDetails() - return - } - if (pokerTemplates.find((template) => template.name.startsWith('*New Template'))) { - onError(new Error('You already have a new template. Try renaming that one first.')) - errorTimerId.current = window.setTimeout(() => { - onCompleted() - }, 8000) - return - } - submitMutation() - AddPokerTemplateMutation(atmosphere, {teamId}, {onError, onCompleted}) - gotoTeamTemplates() - } - - const containsNewTemplate = pokerTemplates.find((template) => - template.name.startsWith('*New Template') - ) - - if (containsNewTemplate) return null - return ( -
- {error && {error.message}} - - Create New Template {!canEditTemplates && '🔒'} - -
- ) -} - -export default AddNewPokerTemplate diff --git a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx b/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx deleted file mode 100644 index 4e1bff87056..00000000000 --- a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx +++ /dev/null @@ -1,109 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React, {useEffect, useRef} from 'react' -import {useFragment} from 'react-relay' -import LinkButton from '../../../components/LinkButton' -import TooltipStyled from '../../../components/TooltipStyled' -import useAtmosphere from '../../../hooks/useAtmosphere' -import useMutationProps from '../../../hooks/useMutationProps' -import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation' -import {AddNewReflectTemplate_reflectTemplates$key} from '../../../__generated__/AddNewReflectTemplate_reflectTemplates.graphql' -import {AddNewReflectTemplate_team$key} from '../../../__generated__/AddNewReflectTemplate_team.graphql' - -const ErrorLine = styled(TooltipStyled)({ - margin: '0 0 8px' -}) - -const AddRetroTemplateLink = styled(LinkButton)({ - alignItems: 'center', - display: 'flex', - justifyContent: 'flex-start', - fontSize: 16, - fontWeight: 600, - lineHeight: '24px', - outline: 'none', - padding: '20px 16px', - width: '100%' -}) - -interface Props { - gotoTeamTemplates: () => void - reflectTemplatesRef: AddNewReflectTemplate_reflectTemplates$key - displayUpgradeDetails: () => void - teamRef: AddNewReflectTemplate_team$key -} - -const AddNewReflectTemplate = (props: Props) => { - const {gotoTeamTemplates, reflectTemplatesRef, teamRef, displayUpgradeDetails} = props - const atmosphere = useAtmosphere() - const reflectTemplates = useFragment( - graphql` - fragment AddNewReflectTemplate_reflectTemplates on ReflectTemplate @relay(plural: true) { - name - } - `, - reflectTemplatesRef - ) - const team = useFragment( - graphql` - fragment AddNewReflectTemplate_team on Team { - id - tier - viewerTeamMember { - id - user { - id - freeCustomRetroTemplatesRemaining - } - } - } - `, - teamRef - ) - const {id: teamId, tier, viewerTeamMember} = team - const {user} = viewerTeamMember || {} - const {freeCustomRetroTemplatesRemaining} = user || {} - const {onError, onCompleted, submitMutation, submitting, error} = useMutationProps() - const errorTimerId = useRef() - useEffect(() => { - return () => { - window.clearTimeout(errorTimerId.current) - } - }, []) - const canEditTemplates = - tier !== 'starter' || - (freeCustomRetroTemplatesRemaining && freeCustomRetroTemplatesRemaining > 0) - const addNewTemplate = () => { - if (submitting) return - if (!canEditTemplates) { - displayUpgradeDetails() - return - } - if (reflectTemplates.find((template) => template.name.startsWith('*New Template'))) { - onError(new Error('You already have a new template. Try renaming that one first.')) - errorTimerId.current = window.setTimeout(() => { - onCompleted() - }, 8000) - return - } - submitMutation() - AddReflectTemplateMutation(atmosphere, {teamId}, {onError, onCompleted}) - gotoTeamTemplates() - } - - const containsNewTemplate = reflectTemplates.find((template) => - template.name.startsWith('*New Template') - ) - - if (containsNewTemplate) return null - return ( -
- {error && {error.message}} - - Create New Template {!canEditTemplates && '🔒'} - -
- ) -} - -export default AddNewReflectTemplate diff --git a/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx b/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx index 454d555cdf4..d9fb3314fea 100644 --- a/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx +++ b/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx @@ -4,12 +4,12 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {Threshold} from '~/types/constEnums' +import {AddPokerTemplateDimension_dimensions$key} from '../../../__generated__/AddPokerTemplateDimension_dimensions.graphql' import LinkButton from '../../../components/LinkButton' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' import AddPokerTemplateDimensionMutation from '../../../mutations/AddPokerTemplateDimensionMutation' import dndNoise from '../../../utils/dndNoise' -import {AddPokerTemplateDimension_dimensions$key} from '../../../__generated__/AddPokerTemplateDimension_dimensions.graphql' const AddDimensionLink = styled(LinkButton)({ alignItems: 'center', diff --git a/packages/client/modules/meeting/components/AddTemplatePrompt.tsx b/packages/client/modules/meeting/components/AddTemplatePrompt.tsx index 18db3452b4a..1e97063dbe1 100644 --- a/packages/client/modules/meeting/components/AddTemplatePrompt.tsx +++ b/packages/client/modules/meeting/components/AddTemplatePrompt.tsx @@ -5,11 +5,11 @@ import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' import {Threshold} from '~/types/constEnums' +import {AddTemplatePrompt_prompts$key} from '../../../__generated__/AddTemplatePrompt_prompts.graphql' import LinkButton from '../../../components/LinkButton' import AddReflectTemplatePromptMutation from '../../../mutations/AddReflectTemplatePromptMutation' import dndNoise from '../../../utils/dndNoise' import withMutationProps, {WithMutationProps} from '../../../utils/relay/withMutationProps' -import {AddTemplatePrompt_prompts$key} from '../../../__generated__/AddTemplatePrompt_prompts.graphql' const AddPromptLink = styled(LinkButton)({ alignItems: 'center', diff --git a/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx b/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx index 626a61e6c79..68a5ffb0073 100644 --- a/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx +++ b/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx @@ -3,11 +3,11 @@ import styled from '@emotion/styled' import React from 'react' import {useHistory} from 'react-router' import customTemplate from '../../../../../static/images/illustrations/customTemplate.png' +import {MeetingTypeEnum} from '../../../__generated__/TeamInvitationQuery.graphql' import FloatingActionButton from '../../../components/FloatingActionButton' import useAtmosphere from '../../../hooks/useAtmosphere' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' import {BezierCurve} from '../../../types/constEnums' -import {MeetingTypeEnum} from '../../../__generated__/TeamInvitationQuery.graphql' +import SendClientSideEvent from '../../../utils/SendClientSideEvent' const fadein = keyframes` 0% { opacity: 0; } diff --git a/packages/client/modules/meeting/components/EditableTemplateDimension.tsx b/packages/client/modules/meeting/components/EditableTemplateDimension.tsx index f6e424768ca..9eedc7f8ddf 100644 --- a/packages/client/modules/meeting/components/EditableTemplateDimension.tsx +++ b/packages/client/modules/meeting/components/EditableTemplateDimension.tsx @@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro' import React, {useRef} from 'react' import {useFragment} from 'react-relay' import {PALETTE} from '~/styles/paletteV3' +import {EditableTemplateDimension_dimensions$key} from '../../../__generated__/EditableTemplateDimension_dimensions.graphql' import EditableText from '../../../components/EditableText' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' import useScrollIntoView from '../../../hooks/useScrollIntoVIew' import RenamePokerTemplateDimensionMutation from '../../../mutations/RenamePokerTemplateDimensionMutation' import Legitity from '../../../validation/Legitity' -import {EditableTemplateDimension_dimensions$key} from '../../../__generated__/EditableTemplateDimension_dimensions.graphql' const StyledEditableText = styled(EditableText)({ fontFamily: PALETTE.SLATE_700, diff --git a/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx b/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx index c7214e51e69..54b9af04bcc 100644 --- a/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx +++ b/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx @@ -2,12 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {EditableTemplatePrompt_prompts$key} from '../../../__generated__/EditableTemplatePrompt_prompts.graphql' import EditableText from '../../../components/EditableText' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' import RenameReflectTemplatePromptMutation from '../../../mutations/RenameReflectTemplatePromptMutation' import Legitity from '../../../validation/Legitity' -import {EditableTemplatePrompt_prompts$key} from '../../../__generated__/EditableTemplatePrompt_prompts.graphql' const StyledEditableText = styled(EditableText)({ fontSize: 16, diff --git a/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx b/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx index 3360f57a707..3220269c6f2 100644 --- a/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx +++ b/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx @@ -3,10 +3,10 @@ import {ArrowDropDown as ArrowDropDownIcon} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import PlainButton from '~/components/PlainButton/PlainButton' -import {BezierCurve} from '~/types/constEnums' import {EditableTemplatePromptColor_prompt$key} from '~/__generated__/EditableTemplatePromptColor_prompt.graphql' import {EditableTemplatePromptColor_prompts$key} from '~/__generated__/EditableTemplatePromptColor_prompts.graphql' +import PlainButton from '~/components/PlainButton/PlainButton' +import {BezierCurve} from '~/types/constEnums' import PalettePicker from '../../../components/PalettePicker/PalettePicker' import {MenuPosition} from '../../../hooks/useCoords' import useMenu from '../../../hooks/useMenu' diff --git a/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx b/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx index 3da7b1b6214..a4bd3f7e4f2 100644 --- a/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx +++ b/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx @@ -2,12 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {EditableTemplateScaleName_scales$key} from '../../../__generated__/EditableTemplateScaleName_scales.graphql' import EditableText from '../../../components/EditableText' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' import RenamePokerTemplateScaleMutation from '../../../mutations/RenamePokerTemplateScaleMutation' import Legitity from '../../../validation/Legitity' -import {EditableTemplateScaleName_scales$key} from '../../../__generated__/EditableTemplateScaleName_scales.graphql' interface Props { name: string diff --git a/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx b/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx index c5d82a4481b..18f7332b77a 100644 --- a/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx +++ b/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx @@ -3,9 +3,9 @@ import {ArrowDropDown as ArrowDropDownIcon} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {EditableTemplateScaleValueColor_scale$key} from '~/__generated__/EditableTemplateScaleValueColor_scale.graphql' import PlainButton from '~/components/PlainButton/PlainButton' import {BezierCurve} from '~/types/constEnums' -import {EditableTemplateScaleValueColor_scale$key} from '~/__generated__/EditableTemplateScaleValueColor_scale.graphql' import {MenuPosition} from '../../../hooks/useCoords' import useMenu from '../../../hooks/useMenu' import {PALETTE} from '../../../styles/paletteV3' diff --git a/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx b/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx index b2ddba3c5d9..dc8bec0242d 100644 --- a/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx +++ b/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx @@ -2,16 +2,16 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import UpdatePokerTemplateScaleValueMutation from '~/mutations/UpdatePokerTemplateScaleValueMutation' -import {PALETTE} from '~/styles/paletteV3' import {EditableTemplateScaleValueLabel_scale$key} from '~/__generated__/EditableTemplateScaleValueLabel_scale.graphql' import {EditableTemplateScaleValueLabel_scaleValue$key} from '~/__generated__/EditableTemplateScaleValueLabel_scaleValue.graphql' +import UpdatePokerTemplateScaleValueMutation from '~/mutations/UpdatePokerTemplateScaleValueMutation' +import {PALETTE} from '~/styles/paletteV3' import EditableText from '../../../components/EditableText' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' +import {Threshold} from '../../../types/constEnums' import isSpecialPokerLabel from '../../../utils/isSpecialPokerLabel' import Legitity from '../../../validation/Legitity' -import {Threshold} from '../../../types/constEnums' const StyledEditableText = styled(EditableText)<{disabled: boolean | undefined}>(({disabled}) => ({ fontFamily: PALETTE.SLATE_700, diff --git a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx index 97c0445acab..97b8f3af468 100644 --- a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx +++ b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx @@ -2,13 +2,13 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {NewMeetingAvatar_teamMember$key} from '../../../../__generated__/NewMeetingAvatar_teamMember.graphql' import ErrorBoundary from '../../../../components/ErrorBoundary' import {MenuPosition} from '../../../../hooks/useCoords' import useTooltip from '../../../../hooks/useTooltip' import {TransitionStatus} from '../../../../hooks/useTransition' import {DECELERATE} from '../../../../styles/animation' import {meetingAvatarMediaQueries} from '../../../../styles/meeting' -import {NewMeetingAvatar_teamMember$key} from '../../../../__generated__/NewMeetingAvatar_teamMember.graphql' const Item = styled('div')({ position: 'relative' diff --git a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx index 6faa1d0f419..675a34dcd79 100644 --- a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx +++ b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {useFragment} from 'react-relay' +import {NewMeetingAvatarGroup_meeting$key} from '../../../../__generated__/NewMeetingAvatarGroup_meeting.graphql' import AddTeamMemberAvatarButton from '../../../../components/AddTeamMemberAvatarButton' import useAtmosphere from '../../../../hooks/useAtmosphere' import useBreakpoint from '../../../../hooks/useBreakpoint' @@ -11,7 +12,6 @@ import {DECELERATE} from '../../../../styles/animation' import {meetingAvatarMediaQueries} from '../../../../styles/meeting' import {PALETTE} from '../../../../styles/paletteV3' import {Breakpoint} from '../../../../types/constEnums' -import {NewMeetingAvatarGroup_meeting$key} from '../../../../__generated__/NewMeetingAvatarGroup_meeting.graphql' import NewMeetingAvatar from './NewMeetingAvatar' const MeetingAvatarGroupRoot = styled('div')({ diff --git a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx index dac4215e2e2..7a4779194b8 100644 --- a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx +++ b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx @@ -1,27 +1,27 @@ import styled from '@emotion/styled' import {Create as CreateIcon, Refresh as RefreshIcon} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' -import {ContentState, convertToRaw, EditorState, SelectionState} from 'draft-js' +import {ContentState, EditorState, SelectionState, convertToRaw} from 'draft-js' import React, {useRef, useState} from 'react' import {useFragment} from 'react-relay' import {NewCheckInQuestion_meeting$key} from '~/__generated__/NewCheckInQuestion_meeting.graphql' +import { + ModifyType, + useModifyCheckInQuestionMutation$data as TModifyCheckInQuestion$data +} from '../../../../__generated__/useModifyCheckInQuestionMutation.graphql' import EditorInputWrapper from '../../../../components/EditorInputWrapper' import PlainButton from '../../../../components/PlainButton/PlainButton' import '../../../../components/TaskEditor/Draft.css' import useAtmosphere from '../../../../hooks/useAtmosphere' import {MenuPosition} from '../../../../hooks/useCoords' import useEditorState from '../../../../hooks/useEditorState' +import useMutationProps from '../../../../hooks/useMutationProps' import useTooltip from '../../../../hooks/useTooltip' import UpdateNewCheckInQuestionMutation from '../../../../mutations/UpdateNewCheckInQuestionMutation' +import {useModifyCheckInQuestionMutation} from '../../../../mutations/useModifyCheckInQuestionMutation' import {PALETTE} from '../../../../styles/paletteV3' -import convertToTaskContent from '../../../../utils/draftjs/convertToTaskContent' -import useMutationProps from '../../../../hooks/useMutationProps' -import { - useModifyCheckInQuestionMutation$data as TModifyCheckInQuestion$data, - ModifyType -} from '../../../../__generated__/useModifyCheckInQuestionMutation.graphql' import {Button} from '../../../../ui/Button/Button' -import {useModifyCheckInQuestionMutation} from '../../../../mutations/useModifyCheckInQuestionMutation' +import convertToTaskContent from '../../../../utils/draftjs/convertToTaskContent' const CogIcon = styled('div')({ color: PALETTE.SLATE_700, diff --git a/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx b/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx index faaee3dabfa..bf7d6eb5c92 100644 --- a/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx +++ b/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import {MenuPosition} from '../../../hooks/useCoords' -import useTooltip from '../../../hooks/useTooltip' import {NewMeetingCheckInGreeting_checkInGreeting$key} from '../../../__generated__/NewMeetingCheckInGreeting_checkInGreeting.graphql' import {NewMeetingCheckInGreeting_teamMember$key} from '../../../__generated__/NewMeetingCheckInGreeting_teamMember.graphql' +import {MenuPosition} from '../../../hooks/useCoords' +import useTooltip from '../../../hooks/useTooltip' const GreetingBlock = styled('div')({ fontSize: '1.5rem', diff --git a/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx b/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx index cdb75badb24..2f7fce4b9fd 100644 --- a/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx +++ b/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx @@ -6,17 +6,17 @@ import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' import useMutationProps from '~/hooks/useMutationProps' import {PALETTE} from '~/styles/paletteV3' +import { + NewTemplateScaleValueLabelInput_scale$data, + NewTemplateScaleValueLabelInput_scale$key +} from '../../../__generated__/NewTemplateScaleValueLabelInput_scale.graphql' import useScrollIntoView from '../../../hooks/useScrollIntoVIew' import AddPokerTemplateScaleValueMutation from '../../../mutations/AddPokerTemplateScaleValueMutation' import palettePickerOptions from '../../../styles/palettePickerOptions' +import {Threshold} from '../../../types/constEnums' import isSpecialPokerLabel from '../../../utils/isSpecialPokerLabel' import Legitity from '../../../validation/Legitity' -import { - NewTemplateScaleValueLabelInput_scale$key, - NewTemplateScaleValueLabelInput_scale$data -} from '../../../__generated__/NewTemplateScaleValueLabelInput_scale.graphql' import EditableTemplateScaleValueColor from './EditableTemplateScaleValueColor' -import {Threshold} from '../../../types/constEnums' const Form = styled('form')({ width: '100%', diff --git a/packages/client/modules/meeting/components/PokerTemplateDetails.tsx b/packages/client/modules/meeting/components/PokerTemplateDetails.tsx deleted file mode 100644 index c42794d1508..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplateDetails.tsx +++ /dev/null @@ -1,174 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import useAtmosphere from '../../../hooks/useAtmosphere' -import useMutationProps from '../../../hooks/useMutationProps' -import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation' -import {PALETTE} from '../../../styles/paletteV3' -import getTemplateList from '../../../utils/getTemplateList' -import useTemplateDescription from '../../../utils/useTemplateDescription' -import {PokerTemplateDetails_settings$key} from '../../../__generated__/PokerTemplateDetails_settings.graphql' -import AddPokerTemplateDimension from './AddPokerTemplateDimension' -import CloneTemplate from './CloneTemplate' -import EditableTemplateName from './EditableTemplateName' -import RemoveTemplate from './RemoveTemplate' -import SelectTemplate from './SelectTemplate' -import TemplateDimensionList from './TemplateDimensionList' -import TemplateSharing from './TemplateSharing' - -const TemplateHeader = styled('div')({ - display: 'flex', - flexDirection: 'column', - margin: '16px 0', - paddingLeft: 56, - paddingRight: 16, - width: '100%', - flexShrink: 0 -}) - -const DimensionEditor = styled('div')({ - alignItems: 'flex-start', - background: '#fff', - borderRadius: 8, - display: 'flex', - flexDirection: 'column', - overflow: 'hidden', - maxWidth: 520, - width: '100%' -}) - -const TemplateImg = styled('img')({ - margin: '0 auto', - maxWidth: 360, - maxHeight: 200, - padding: '16px 0 0', - width: '100%', - objectFit: 'contain' -}) - -const Description = styled('div')({ - color: PALETTE.SLATE_700, - fontSize: 14, - lineHeight: '20px' -}) - -const FirstLine = styled('div')({ - alignItems: 'center', - display: 'flex' -}) - -const Scrollable = styled('div')<{isActiveTemplate: boolean}>(({isActiveTemplate}) => ({ - display: 'flex', - flexDirection: 'column', - overflow: 'auto', - paddingBottom: isActiveTemplate ? undefined : 56, - width: '100%' -})) - -interface Props { - gotoTeamTemplates: () => void - gotoPublicTemplates: () => void - closePortal: () => void - settings: PokerTemplateDetails_settings$key -} - -const PokerTemplateDetails = (props: Props) => { - const {gotoTeamTemplates, gotoPublicTemplates, closePortal, settings: settingsRef} = props - const settings = useFragment( - graphql` - fragment PokerTemplateDetails_settings on PokerMeetingSettings { - activeTemplate { - illustrationUrl - ...PokerTemplateDetailsTemplate @relay(mask: false) - ...SelectTemplate_template - } - selectedTemplate { - illustrationUrl - ...PokerTemplateDetailsTemplate @relay(mask: false) - ...SelectTemplate_template - } - teamTemplates { - ...RemoveTemplate_teamTemplates - } - team { - id - orgId - tier - } - } - `, - settingsRef - ) - const {teamTemplates, team} = settings - const activeTemplate = settings.activeTemplate ?? settings.selectedTemplate - const {id: templateId, name: templateName, dimensions, illustrationUrl} = activeTemplate - const {id: teamId, orgId, tier} = team - const lowestScope = getTemplateList(teamId, orgId, activeTemplate) - const isOwner = activeTemplate.teamId === teamId - const description = useTemplateDescription(lowestScope, activeTemplate, tier) - const atmosphere = useAtmosphere() - const {onError, onCompleted, submitting, submitMutation} = useMutationProps() - const onClone = () => { - if (submitting) return - submitMutation() - AddPokerTemplateMutation( - atmosphere, - {parentTemplateId: templateId, teamId}, - {onError, onCompleted} - ) - gotoTeamTemplates() - } - const isActiveTemplate = activeTemplate.id === settings.selectedTemplate.id - const showClone = !isOwner && tier !== 'starter' - return ( - - - - - - - {isOwner && ( - - )} - {showClone && } - - {description} - - - {isOwner && } - - - {!isActiveTemplate && ( - - )} - - ) -} - -graphql` - fragment PokerTemplateDetailsTemplate on PokerTemplate { - ...TemplateSharing_template - ...getTemplateList_template - ...useTemplateDescription_template - id - name - dimensions { - ...TemplateDimensionList_dimensions - ...AddPokerTemplateDimension_dimensions - } - teamId - } -` -export default PokerTemplateDetails diff --git a/packages/client/modules/meeting/components/PokerTemplateItem.tsx b/packages/client/modules/meeting/components/PokerTemplateItem.tsx deleted file mode 100644 index 14a2c32323b..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplateItem.tsx +++ /dev/null @@ -1,109 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React, {useEffect, useRef} from 'react' -import {commitLocalUpdate, useFragment} from 'react-relay' -import useAtmosphere from '../../../hooks/useAtmosphere' -import useScrollIntoView from '../../../hooks/useScrollIntoVIew' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import {DECELERATE} from '../../../styles/animation' -import textOverflow from '../../../styles/helpers/textOverflow' -import {PALETTE} from '../../../styles/paletteV3' -import useTemplateDescription from '../../../utils/useTemplateDescription' -import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate' -import {PokerTemplateItem_template$key} from '../../../__generated__/PokerTemplateItem_template.graphql' - -const TemplateItem = styled('li')<{isActive: boolean}>(({isActive}) => ({ - backgroundColor: isActive ? PALETTE.SLATE_200 : undefined, - cursor: 'pointer', - display: 'flex', - fontSize: 14, - justifyContent: 'space-between', - lineHeight: '22px', - paddingTop: 12, - paddingBottom: 12, - paddingLeft: 16, - transition: `background-color 300ms ${DECELERATE}`, - userSelect: 'none', - width: '100%' -})) - -const TemplateItemDetails = styled('div')({ - display: 'flex', - flexDirection: 'column', - width: '100%' -}) - -const TemplateTitle = styled('div')({ - ...textOverflow, - color: PALETTE.SLATE_700, - fontSize: 16, - fontWeight: 600, - lineHeight: '24px' -}) - -const TemplateDescription = styled('div')({ - ...textOverflow, - color: PALETTE.SLATE_600, - fontSize: 12, - lineHeight: '16px' -}) - -const TemplateItemAction = styled('div')({}) - -interface Props { - isActive: boolean - teamId: string - templateRef: PokerTemplateItem_template$key - lowestScope: 'TEAM' | 'ORGANIZATION' | 'PUBLIC' -} - -const PokerTemplateItem = (props: Props) => { - const {lowestScope, isActive, teamId, templateRef} = props - const template = useFragment( - graphql` - fragment PokerTemplateItem_template on PokerTemplate { - #get the details here so we can show them in the details view - ...PokerTemplateDetailsTemplate - ...useTemplateDescription_template - id - name - lastUsedAt - scope - isFree - } - `, - templateRef - ) - const {id: templateId, name: templateName, scope, isFree} = template - const description = useTemplateDescription(lowestScope, template) - const atmosphere = useAtmosphere() - const ref = useRef(null) - useScrollIntoView(ref, isActive) - const selectTemplate = () => { - if (isActive) return - setActiveTemplate(atmosphere, teamId, templateId, 'poker') - commitLocalUpdate(atmosphere, (store) => { - store.get(teamId)?.setValue(null, 'editingScaleId') - }) - } - useEffect(() => { - if (!isActive) return - SendClientSideEvent(atmosphere, 'Viewed Template', { - meetingType: 'poker', - scope, - templateName, - isFree - }) - }, [isActive]) - return ( - - - {templateName} - {description} - - - - ) -} - -export default PokerTemplateItem diff --git a/packages/client/modules/meeting/components/PokerTemplateList.tsx b/packages/client/modules/meeting/components/PokerTemplateList.tsx deleted file mode 100644 index d3c4b3f0f89..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplateList.tsx +++ /dev/null @@ -1,195 +0,0 @@ -import styled from '@emotion/styled' -import { - Business as BusinessIcon, - Group as GroupIcon, - Public as PublicIcon -} from '@mui/icons-material' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import SwipeableViews from 'react-swipeable-views' -import Tab from '../../../components/Tab/Tab' -import Tabs from '../../../components/Tabs/Tabs' -import useBreakpoint from '../../../hooks/useBreakpoint' -import {desktopSidebarShadow} from '../../../styles/elevation' -import {PALETTE} from '../../../styles/paletteV3' -import {Breakpoint} from '../../../types/constEnums' -import {PokerTemplateList_settings$key} from '../../../__generated__/PokerTemplateList_settings.graphql' -import AddNewPokerTemplate from './AddNewPokerTemplate' -import PokerTemplateListOrgRoot from './PokerTemplateListOrgRoot' -import PokerTemplateListPublicRoot from './PokerTemplateListPublicRoot' -import PokerTemplateListTeam from './PokerTemplateListTeam' - -const WIDTH = 360 -const TemplateSidebar = styled('div')<{isDesktop: boolean}>(({isDesktop}) => ({ - boxShadow: desktopSidebarShadow, - display: 'flex', - flexDirection: 'column', - position: 'relative', - width: !isDesktop ? '100%' : WIDTH, - zIndex: 1 // show above template details to show box-shadow -})) - -const Label = styled('div')({ - color: PALETTE.SLATE_700, - fontSize: 20, - fontWeight: 600, - lineHeight: '24px', - paddingTop: 16, - paddingLeft: 24, - paddingBottom: 8 -}) - -const StyledTabsBar = styled(Tabs)({ - boxShadow: `inset 0 -1px 0 ${PALETTE.SLATE_300}` -}) - -const FullTab = styled(Tab)({ - padding: '4px 0 8px', - width: '30%' -}) - -const WideTab = styled(FullTab)({ - width: '40%' -}) - -const TabContents = styled('div')({ - display: 'flex', - flexDirection: 'column', - height: '100%' -}) - -const TabLabel = styled('div')({ - display: 'flex', - justifyContent: 'center', - alignItems: 'center' -}) - -const TabIcon = styled('div')({ - height: 24, - width: 24, - marginRight: 4 -}) - -const containerStyle = {height: '100%'} -const innerStyle = {width: '100%', height: '100%'} -interface Props { - activeIdx: number - setActiveIdx: (idx: number) => void - settingsRef: PokerTemplateList_settings$key - displayUpgradeDetails: () => void -} - -const PokerTemplateList = (props: Props) => { - const {activeIdx, setActiveIdx, settingsRef, displayUpgradeDetails} = props - const settings = useFragment( - graphql` - fragment PokerTemplateList_settings on PokerMeetingSettings { - id - team { - ...PokerTemplateListTeam_team - ...AddNewPokerTemplate_team - id - } - activeTemplate { - ...getTemplateList_template - id - } - teamTemplates { - ...PokerTemplateListTeam_teamTemplates - ...AddNewPokerTemplate_pokerTemplates - id - } - } - `, - settingsRef - ) - const {team, teamTemplates} = settings - const {id: teamId} = team - const activeTemplateId = settings.activeTemplate?.id ?? '-tmp' - - const gotoTeamTemplates = () => { - setActiveIdx(0) - } - const gotoPublicTemplates = () => { - setActiveIdx(2) - } - const onChangeIdx = (idx: number, _fromIdx: number, props: {reason: string}) => { - //very buggy behavior, probably linked to the vertical scrolling. - // to repro, go from team > org > team > org by clicking tabs & see this this get called for who knows why - if (props.reason === 'focus') return - setActiveIdx(idx) - } - const isDesktop = useBreakpoint(Breakpoint.NEW_MEETING_GRID) - - return ( - - - - - - - {' '} - Team - - } - onClick={gotoTeamTemplates} - /> - - - - {' '} - Organization - - } - onClick={() => setActiveIdx(1)} - /> - - - - {' '} - Public - - } - onClick={gotoPublicTemplates} - /> - - - - - - - {activeIdx === 1 && } - - {activeIdx === 2 && } - - - {/* add a key to clear the error when they change */} - - ) -} - -export default PokerTemplateList diff --git a/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx b/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx deleted file mode 100644 index 1f12196d9d0..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx +++ /dev/null @@ -1,118 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {PreloadedQuery, usePreloadedQuery} from 'react-relay' -import {useHistory} from 'react-router' -import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate' -import useAtmosphere from '../../../hooks/useAtmosphere' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import {PALETTE} from '../../../styles/paletteV3' -import {PokerTemplateListOrgQuery} from '../../../__generated__/PokerTemplateListOrgQuery.graphql' -import PokerTemplateItem from './PokerTemplateItem' - -const TemplateList = styled('ul')({ - listStyle: 'none', - paddingLeft: 0, - marginTop: 0 -}) - -const StyledLink = styled('span')({ - color: PALETTE.SKY_500, - cursor: 'pointer', - outline: 0, - ':hover, :focus, :active': { - color: PALETTE.SKY_600 - } -}) - -const Message = styled('div')({ - border: `1px dashed ${PALETTE.SLATE_400}`, - borderRadius: 4, - color: PALETTE.SLATE_600, - fontSize: 14, - fontStyle: 'italic', - lineHeight: '20px', - margin: 'auto 32px', - padding: '8px 16px' -}) -interface Props { - queryRef: PreloadedQuery -} - -const query = graphql` - query PokerTemplateListOrgQuery($teamId: ID!) { - viewer { - id - team(teamId: $teamId) { - id - tier - orgId - meetingSettings(meetingType: poker) { - ... on PokerMeetingSettings { - organizationTemplates(first: 20) - @connection(key: "PokerTemplateListOrg_organizationTemplates") { - edges { - node { - ...PokerTemplateItem_template - id - } - } - } - activeTemplate { - id - } - } - } - } - } - } -` -const PokerTemplateListOrg = (props: Props) => { - const {queryRef} = props - const data = usePreloadedQuery(query, queryRef) - const {viewer} = data - const team = viewer.team! - const {id: teamId, meetingSettings, tier, orgId} = team - const activeTemplateId = meetingSettings.activeTemplate?.id ?? '-tmp' - const organizationTemplates = meetingSettings.organizationTemplates! - const {edges} = organizationTemplates - useActiveTopTemplate(edges, activeTemplateId, teamId, true, 'poker') - const atmosphere = useAtmosphere() - const history = useHistory() - - if (edges.length === 0) { - if (tier === 'starter') { - const goToBilling = () => { - SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', { - upgradeCTALocation: 'orgTemplate', - meetingType: 'poker' - }) - history.push(`/me/organizations/${orgId}`) - } - return ( - - Upgrade - to create custom templates for your organization - - ) - } - return {'No other teams in your organization are sharing a template.'} - } - return ( - - {edges.map(({node: template}) => { - return ( - - ) - })} - - ) -} - -export default PokerTemplateListOrg diff --git a/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx b/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx deleted file mode 100644 index b1ae0cc1d52..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' -import pokerTemplateListOrgQuery, { - PokerTemplateListOrgQuery -} from '../../../__generated__/PokerTemplateListOrgQuery.graphql' -import MockTemplateList from './MockTemplateList' -import PokerTemplateListOrg from './PokerTemplateListOrg' - -interface Props { - teamId: string -} - -const PokerTemplateListOrgRoot = (props: Props) => { - const {teamId} = props - const queryRef = useQueryLoaderNow(pokerTemplateListOrgQuery, {teamId}) - - return ( - }> - {queryRef && } - - ) -} - -export default PokerTemplateListOrgRoot diff --git a/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx b/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx deleted file mode 100644 index 1e990c56e20..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx +++ /dev/null @@ -1,71 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {PreloadedQuery, usePreloadedQuery} from 'react-relay' -import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate' -import {PokerTemplateListPublicQuery} from '../../../__generated__/PokerTemplateListPublicQuery.graphql' -import PokerTemplateItem from './PokerTemplateItem' - -const TemplateList = styled('ul')({ - listStyle: 'none', - paddingLeft: 0, - marginTop: 0 -}) - -interface Props { - queryRef: PreloadedQuery -} -const query = graphql` - query PokerTemplateListPublicQuery($teamId: ID!) { - viewer { - id - team(teamId: $teamId) { - id - meetingSettings(meetingType: poker) { - ... on PokerMeetingSettings { - publicTemplates(first: 20) @connection(key: "PokerTemplateListPublic_publicTemplates") { - edges { - node { - ...PokerTemplateItem_template - id - } - } - } - activeTemplate { - id - } - } - } - } - } - } -` - -const PokerTemplateListPublic = (props: Props) => { - const {queryRef} = props - const data = usePreloadedQuery(query, queryRef) - const {viewer} = data - const team = viewer.team! - const {id: teamId, meetingSettings} = team - const publicTemplates = meetingSettings.publicTemplates! - const activeTemplateId = meetingSettings.activeTemplate?.id ?? '-tmp' - const {edges} = publicTemplates - useActiveTopTemplate(edges, activeTemplateId, teamId, true, 'poker') - return ( - - {edges.map(({node: template}) => { - return ( - - ) - })} - - ) -} - -export default PokerTemplateListPublic diff --git a/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx b/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx deleted file mode 100644 index 6f59f30c4b1..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' -import pokerTemplateListPublicQuery, { - PokerTemplateListPublicQuery -} from '../../../__generated__/PokerTemplateListPublicQuery.graphql' -import MockTemplateList from './MockTemplateList' -import PokerTemplateListPublic from './PokerTemplateListPublic' - -interface Props { - teamId: string -} - -const PokerTemplateListPublicRoot = (props: Props) => { - const {teamId} = props - const queryRef = useQueryLoaderNow(pokerTemplateListPublicQuery, { - teamId - }) - - return ( - }> - {queryRef && } - - ) -} - -export default PokerTemplateListPublicRoot diff --git a/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx b/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx deleted file mode 100644 index 6bab382b0bd..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx +++ /dev/null @@ -1,114 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import {useHistory} from 'react-router' -import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate' -import useAtmosphere from '../../../hooks/useAtmosphere' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import {PALETTE} from '../../../styles/paletteV3' -import {PokerTemplateListTeam_team$key} from '../../../__generated__/PokerTemplateListTeam_team.graphql' -import {PokerTemplateListTeam_teamTemplates$key} from '../../../__generated__/PokerTemplateListTeam_teamTemplates.graphql' -import PokerTemplateItem from './PokerTemplateItem' - -const TemplateList = styled('ul')({ - listStyle: 'none', - paddingLeft: 0, - marginTop: 0 -}) - -const Message = styled('div')({ - border: `1px dashed ${PALETTE.SLATE_400}`, - borderRadius: 4, - color: PALETTE.SLATE_600, - fontSize: 14, - fontStyle: 'italic', - lineHeight: '20px', - margin: 'auto 32px', - padding: '8px 16px' -}) - -const StyledLink = styled('span')({ - color: PALETTE.SKY_500, - cursor: 'pointer', - outline: 0, - ':hover, :focus, :active': { - color: PALETTE.SKY_600 - } -}) - -interface Props { - isActive: boolean - activeTemplateId: string - showPublicTemplates: () => void - teamTemplatesRef: PokerTemplateListTeam_teamTemplates$key - teamRef: PokerTemplateListTeam_team$key -} - -const PokerTemplateListTeam = (props: Props) => { - const {isActive, activeTemplateId, showPublicTemplates, teamTemplatesRef, teamRef} = props - const teamTemplates = useFragment( - graphql` - fragment PokerTemplateListTeam_teamTemplates on PokerTemplate @relay(plural: true) { - id - ...PokerTemplateItem_template - } - `, - teamTemplatesRef - ) - const team = useFragment( - graphql` - fragment PokerTemplateListTeam_team on Team { - id - orgId - tier - } - `, - teamRef - ) - const {id: teamId, tier, orgId} = team - const edges = teamTemplates.map((t) => ({node: {id: t.id}})) as readonly {node: {id: string}}[] - useActiveTopTemplate(edges, activeTemplateId, teamId, isActive, 'poker') - const atmosphere = useAtmosphere() - const history = useHistory() - if (teamTemplates.length === 0) { - if (tier === 'starter') { - const goToBilling = () => { - SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', { - upgradeCTALocation: 'teamTemplate', - meetingType: 'poker' - }) - history.push(`/me/organizations/${orgId}`) - } - return ( - - Upgrade - to create custom templates for your team - - ) - } - return ( - - Your custom templates will show up here. Get started with a - Public Template - - ) - } - return ( - - {teamTemplates.map((template) => { - return ( - - ) - })} - - ) -} - -export default PokerTemplateListTeam diff --git a/packages/client/modules/meeting/components/PokerTemplateModal.tsx b/packages/client/modules/meeting/components/PokerTemplateModal.tsx deleted file mode 100644 index 007c360db22..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplateModal.tsx +++ /dev/null @@ -1,108 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React, {useEffect, useState} from 'react' -import {useFragment} from 'react-relay' -import DialogContainer from '../../../components/DialogContainer' -import useAtmosphere from '../../../hooks/useAtmosphere' -import getTemplateList from '../../../utils/getTemplateList' -import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate' -import {PokerTemplateModal_pokerMeetingSettings$key} from '../../../__generated__/PokerTemplateModal_pokerMeetingSettings.graphql' -import CustomTemplateUpgradeMsg from './CustomTemplateUpgradeMsg' -import PokerTemplateDetails from './PokerTemplateDetails' -import PokerTemplateList from './PokerTemplateList' -import PokerTemplateScaleDetails from './PokerTemplateScaleDetails' - -interface Props { - closePortal: () => void - pokerMeetingSettingsRef: PokerTemplateModal_pokerMeetingSettings$key -} - -const StyledDialogContainer = styled(DialogContainer)({ - flexDirection: 'row', - width: 880, - maxHeight: 520, - minHeight: 520 -}) - -const SCOPES = ['TEAM', 'ORGANIZATION', 'PUBLIC'] - -const PokerTemplateModal = (props: Props) => { - const {closePortal, pokerMeetingSettingsRef} = props - const pokerMeetingSettings = useFragment( - graphql` - fragment PokerTemplateModal_pokerMeetingSettings on PokerMeetingSettings { - ...PokerTemplateList_settings - ...PokerTemplateDetails_settings - meetingType - team { - ...PokerTemplateScaleDetails_team - id - orgId - editingScaleId - } - selectedTemplate { - id - ...getTemplateList_template - } - activeTemplate { - id - } - } - `, - pokerMeetingSettingsRef - ) - - const {selectedTemplate, team, activeTemplate, meetingType} = pokerMeetingSettings - const {id: teamId, orgId, editingScaleId} = team - const lowestScope = getTemplateList(teamId, orgId, selectedTemplate) - const listIdx = SCOPES.indexOf(lowestScope) - const [activeIdx, setActiveIdx] = useState(listIdx) - const [showUpgradeDetails, setShowUpgradeDetails] = useState(false) - const gotoTeamTemplates = () => { - setActiveIdx(0) - } - const gotoPublicTemplates = () => { - setActiveIdx(2) - } - - const atmosphere = useAtmosphere() - useEffect(() => { - setActiveTemplate(atmosphere, teamId, selectedTemplate.id, 'poker') - }, []) - - const displayUpgradeDetails = () => { - setShowUpgradeDetails(true) - } - - const hideUpgradeDetails = () => { - setShowUpgradeDetails(false) - } - - useEffect(() => { - if (showUpgradeDetails) hideUpgradeDetails() - }, [activeTemplate]) - - return ( - - - {showUpgradeDetails ? ( - - ) : editingScaleId ? ( - - ) : ( - - )} - - ) -} -export default PokerTemplateModal diff --git a/packages/client/modules/meeting/components/PokerTemplatePicker.tsx b/packages/client/modules/meeting/components/PokerTemplatePicker.tsx deleted file mode 100644 index 33940b0581a..00000000000 --- a/packages/client/modules/meeting/components/PokerTemplatePicker.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import NewMeetingDropdown from '../../../components/NewMeetingDropdown' -import useAtmosphere from '../../../hooks/useAtmosphere' -import useModal from '../../../hooks/useModal' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import lazyPreload from '../../../utils/lazyPreload' -import {PokerTemplatePicker_settings$key} from '../../../__generated__/PokerTemplatePicker_settings.graphql' - -interface Props { - settingsRef: PokerTemplatePicker_settings$key -} - -const PokerTemplateModal = lazyPreload( - () => - import( - /* webpackChunkName: 'PokerTemplateModal' */ - './PokerTemplateModal' - ) -) - -const PokerTemplatePicker = (props: Props) => { - const {settingsRef} = props - const settings = useFragment( - graphql` - fragment PokerTemplatePicker_settings on PokerMeetingSettings { - ...PokerTemplateModal_pokerMeetingSettings - selectedTemplate { - id - name - scope - ...PokerTemplateDetailsTemplate - } - } - `, - settingsRef - ) - const {selectedTemplate} = settings - const {name: templateName, scope} = selectedTemplate - const {togglePortal, modalPortal, closePortal} = useModal({ - id: 'templateModal' - }) - const atmosphere = useAtmosphere() - - const handleClick = () => { - togglePortal() - SendClientSideEvent(atmosphere, 'Opened Template Picker', { - meetingType: 'poker', - scope - }) - } - - return ( - <> - - {modalPortal( - - )} - - ) -} - -export default PokerTemplatePicker diff --git a/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx b/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx index 066d1f7d841..014b693da05 100644 --- a/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx +++ b/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx @@ -3,15 +3,15 @@ import {ArrowBack} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' +import {PokerTemplateScaleDetails_team$key} from '../../../__generated__/PokerTemplateScaleDetails_team.graphql' import FlatButton from '../../../components/FlatButton' import useAtmosphere from '../../../hooks/useAtmosphere' import textOverflow from '../../../styles/helpers/textOverflow' import {PALETTE} from '../../../styles/paletteV3' import {FONT_FAMILY} from '../../../styles/typographyV2' -import {PokerTemplateScaleDetails_team$key} from '../../../__generated__/PokerTemplateScaleDetails_team.graphql' import EditableTemplateScaleName from './EditableTemplateScaleName' -import scaleValueString from './scaleValueString' import TemplateScaleValueList from './TemplateScaleValueList' +import scaleValueString from './scaleValueString' const ScaleHeader = styled('div')({ display: 'flex', diff --git a/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx b/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx index 3bcfc9d3d54..5b25e5f165e 100644 --- a/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx +++ b/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx @@ -3,6 +3,7 @@ import {ExpandMore} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {PokerTemplateScalePicker_dimension$key} from '../../../__generated__/PokerTemplateScalePicker_dimension.graphql' import {MenuPosition} from '../../../hooks/useCoords' import useMenu from '../../../hooks/useMenu' import useTooltip from '../../../hooks/useTooltip' @@ -10,7 +11,6 @@ import textOverflow from '../../../styles/helpers/textOverflow' import {PALETTE} from '../../../styles/paletteV3' import {FONT_FAMILY} from '../../../styles/typographyV2' import lazyPreload from '../../../utils/lazyPreload' -import {PokerTemplateScalePicker_dimension$key} from '../../../__generated__/PokerTemplateScalePicker_dimension.graphql' const SelectScaleDropdown = lazyPreload( () => diff --git a/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx b/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx deleted file mode 100644 index 2d45402d52e..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx +++ /dev/null @@ -1,189 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import useAtmosphere from '../../../hooks/useAtmosphere' -import useMutationProps from '../../../hooks/useMutationProps' -import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation' -import {PALETTE} from '../../../styles/paletteV3' -import getTemplateList from '../../../utils/getTemplateList' -import useTemplateDescription from '../../../utils/useTemplateDescription' -import {ReflectTemplateDetails_settings$key} from '../../../__generated__/ReflectTemplateDetails_settings.graphql' -import AddTemplatePrompt from './AddTemplatePrompt' -import CloneTemplate from './CloneTemplate' -import EditableTemplateName from './EditableTemplateName' -import RemoveTemplate from './RemoveTemplate' -import SelectTemplate from './SelectTemplate' -import TemplatePromptList from './TemplatePromptList' -import TemplateSharing from './TemplateSharing' - -const TemplateHeader = styled('div')({ - display: 'flex', - flexDirection: 'column', - margin: '16px 0', - paddingLeft: 56, - paddingRight: 16, - width: '100%', - flexShrink: 0 -}) - -const PromptEditor = styled('div')({ - alignItems: 'flex-start', - background: '#fff', - borderRadius: 8, - display: 'flex', - flexDirection: 'column', - overflow: 'hidden', - maxWidth: 520, - width: '100%' -}) - -const TemplateImage = styled('img')({ - margin: '0 auto', - maxWidth: 360, - maxHeight: 200, - padding: '16px 0 0', - width: '100%', - objectFit: 'contain' -}) - -const Description = styled('div')({ - color: PALETTE.SLATE_700, - fontSize: 14, - lineHeight: '20px' -}) - -const FirstLine = styled('div')({ - alignItems: 'center', - display: 'flex' -}) - -const Scrollable = styled('div')<{isActiveTemplate: boolean}>(({isActiveTemplate}) => ({ - display: 'flex', - flexDirection: 'column', - overflow: 'auto', - paddingBottom: isActiveTemplate ? undefined : 56, - width: '100%' -})) - -interface Props { - gotoTeamTemplates: () => void - gotoPublicTemplates: () => void - closePortal: () => void - settings: ReflectTemplateDetails_settings$key -} - -const ReflectTemplateDetails = (props: Props) => { - const {gotoTeamTemplates, gotoPublicTemplates, closePortal, settings: settingsRef} = props - const settings = useFragment( - graphql` - fragment ReflectTemplateDetails_settings on RetrospectiveMeetingSettings { - activeTemplate { - ...ReflectTemplateDetailsTemplate @relay(mask: false) - ...SelectTemplate_template - illustrationUrl - } - selectedTemplate { - ...ReflectTemplateDetailsTemplate @relay(mask: false) - ...SelectTemplate_template - } - teamTemplates { - ...RemoveTemplate_teamTemplates - } - team { - id - orgId - tier - viewerTeamMember { - user { - id - featureFlags { - noTemplateLimit - } - } - } - } - } - `, - settingsRef - ) - const {teamTemplates, team} = settings - const activeTemplate = settings.activeTemplate ?? settings.selectedTemplate - const {id: templateId, name: templateName, prompts, illustrationUrl} = activeTemplate - const {id: teamId, orgId, tier, viewerTeamMember} = team - const noTemplateLimit = viewerTeamMember?.user?.featureFlags?.noTemplateLimit - const lowestScope = getTemplateList(teamId, orgId, activeTemplate) - const isOwner = activeTemplate.teamId === teamId - const description = useTemplateDescription(lowestScope, activeTemplate, tier) - const atmosphere = useAtmosphere() - const {onError, onCompleted, submitting, submitMutation} = useMutationProps() - const onClone = () => { - if (submitting) return - submitMutation() - AddReflectTemplateMutation( - atmosphere, - {parentTemplateId: templateId, teamId}, - {onError, onCompleted} - ) - gotoTeamTemplates() - } - const isActiveTemplate = templateId === settings.selectedTemplate.id - const showClone = !isOwner && tier !== 'starter' - return ( - - - - - - - {isOwner && ( - - )} - {showClone && } - - {description} - - - {isOwner && } - - - {!isActiveTemplate && ( - - )} - - ) -} - -graphql` - fragment ReflectTemplateDetailsTemplate on ReflectTemplate { - ...TemplateSharing_template - ...getTemplateList_template - ...useTemplateDescription_template - id - name - prompts { - ...TemplatePromptList_prompts - ...AddTemplatePrompt_prompts - } - teamId - } -` -export default ReflectTemplateDetails diff --git a/packages/client/modules/meeting/components/ReflectTemplateItem.tsx b/packages/client/modules/meeting/components/ReflectTemplateItem.tsx deleted file mode 100644 index 1be0bb114a8..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateItem.tsx +++ /dev/null @@ -1,111 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React, {useEffect, useRef} from 'react' -import {useFragment} from 'react-relay' -import TypeAheadLabel from '~/components/TypeAheadLabel' -import useAtmosphere from '../../../hooks/useAtmosphere' -import useScrollIntoView from '../../../hooks/useScrollIntoVIew' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import {DECELERATE} from '../../../styles/animation' -import textOverflow from '../../../styles/helpers/textOverflow' -import {PALETTE} from '../../../styles/paletteV3' -import useTemplateDescription from '../../../utils/useTemplateDescription' -import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate' -import {ReflectTemplateItem_template$key} from '../../../__generated__/ReflectTemplateItem_template.graphql' -import {TierEnum} from '../../../__generated__/OrganizationSubscription.graphql' - -const TemplateItem = styled('li')<{isActive: boolean}>(({isActive}) => ({ - backgroundColor: isActive ? PALETTE.SLATE_200 : undefined, - cursor: 'pointer', - display: 'flex', - fontSize: 14, - justifyContent: 'space-between', - lineHeight: '22px', - paddingTop: 12, - paddingBottom: 12, - paddingLeft: 16, - transition: `background-color 300ms ${DECELERATE}`, - userSelect: 'none', - width: '100%' -})) - -const TemplateItemDetails = styled('div')({ - display: 'flex', - flexDirection: 'column', - width: '100%' -}) - -const TemplateTitle = styled('div')({ - ...textOverflow, - color: PALETTE.SLATE_700, - fontSize: 16, - fontWeight: 600, - lineHeight: '24px' -}) - -const TemplateDescription = styled('div')({ - ...textOverflow, - color: PALETTE.SLATE_600, - fontSize: 12, - lineHeight: '16px' -}) - -const TemplateItemAction = styled('div')({}) - -interface Props { - isActive: boolean - teamId: string - template: ReflectTemplateItem_template$key - lowestScope: 'TEAM' | 'ORGANIZATION' | 'PUBLIC' - templateSearchQuery: string - tier?: TierEnum -} - -const ReflectTemplateItem = (props: Props) => { - const {lowestScope, isActive, teamId, template: templateRef, templateSearchQuery, tier} = props - const template = useFragment( - graphql` - fragment ReflectTemplateItem_template on ReflectTemplate { - #get the details here so we can show them in the details view - ...ReflectTemplateDetailsTemplate - ...useTemplateDescription_template - id - name - lastUsedAt - scope - isFree - } - `, - templateRef - ) - const {id: templateId, name: templateName, scope, isFree} = template - const description = useTemplateDescription(lowestScope, template, tier) - const atmosphere = useAtmosphere() - const ref = useRef(null) - useScrollIntoView(ref, isActive, true) - const selectTemplate = () => { - setActiveTemplate(atmosphere, teamId, templateId, 'retrospective') - } - useEffect(() => { - if (!isActive) return - SendClientSideEvent(atmosphere, 'Viewed Template', { - meetingType: 'retrospective', - scope, - templateName, - isFree - }) - }, [isActive]) - return ( - - - - - - {description} - - - - ) -} - -export default ReflectTemplateItem diff --git a/packages/client/modules/meeting/components/ReflectTemplateList.tsx b/packages/client/modules/meeting/components/ReflectTemplateList.tsx deleted file mode 100644 index c781df75727..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateList.tsx +++ /dev/null @@ -1,240 +0,0 @@ -import styled from '@emotion/styled' -import { - Business as BusinessIcon, - Group as GroupIcon, - Public as PublicIcon -} from '@mui/icons-material' -import graphql from 'babel-plugin-relay/macro' -import React, {useEffect, useRef} from 'react' -import {commitLocalUpdate, useFragment} from 'react-relay' -import SwipeableViews from 'react-swipeable-views' -import useAtmosphere from '~/hooks/useAtmosphere' -import {SharingScopeEnum} from '~/__generated__/ReflectTemplateItem_template.graphql' -import Tab from '../../../components/Tab/Tab' -import Tabs from '../../../components/Tabs/Tabs' -import useBreakpoint from '../../../hooks/useBreakpoint' -import {desktopSidebarShadow} from '../../../styles/elevation' -import {PALETTE} from '../../../styles/paletteV3' -import {Breakpoint} from '../../../types/constEnums' -import {ReflectTemplateList_settings$key} from '../../../__generated__/ReflectTemplateList_settings.graphql' -import AddNewReflectTemplate from './AddNewReflectTemplate' -import ReflectTemplateListOrgRoot from './ReflectTemplateListOrgRoot' -import ReflectTemplateListPublicRoot from './ReflectTemplateListPublicRoot' -import ReflectTemplateListTeam from './ReflectTemplateListTeam' -import ReflectTemplateSearchBar from './ReflectTemplateSearchBar' - -const WIDTH = 360 -const TemplateSidebar = styled('div')<{isDesktop: boolean}>(({isDesktop}) => ({ - boxShadow: desktopSidebarShadow, - display: 'flex', - flexDirection: 'column', - position: 'relative', - width: !isDesktop ? '100%' : WIDTH, - zIndex: 1 // show above template details to show box-shadow -})) - -const Label = styled('div')({ - color: PALETTE.SLATE_700, - fontSize: 20, - fontWeight: 600, - lineHeight: '24px', - paddingTop: 16, - paddingLeft: 24, - paddingBottom: 8 -}) - -const StyledTabsBar = styled(Tabs)({ - boxShadow: `inset 0 -1px 0 ${PALETTE.SLATE_300}`, - flexShrink: 0 -}) - -const FullTab = styled(Tab)({ - padding: '4px 0 8px', - width: '30%' -}) - -const WideTab = styled(FullTab)({ - width: '40%' -}) - -const TabContents = styled('div')({ - display: 'flex', - flexDirection: 'column', - height: '100%' -}) - -const TabLabel = styled('div')({ - display: 'flex', - justifyContent: 'center', - alignItems: 'center' -}) - -const TabIcon = styled('div')({ - width: 24, - height: 24, - marginRight: 4 -}) - -const containerStyle = {height: '100%'} -const innerStyle = {width: '100%', height: '100%'} -interface Props { - activeIdx: number - setActiveIdx: (idx: number) => void - displayUpgradeDetails: () => void - settingsRef: ReflectTemplateList_settings$key -} - -const useReadyToSmoothScroll = (activeTemplateId: string) => { - // Don't animate the scroll behavior on the initial render - const oldActiveTemplateIdRef = useRef(activeTemplateId) - const oldActiveTemplateId = oldActiveTemplateIdRef.current - useEffect(() => { - oldActiveTemplateIdRef.current = activeTemplateId - }, [activeTemplateId]) - return oldActiveTemplateId !== activeTemplateId && oldActiveTemplateId !== '-tmp' -} - -export const templateIdxs = { - TEAM: 0, - ORGANIZATION: 1, - PUBLIC: 2 -} as const - -const ReflectTemplateList = (props: Props) => { - const {activeIdx, setActiveIdx, settingsRef, displayUpgradeDetails} = props - const settings = useFragment( - graphql` - fragment ReflectTemplateList_settings on RetrospectiveMeetingSettings { - ...ReflectTemplateSearchBar_settings - id - templateSearchQuery - team { - ...AddNewReflectTemplate_team - ...ReflectTemplateListTeam_team - id - } - activeTemplate { - ...getTemplateList_template - id - } - teamTemplates { - ...AddNewReflectTemplate_reflectTemplates - ...ReflectTemplateListTeam_teamTemplates - id - } - } - `, - settingsRef - ) - const {id: settingsId, team, teamTemplates, templateSearchQuery} = settings - const {id: teamId} = team - const activeTemplateId = settings.activeTemplate?.id ?? '-tmp' - const readyToScrollSmooth = useReadyToSmoothScroll(activeTemplateId) - const atmosphere = useAtmosphere() - const slideStyle = {scrollBehavior: readyToScrollSmooth ? 'smooth' : undefined} - const templateType = Object.keys(templateIdxs).find( - (key) => templateIdxs[key as keyof typeof templateIdxs] === activeIdx - ) as SharingScopeEnum - - const clearSearch = () => { - commitLocalUpdate(atmosphere, (store) => { - const settings = store.get(settingsId) - if (!settings) return - settings.setValue('', 'templateSearchQuery') - }) - } - - const goToTab = (templateType: SharingScopeEnum) => { - setActiveIdx(templateIdxs[templateType]) - clearSearch() - } - - const onChangeIdx = (idx: number, _fromIdx: number, props: {reason: string}) => { - //very buggy behavior, probably linked to the vertical scrolling. - // to repro, go from team > org > team > org by clicking tabs & see this this get called for who knows why - if (props.reason === 'focus') return - setActiveIdx(idx) - clearSearch() - } - const isDesktop = useBreakpoint(Breakpoint.NEW_MEETING_GRID) - - return ( - - - - - - - {' '} - Team - - } - onClick={() => goToTab('TEAM')} - /> - - - - {' '} - Organization - - } - onClick={() => goToTab('ORGANIZATION')} - /> - - - - {' '} - Public - - } - onClick={() => goToTab('PUBLIC')} - /> - - - goToTab('TEAM')} - /> - - - goToTab('PUBLIC')} - templateSearchQuery={templateSearchQuery ?? ''} - teamRef={team} - teamTemplatesRef={teamTemplates} - isActive={activeIdx === 0} - /> - - - {activeIdx === 1 && } - - - {activeIdx === 2 && } - - - {/* add a key to clear the error when they change */} - - ) -} - -export default ReflectTemplateList diff --git a/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx b/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx deleted file mode 100644 index 0384993ebcf..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx +++ /dev/null @@ -1,134 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {PreloadedQuery, usePreloadedQuery} from 'react-relay' -import {useHistory} from 'react-router' -import useFilteredItems from '~/hooks/useFilteredItems' -import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate' -import useAtmosphere from '../../../hooks/useAtmosphere' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import {PALETTE} from '../../../styles/paletteV3' -import {ReflectTemplateListOrgQuery} from '../../../__generated__/ReflectTemplateListOrgQuery.graphql' -import ReflectTemplateItem from './ReflectTemplateItem' - -const TemplateList = styled('ul')({ - listStyle: 'none', - paddingLeft: 0, - marginTop: 0 -}) - -const StyledLink = styled('span')({ - color: PALETTE.SKY_500, - cursor: 'pointer', - outline: 0, - ':hover, :focus, :active': { - color: PALETTE.SKY_600 - } -}) - -const Message = styled('div')({ - border: `1px dashed ${PALETTE.SLATE_400}`, - borderRadius: 4, - color: PALETTE.SLATE_600, - fontSize: 14, - fontStyle: 'italic', - lineHeight: '20px', - margin: 'auto 32px', - padding: '8px 16px' -}) -interface Props { - queryRef: PreloadedQuery -} - -const getValue = (item: {node: {id: string; name: string}}) => { - return item.node.name.toLowerCase() -} - -const query = graphql` - query ReflectTemplateListOrgQuery($teamId: ID!) { - viewer { - id - team(teamId: $teamId) { - id - orgId - tier - meetingSettings(meetingType: retrospective) { - ... on RetrospectiveMeetingSettings { - templateSearchQuery - organizationTemplates(first: 20) - @connection(key: "ReflectTemplateListOrg_organizationTemplates") { - edges { - node { - ...ReflectTemplateItem_template - id - name - } - } - } - activeTemplate { - id - } - } - } - } - } - } -` - -const ReflectTemplateListOrg = (props: Props) => { - const {queryRef} = props - const data = usePreloadedQuery(query, queryRef) - const atmosphere = useAtmosphere() - const history = useHistory() - const {viewer} = data - const team = viewer.team! - const {id: teamId, meetingSettings, orgId, tier} = team - const {templateSearchQuery, organizationTemplates, activeTemplate} = meetingSettings - const searchQuery = templateSearchQuery ?? '' - const activeTemplateId = activeTemplate?.id ?? '-tmp' - const {edges} = organizationTemplates! - const filteredEdges = useFilteredItems(searchQuery, edges, getValue) - useActiveTopTemplate(edges, activeTemplateId, teamId, true, 'retrospective') - - if (edges.length === 0) { - if (tier === 'starter') { - const goToBilling = () => { - SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', { - upgradeCTALocation: 'orgTemplate', - meetingType: 'retrospective' - }) - history.push(`/me/organizations/${orgId}`) - } - return ( - - Upgrade - to create custom templates for your organization - - ) - } - return {'No other teams in your organization are sharing a template.'} - } - if (filteredEdges.length === 0) { - return ( - {`No template names in your organization match your search query "${searchQuery}"`} - ) - } - return ( - - {filteredEdges.map(({node: template}) => { - return ( - - ) - })} - - ) -} - -export default ReflectTemplateListOrg diff --git a/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx b/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx deleted file mode 100644 index e68e54885e3..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' -import reflectTemplateListOrgQuery, { - ReflectTemplateListOrgQuery -} from '../../../__generated__/ReflectTemplateListOrgQuery.graphql' -import MockTemplateList from './MockTemplateList' -import ReflectTemplateListOrg from './ReflectTemplateListOrg' - -interface Props { - teamId: string -} - -const ReflectTemplateListOrgRoot = (props: Props) => { - const {teamId} = props - const queryRef = useQueryLoaderNow(reflectTemplateListOrgQuery, { - teamId - }) - return ( - }> - {queryRef && } - - ) -} - -export default ReflectTemplateListOrgRoot diff --git a/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx b/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx deleted file mode 100644 index 3073437edca..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx +++ /dev/null @@ -1,104 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {PreloadedQuery, usePreloadedQuery} from 'react-relay' -import useFilteredItems from '~/hooks/useFilteredItems' -import {PALETTE} from '~/styles/paletteV3' -import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate' -import {ReflectTemplateListPublicQuery} from '../../../__generated__/ReflectTemplateListPublicQuery.graphql' -import ReflectTemplateItem from './ReflectTemplateItem' - -const TemplateList = styled('ul')({ - listStyle: 'none', - paddingLeft: 0, - marginTop: 0 -}) - -const Message = styled('div')({ - border: `1px dashed ${PALETTE.SLATE_400}`, - borderRadius: 4, - color: PALETTE.SLATE_600, - fontSize: 14, - fontStyle: 'italic', - lineHeight: '20px', - margin: 'auto 32px', - padding: '8px 16px' -}) - -interface Props { - queryRef: PreloadedQuery -} - -const getValue = (item: {node: {id: string; name: string}}) => { - return item.node.name.toLowerCase() -} - -const query = graphql` - query ReflectTemplateListPublicQuery($teamId: ID!) { - viewer { - id - team(teamId: $teamId) { - id - tier - meetingSettings(meetingType: retrospective) { - ... on RetrospectiveMeetingSettings { - templateSearchQuery - publicTemplates(first: 100) - @connection(key: "ReflectTemplateListPublic_publicTemplates") { - edges { - node { - ...ReflectTemplateItem_template - id - name - createdAt - category - } - } - } - activeTemplate { - id - } - } - } - } - } - } -` - -const ReflectTemplateListPublic = (props: Props) => { - const {queryRef} = props - const data = usePreloadedQuery(query, queryRef) - const {viewer} = data - const team = viewer.team! - const {id: teamId, meetingSettings, tier} = team - const {templateSearchQuery, publicTemplates, activeTemplate} = meetingSettings - const searchQuery = templateSearchQuery ?? '' - const activeTemplateId = activeTemplate?.id ?? '-tmp' - const {edges} = publicTemplates! - const filteredEdges = useFilteredItems(searchQuery, edges, getValue).filter( - ({node}) => !['premortem', 'postmortem'].includes(node.category) - ) - useActiveTopTemplate(edges, activeTemplateId, teamId, true, 'retrospective') - if (filteredEdges.length === 0) { - return {`No public templates match your search query "${searchQuery}"`} - } - return ( - - {filteredEdges.map(({node: template}) => { - return ( - - ) - })} - - ) -} - -export default ReflectTemplateListPublic diff --git a/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx b/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx deleted file mode 100644 index 639ce903046..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' -import reflectTemplateListPublicQuery, { - ReflectTemplateListPublicQuery -} from '../../../__generated__/ReflectTemplateListPublicQuery.graphql' -import MockTemplateList from './MockTemplateList' -import ReflectTemplateListPublic from './ReflectTemplateListPublic' - -interface Props { - teamId: string -} - -const ReflectTemplateListPublicRoot = (props: Props) => { - const {teamId} = props - const queryRef = useQueryLoaderNow( - reflectTemplateListPublicQuery, - { - teamId - } - ) - return ( - }> - {queryRef && } - - ) -} - -export default ReflectTemplateListPublicRoot diff --git a/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx b/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx deleted file mode 100644 index b0474685df6..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx +++ /dev/null @@ -1,137 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import {useHistory} from 'react-router' -import useFilteredItems from '~/hooks/useFilteredItems' -import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate' -import useAtmosphere from '../../../hooks/useAtmosphere' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import {PALETTE} from '../../../styles/paletteV3' -import { - ReflectTemplateListTeam_teamTemplates$key, - ReflectTemplateListTeam_teamTemplates$data -} from '../../../__generated__/ReflectTemplateListTeam_teamTemplates.graphql' -import {ReflectTemplateListTeam_team$key} from '../../../__generated__/ReflectTemplateListTeam_team.graphql' -import ReflectTemplateItem from './ReflectTemplateItem' - -const TemplateList = styled('ul')({ - listStyle: 'none', - paddingLeft: 0, - marginTop: 0 -}) - -const Message = styled('div')({ - border: `1px dashed ${PALETTE.SLATE_400}`, - borderRadius: 4, - color: PALETTE.SLATE_600, - fontSize: 14, - fontStyle: 'italic', - lineHeight: '20px', - margin: 'auto 32px', - padding: '8px 16px' -}) - -const StyledLink = styled('span')({ - color: PALETTE.SKY_500, - cursor: 'pointer', - outline: 0, - ':hover, :focus, :active': { - color: PALETTE.SKY_600 - } -}) - -interface Props { - isActive: boolean - activeTemplateId: string - showPublicTemplates: () => void - teamTemplatesRef: ReflectTemplateListTeam_teamTemplates$key - teamRef: ReflectTemplateListTeam_team$key - templateSearchQuery: string -} - -const getValue = (item: ReflectTemplateListTeam_teamTemplates$data[0]) => { - return item.name.toLowerCase() -} - -const ReflectTemplateListTeam = (props: Props) => { - const { - isActive, - activeTemplateId, - showPublicTemplates, - templateSearchQuery, - teamTemplatesRef, - teamRef - } = props - const teamTemplates = useFragment( - graphql` - fragment ReflectTemplateListTeam_teamTemplates on ReflectTemplate @relay(plural: true) { - id - name - ...ReflectTemplateItem_template - } - `, - teamTemplatesRef - ) - const team = useFragment( - graphql` - fragment ReflectTemplateListTeam_team on Team { - id - orgId - tier - } - `, - teamRef - ) - const history = useHistory() - const atmosphere = useAtmosphere() - const {orgId, tier, id: teamId} = team - const searchQuery = templateSearchQuery ?? '' - const edges = teamTemplates.map((t) => ({node: {id: t.id}})) as readonly {node: {id: string}}[] - useActiveTopTemplate(edges, activeTemplateId, teamId, isActive, 'retrospective') - const filteredTemplates = useFilteredItems(searchQuery, teamTemplates, getValue) - if (teamTemplates.length === 0) { - if (tier === 'starter') { - const goToBilling = () => { - SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', { - upgradeCTALocation: 'teamTemplate', - meetingType: 'retrospective' - }) - history.push(`/me/organizations/${orgId}`) - } - return ( - - Upgrade - to create custom templates for your team - - ) - } - return ( - - Your custom templates will show up here. Get started with a - Public Template - - ) - } - if (filteredTemplates.length === 0) { - return {`No team templates match your search query "${searchQuery}"`} - } - return ( - - {teamTemplates.map((template) => { - return ( - - ) - })} - - ) -} - -export default ReflectTemplateListTeam diff --git a/packages/client/modules/meeting/components/ReflectTemplateModal.tsx b/packages/client/modules/meeting/components/ReflectTemplateModal.tsx deleted file mode 100644 index e226a4191db..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateModal.tsx +++ /dev/null @@ -1,102 +0,0 @@ -import styled from '@emotion/styled' -import graphql from 'babel-plugin-relay/macro' -import React, {useEffect, useState} from 'react' -import {useFragment} from 'react-relay' -import DialogContainer from '../../../components/DialogContainer' -import useAtmosphere from '../../../hooks/useAtmosphere' -import getTemplateList from '../../../utils/getTemplateList' -import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate' -import {ReflectTemplateModal_retroMeetingSettings$key} from '../../../__generated__/ReflectTemplateModal_retroMeetingSettings.graphql' -import CustomTemplateUpgradeMsg from './CustomTemplateUpgradeMsg' -import ReflectTemplateDetails from './ReflectTemplateDetails' -import ReflectTemplateList from './ReflectTemplateList' - -interface Props { - closePortal: () => void - retroMeetingSettingsRef: ReflectTemplateModal_retroMeetingSettings$key -} - -const StyledDialogContainer = styled(DialogContainer)({ - flexDirection: 'row', - width: 880, - maxHeight: 520, - minHeight: 520 -}) - -const SCOPES = ['TEAM', 'ORGANIZATION', 'PUBLIC'] - -const ReflectTemplateModal = (props: Props) => { - const {closePortal, retroMeetingSettingsRef} = props - const retroMeetingSettings = useFragment( - graphql` - fragment ReflectTemplateModal_retroMeetingSettings on RetrospectiveMeetingSettings { - ...ReflectTemplateList_settings - ...ReflectTemplateDetails_settings - meetingType - team { - id - orgId - } - selectedTemplate { - id - ...getTemplateList_template - } - activeTemplate { - id - } - } - `, - retroMeetingSettingsRef - ) - const {selectedTemplate, team, activeTemplate, meetingType} = retroMeetingSettings - const {id: teamId, orgId} = team - const lowestScope = getTemplateList(teamId, orgId, selectedTemplate) - const listIdx = SCOPES.indexOf(lowestScope) - const [activeIdx, setActiveIdx] = useState(listIdx) - const [showUpgradeDetails, setShowUpgradeDetails] = useState(false) - const gotoTeamTemplates = () => { - setActiveIdx(0) - } - const gotoPublicTemplates = () => { - setActiveIdx(2) - } - - const atmosphere = useAtmosphere() - useEffect(() => { - setActiveTemplate(atmosphere, teamId, selectedTemplate.id, 'retrospective') - }, []) - - const displayUpgradeDetails = () => { - setShowUpgradeDetails(true) - } - - const hideUpgradeDetails = () => { - setShowUpgradeDetails(false) - } - - useEffect(() => { - if (showUpgradeDetails) hideUpgradeDetails() - }, [activeTemplate]) - - return ( - - - {showUpgradeDetails ? ( - - ) : ( - - )} - - ) -} -export default ReflectTemplateModal diff --git a/packages/client/modules/meeting/components/ReflectTemplateSearchBar.tsx b/packages/client/modules/meeting/components/ReflectTemplateSearchBar.tsx deleted file mode 100644 index d0d78ed14c7..00000000000 --- a/packages/client/modules/meeting/components/ReflectTemplateSearchBar.tsx +++ /dev/null @@ -1,139 +0,0 @@ -import styled from '@emotion/styled' -import {Close, Search as SearchIcon} from '@mui/icons-material' -import graphql from 'babel-plugin-relay/macro' -import React, {ChangeEvent, useRef} from 'react' -import {commitLocalUpdate, useFragment} from 'react-relay' -import {SharingScopeEnum} from '~/__generated__/ReflectTemplateItem_template.graphql' -import {ReflectTemplateSearchBar_settings$key} from '~/__generated__/ReflectTemplateSearchBar_settings.graphql' -import Atmosphere from '../../../Atmosphere' -import MenuItemComponentAvatar from '../../../components/MenuItemComponentAvatar' -import MenuItemLabel from '../../../components/MenuItemLabel' -import useAtmosphere from '../../../hooks/useAtmosphere' -import {PALETTE} from '../../../styles/paletteV3' - -const SearchBarWrapper = styled('div')({ - padding: '16px 16px 0 16px' -}) - -const Search = styled(MenuItemLabel)({ - alignItems: 'center', - border: `1px solid ${PALETTE.SLATE_400}`, - borderRadius: '40px', - display: 'flex', - height: 40, - overflow: 'visible', - paddingLeft: 20, - position: 'relative', - width: '100%' -}) - -const StyledMenuItemIcon = styled(MenuItemComponentAvatar)({ - position: 'absolute', - left: 10, - top: 8 -}) - -const StyledSearchIcon = styled(SearchIcon)({ - color: PALETTE.SLATE_600 -}) - -const ClearSearchIcon = styled(Close)<{isEmpty: boolean}>(({isEmpty}) => ({ - color: PALETTE.SLATE_500, - cursor: 'pointer', - margin: 8, - display: isEmpty ? 'none' : 'flex' -})) - -const InputWrapper = styled('div')({ - alignItems: 'center', - display: 'flex', - flex: 1, - paddingLeft: 8 -}) - -const SearchInput = styled('input')({ - appearance: 'none', - border: 'none', - color: PALETTE.SLATE_700, - fontSize: 16, - margin: 0, - padding: 12, - height: 40, - outline: 0, - backgroundColor: 'transparent', - width: '100%' -}) - -const setTemplateSearch = (atmosphere: Atmosphere, settingsId: string, value: string) => { - commitLocalUpdate(atmosphere, (store) => { - const settings = store.get(settingsId) - if (!settings) return - const normalizedSearch = value.toLowerCase() - settings.setValue(normalizedSearch, 'templateSearchQuery') - }) -} - -interface Props { - templateType: SharingScopeEnum - clearSearch: () => void - settingsRef: ReflectTemplateSearchBar_settings$key -} - -const ReflectTemplateSearchBar = (props: Props) => { - const {templateType, clearSearch, settingsRef} = props - const atmosphere = useAtmosphere() - const settings = useFragment( - graphql` - fragment ReflectTemplateSearchBar_settings on RetrospectiveMeetingSettings { - id - templateSearchQuery - } - `, - settingsRef - ) - const {id: settingsId, templateSearchQuery} = settings - const normalizedTempType = templateType === 'ORGANIZATION' ? 'org' : templateType?.toLowerCase() - - const onChange = (e: ChangeEvent) => { - setTemplateSearch(atmosphere, settingsId, e.currentTarget.value) - } - - const inputRef = useRef(null) - const onKeyDown = (e: React.KeyboardEvent) => { - if (e.key === 'Escape' && inputRef.current) { - e.stopPropagation() - e.preventDefault() - inputRef.current.blur() - } - } - - const handleClear = () => { - inputRef.current?.focus() - clearSearch() - } - - return ( - - - - - - - - - - - - ) -} - -export default ReflectTemplateSearchBar diff --git a/packages/client/modules/meeting/components/RemoveTemplate.tsx b/packages/client/modules/meeting/components/RemoveTemplate.tsx index 5d8c9ab0c1e..b9a594d8d57 100644 --- a/packages/client/modules/meeting/components/RemoveTemplate.tsx +++ b/packages/client/modules/meeting/components/RemoveTemplate.tsx @@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql' +import {RemoveTemplate_teamTemplates$key} from '../../../__generated__/RemoveTemplate_teamTemplates.graphql' import DetailAction from '../../../components/DetailAction' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' @@ -9,7 +10,6 @@ import RemovePokerTemplateMutation from '../../../mutations/RemovePokerTemplateM import RemoveReflectTemplateMutation from '../../../mutations/RemoveReflectTemplateMutation' import {SprintPokerDefaults} from '../../../types/constEnums' import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate' -import {RemoveTemplate_teamTemplates$key} from '../../../__generated__/RemoveTemplate_teamTemplates.graphql' interface Props { gotoPublicTemplates: () => void diff --git a/packages/client/modules/meeting/components/RetroTemplatePicker.tsx b/packages/client/modules/meeting/components/RetroTemplatePicker.tsx deleted file mode 100644 index e115658b103..00000000000 --- a/packages/client/modules/meeting/components/RetroTemplatePicker.tsx +++ /dev/null @@ -1,71 +0,0 @@ -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import NewMeetingDropdown from '../../../components/NewMeetingDropdown' -import useAtmosphere from '../../../hooks/useAtmosphere' -import useModal from '../../../hooks/useModal' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import lazyPreload from '../../../utils/lazyPreload' -import {RetroTemplatePicker_settings$key} from '../../../__generated__/RetroTemplatePicker_settings.graphql' - -interface Props { - settingsRef: RetroTemplatePicker_settings$key -} - -const ReflectTemplateModal = lazyPreload( - () => - import( - /* webpackChunkName: 'ReflectTemplateModal' */ - './ReflectTemplateModal' - ) -) - -const RetroTemplatePicker = (props: Props) => { - const {settingsRef} = props - const settings = useFragment( - graphql` - fragment RetroTemplatePicker_settings on RetrospectiveMeetingSettings { - ...ReflectTemplateModal_retroMeetingSettings - selectedTemplate { - id - name - scope - ...ReflectTemplateDetailsTemplate - } - } - `, - settingsRef - ) - - const {selectedTemplate} = settings - const {name: templateName, scope} = selectedTemplate - const {togglePortal, modalPortal, closePortal} = useModal({ - id: 'templateModal' - }) - const atmosphere = useAtmosphere() - - const handleClick = () => { - togglePortal() - SendClientSideEvent(atmosphere, 'Opened Template Picker', { - meetingType: 'retrospective', - scope - }) - } - - return ( - <> - - {modalPortal( - - )} - - ) -} - -export default RetroTemplatePicker diff --git a/packages/client/modules/meeting/components/ScaleActions.tsx b/packages/client/modules/meeting/components/ScaleActions.tsx index b917e50ad40..301bf51b885 100644 --- a/packages/client/modules/meeting/components/ScaleActions.tsx +++ b/packages/client/modules/meeting/components/ScaleActions.tsx @@ -2,13 +2,13 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' +import {ScaleActions_scale$key} from '../../../__generated__/ScaleActions_scale.graphql' import DetailAction from '../../../components/DetailAction' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' import AddPokerTemplateScaleMutation from '../../../mutations/AddPokerTemplateScaleMutation' import RemovePokerTemplateScaleMutation from '../../../mutations/RemovePokerTemplateScaleMutation' import {Threshold} from '../../../types/constEnums' -import {ScaleActions_scale$key} from '../../../__generated__/ScaleActions_scale.graphql' const CloneAndDelete = styled('div')({ display: 'flex', diff --git a/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx b/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx index aa269931e77..6362418d51e 100644 --- a/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx +++ b/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx @@ -6,12 +6,12 @@ import {useFragment} from 'react-relay' import textOverflow from '~/styles/helpers/textOverflow' import {PALETTE} from '~/styles/paletteV3' import {FONT_FAMILY} from '~/styles/typographyV2' +import {ScaleDropdownMenuItem_dimension$key} from '../../../__generated__/ScaleDropdownMenuItem_dimension.graphql' +import {ScaleDropdownMenuItem_scale$key} from '../../../__generated__/ScaleDropdownMenuItem_scale.graphql' import MenuItem from '../../../components/MenuItem' import useAtmosphere from '../../../hooks/useAtmosphere' import useMutationProps from '../../../hooks/useMutationProps' import UpdatePokerTemplateDimensionScaleMutation from '../../../mutations/UpdatePokerTemplateDimensionScaleMutation' -import {ScaleDropdownMenuItem_dimension$key} from '../../../__generated__/ScaleDropdownMenuItem_dimension.graphql' -import {ScaleDropdownMenuItem_scale$key} from '../../../__generated__/ScaleDropdownMenuItem_scale.graphql' import ScaleActions from './ScaleActions' import scaleValueString from './scaleValueString' diff --git a/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx b/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx index 9f08a8a5820..265485aee72 100644 --- a/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx +++ b/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx @@ -6,10 +6,10 @@ import Menu from '~/components/Menu' import PaletteColor from '~/components/PaletteColor/PaletteColor' import UpdatePokerTemplateScaleValueMutation from '~/mutations/UpdatePokerTemplateScaleValueMutation' import palettePickerOptions from '~/styles/palettePickerOptions' +import {ScaleValuePalettePicker_scale$key} from '../../../__generated__/ScaleValuePalettePicker_scale.graphql' import useAtmosphere from '../../../hooks/useAtmosphere' import {MenuProps} from '../../../hooks/useMenu' import useMutationProps from '../../../hooks/useMutationProps' -import {ScaleValuePalettePicker_scale$key} from '../../../__generated__/ScaleValuePalettePicker_scale.graphql' interface Props { scale: ScaleValuePalettePicker_scale$key diff --git a/packages/client/modules/meeting/components/SelectScaleDropdown.tsx b/packages/client/modules/meeting/components/SelectScaleDropdown.tsx index 07671dec36c..3d7e91864de 100644 --- a/packages/client/modules/meeting/components/SelectScaleDropdown.tsx +++ b/packages/client/modules/meeting/components/SelectScaleDropdown.tsx @@ -3,6 +3,7 @@ import {Add} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {useFragment} from 'react-relay' +import {SelectScaleDropdown_dimension$key} from '../../../__generated__/SelectScaleDropdown_dimension.graphql' import LinkButton from '../../../components/LinkButton' import Menu from '../../../components/Menu' import MenuItem from '../../../components/MenuItem' @@ -13,7 +14,6 @@ import useMutationProps from '../../../hooks/useMutationProps' import AddPokerTemplateScaleMutation from '../../../mutations/AddPokerTemplateScaleMutation' import {FONT_FAMILY} from '../../../styles/typographyV2' import {Threshold} from '../../../types/constEnums' -import {SelectScaleDropdown_dimension$key} from '../../../__generated__/SelectScaleDropdown_dimension.graphql' import ScaleDropdownMenuItem from './ScaleDropdownMenuItem' interface Props { diff --git a/packages/client/modules/meeting/components/SelectTemplate.tsx b/packages/client/modules/meeting/components/SelectTemplate.tsx deleted file mode 100644 index d101abe3304..00000000000 --- a/packages/client/modules/meeting/components/SelectTemplate.tsx +++ /dev/null @@ -1,115 +0,0 @@ -import {keyframes} from '@emotion/core' -import styled from '@emotion/styled' -import {Check} from '@mui/icons-material' -import graphql from 'babel-plugin-relay/macro' -import React from 'react' -import {useFragment} from 'react-relay' -import {useHistory} from 'react-router' -import FloatingActionButton from '../../../components/FloatingActionButton' -import StyledError from '../../../components/StyledError' -import useAtmosphere from '../../../hooks/useAtmosphere' -import useMutationProps from '../../../hooks/useMutationProps' -import SelectTemplateMutation from '../../../mutations/SelectTemplateMutation' -import SendClientSideEvent from '../../../utils/SendClientSideEvent' -import {BezierCurve} from '../../../types/constEnums' -import {TierEnum} from '../../../__generated__/ReflectTemplateListPublicQuery.graphql' -import {SelectTemplate_template$key} from '../../../__generated__/SelectTemplate_template.graphql' - -const fadein = keyframes` -0% { opacity: 0; } -100% { opacity: 1; } -` - -const ButtonBlock = styled('div')({ - animation: `${fadein} 200ms ${BezierCurve.DECELERATE}`, - alignItems: 'flex-end', - display: 'flex', - flexDirection: 'column', - justifyContent: 'flex-end', - pointerEvents: 'none', - position: 'absolute', - right: 16, - bottom: 16, - width: '100%', - zIndex: 1 -}) - -const Button = styled(FloatingActionButton)({ - border: 0, - fontSize: 16, - padding: '8px 20px', - pointerEvents: 'all' -}) - -const UpgradeButton = styled(Button)({ - padding: '10px 24px' -}) - -const StyledIcon = styled(Check)({ - marginRight: 4 -}) - -interface Props { - closePortal: () => void - template: SelectTemplate_template$key - teamId: string - tier?: TierEnum - noTemplateLimit?: boolean - orgId?: string -} - -const SelectTemplate = (props: Props) => { - const {template: templateRef, closePortal, teamId, tier, noTemplateLimit, orgId} = props - const template = useFragment( - graphql` - fragment SelectTemplate_template on MeetingTemplate { - id - teamId - scope - isFree - type - } - `, - templateRef - ) - const {id: templateId, isFree, type, scope} = template - const atmosphere = useAtmosphere() - const history = useHistory() - const {submitting, error, onCompleted, onError} = useMutationProps() - const selectTemplate = () => { - SelectTemplateMutation( - atmosphere, - {selectedTemplateId: templateId, teamId}, - {onCompleted, onError} - ) - closePortal() - } - const goToBilling = () => { - SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', { - upgradeCTALocation: 'publicTemplate', - meetingType: type - }) - history.push(`/me/organizations/${orgId}`) - } - const showUpgradeCTA = !isFree && tier === 'starter' && scope === 'PUBLIC' && !noTemplateLimit - if (showUpgradeCTA) { - return ( - - - {'Upgrade Now'} - - - ) - } - return ( - - {error && {error.message}} - - - ) -} - -export default SelectTemplate diff --git a/packages/client/modules/meeting/components/TemplateDimensionItem.tsx b/packages/client/modules/meeting/components/TemplateDimensionItem.tsx index 2de98a069af..1e7e93c0c76 100644 --- a/packages/client/modules/meeting/components/TemplateDimensionItem.tsx +++ b/packages/client/modules/meeting/components/TemplateDimensionItem.tsx @@ -4,12 +4,12 @@ import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {DraggableProvided} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' +import {TemplateDimensionItem_dimensions$key} from '~/__generated__/TemplateDimensionItem_dimensions.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useMutationProps from '~/hooks/useMutationProps' import RemovePokerTemplateDimensionMutation from '~/mutations/RemovePokerTemplateDimensionMutation' -import {TemplateDimensionItem_dimensions$key} from '~/__generated__/TemplateDimensionItem_dimensions.graphql' -import {PALETTE} from '../../../styles/paletteV3' import {TemplateDimensionItem_dimension$key} from '../../../__generated__/TemplateDimensionItem_dimension.graphql' +import {PALETTE} from '../../../styles/paletteV3' import EditableTemplateDimension from './EditableTemplateDimension' import PokerTemplateScalePicker from './PokerTemplateScalePicker' diff --git a/packages/client/modules/meeting/components/TemplateDimensionList.tsx b/packages/client/modules/meeting/components/TemplateDimensionList.tsx index 519f1a63a58..7d352ab5ba4 100644 --- a/packages/client/modules/meeting/components/TemplateDimensionList.tsx +++ b/packages/client/modules/meeting/components/TemplateDimensionList.tsx @@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' +import {TemplateDimensionList_dimensions$key} from '../../../__generated__/TemplateDimensionList_dimensions.graphql' import useAtmosphere from '../../../hooks/useAtmosphere' import MovePokerTemplateDimensionMutation from '../../../mutations/MovePokerTemplateDimensionMutation' import {TEMPLATE_DIMENSION} from '../../../utils/constants' import dndNoise from '../../../utils/dndNoise' -import {TemplateDimensionList_dimensions$key} from '../../../__generated__/TemplateDimensionList_dimensions.graphql' import TemplateDimensionItem from './TemplateDimensionItem' interface Props { diff --git a/packages/client/modules/meeting/components/TemplatePromptItem.tsx b/packages/client/modules/meeting/components/TemplatePromptItem.tsx index 6894fe8ac17..b893c5925dc 100644 --- a/packages/client/modules/meeting/components/TemplatePromptItem.tsx +++ b/packages/client/modules/meeting/components/TemplatePromptItem.tsx @@ -4,12 +4,12 @@ import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {DraggableProvided} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' +import {TemplatePromptItem_prompts$key} from '~/__generated__/TemplatePromptItem_prompts.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useMutationProps from '~/hooks/useMutationProps' -import {TemplatePromptItem_prompts$key} from '~/__generated__/TemplatePromptItem_prompts.graphql' +import {TemplatePromptItem_prompt$key} from '../../../__generated__/TemplatePromptItem_prompt.graphql' import RemoveReflectTemplatePromptMutation from '../../../mutations/RemoveReflectTemplatePromptMutation' import {PALETTE} from '../../../styles/paletteV3' -import {TemplatePromptItem_prompt$key} from '../../../__generated__/TemplatePromptItem_prompt.graphql' import EditableTemplateDescription from './EditableTemplateDescription' import EditableTemplatePrompt from './EditableTemplatePrompt' import EditableTemplatePromptColor from './EditableTemplatePromptColor' diff --git a/packages/client/modules/meeting/components/TemplatePromptList.tsx b/packages/client/modules/meeting/components/TemplatePromptList.tsx index fe41a4cd469..8c7c8317e05 100644 --- a/packages/client/modules/meeting/components/TemplatePromptList.tsx +++ b/packages/client/modules/meeting/components/TemplatePromptList.tsx @@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' +import {TemplatePromptList_prompts$key} from '../../../__generated__/TemplatePromptList_prompts.graphql' import useAtmosphere from '../../../hooks/useAtmosphere' import MoveReflectTemplatePromptMutation from '../../../mutations/MoveReflectTemplatePromptMutation' import {TEMPLATE_PROMPT} from '../../../utils/constants' import dndNoise from '../../../utils/dndNoise' -import {TemplatePromptList_prompts$key} from '../../../__generated__/TemplatePromptList_prompts.graphql' import TemplatePromptItem from './TemplatePromptItem' interface Props { diff --git a/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx b/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx index 77409a53479..739be82b776 100644 --- a/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx +++ b/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx @@ -4,13 +4,13 @@ import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' import {DraggableProvided} from 'react-beautiful-dnd' import {useFragment} from 'react-relay' +import {TemplateScaleValueItem_scale$key} from '~/__generated__/TemplateScaleValueItem_scale.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useMutationProps from '~/hooks/useMutationProps' import RemovePokerTemplateScaleValueMutation from '~/mutations/RemovePokerTemplateScaleValueMutation' -import {TemplateScaleValueItem_scale$key} from '~/__generated__/TemplateScaleValueItem_scale.graphql' +import {TemplateScaleValueItem_scaleValue$key} from '../../../__generated__/TemplateScaleValueItem_scaleValue.graphql' import {PALETTE} from '../../../styles/paletteV3' import isSpecialPokerLabel from '../../../utils/isSpecialPokerLabel' -import {TemplateScaleValueItem_scaleValue$key} from '../../../__generated__/TemplateScaleValueItem_scaleValue.graphql' import EditableTemplateScaleValueColor from './EditableTemplateScaleValueColor' import EditableTemplateScaleValueLabel from './EditableTemplateScaleValueLabel' diff --git a/packages/client/modules/meeting/components/TemplateSharing.tsx b/packages/client/modules/meeting/components/TemplateSharing.tsx index 874fbe3b3a1..a64d315bfd6 100644 --- a/packages/client/modules/meeting/components/TemplateSharing.tsx +++ b/packages/client/modules/meeting/components/TemplateSharing.tsx @@ -3,11 +3,11 @@ import {ExpandMore as ExpandMoreIcon, Share as ShareIcon} from '@mui/icons-mater import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {TemplateSharing_template$key} from '../../../__generated__/TemplateSharing_template.graphql' import {MenuPosition} from '../../../hooks/useCoords' import useMenu from '../../../hooks/useMenu' import {PALETTE} from '../../../styles/paletteV3' import lazyPreload from '../../../utils/lazyPreload' -import {TemplateSharing_template$key} from '../../../__generated__/TemplateSharing_template.graphql' const SelectSharingScopeDropdown = lazyPreload( () => diff --git a/packages/client/modules/newTeam/NewTeam.tsx b/packages/client/modules/newTeam/NewTeam.tsx index 2f1d2ab3080..68a8346979f 100644 --- a/packages/client/modules/newTeam/NewTeam.tsx +++ b/packages/client/modules/newTeam/NewTeam.tsx @@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import useDocumentTitle from '~/hooks/useDocumentTitle' +import {NewTeamQuery} from '../../__generated__/NewTeamQuery.graphql' import IconLabel from '../../components/IconLabel' import LinkButton from '../../components/LinkButton' import useBreakpoint from '../../hooks/useBreakpoint' import {cardShadow} from '../../styles/elevation' import {PALETTE} from '../../styles/paletteV3' import {ExternalLinks} from '../../types/constEnums' -import {NewTeamQuery} from '../../__generated__/NewTeamQuery.graphql' import NewTeamForm from './components/NewTeamForm/NewTeamForm' const NewTeamLayout = styled('div')({ alignItems: 'center', diff --git a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx index 8269686eb2b..5892919926e 100644 --- a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx +++ b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {ChangeEvent, FormEvent, useState} from 'react' import {useFragment} from 'react-relay' +import {NewTeamForm_organizations$key} from '../../../../__generated__/NewTeamForm_organizations.graphql' import Checkbox from '../../../../components/Checkbox' import DashHeaderTitle from '../../../../components/DashHeaderTitle' import FieldLabel from '../../../../components/FieldLabel/FieldLabel' @@ -16,14 +17,13 @@ import useMutationProps from '../../../../hooks/useMutationProps' import useRouter from '../../../../hooks/useRouter' import AddOrgMutation from '../../../../mutations/AddOrgMutation' import AddTeamMutation from '../../../../mutations/AddTeamMutation' -import SendClientSideEvent from '../../../../utils/SendClientSideEvent' import {PALETTE} from '../../../../styles/paletteV3' import {Threshold} from '../../../../types/constEnums' +import SendClientSideEvent from '../../../../utils/SendClientSideEvent' import linkify from '../../../../utils/linkify' import parseEmailAddressList from '../../../../utils/parseEmailAddressList' import Legitity from '../../../../validation/Legitity' import teamNameValidation from '../../../../validation/teamNameValidation' -import {NewTeamForm_organizations$key} from '../../../../__generated__/NewTeamForm_organizations.graphql' import NewTeamOrgPicker from '../../../team/components/NewTeamOrgPicker' import NewTeamFormBlock from './NewTeamFormBlock' import NewTeamFormOrgName from './NewTeamFormOrgName' diff --git a/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx b/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx index 74542d4d6d3..f699fdc8543 100644 --- a/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx +++ b/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx @@ -1,7 +1,7 @@ import React, {Suspense} from 'react' +import newTeamQuery, {NewTeamQuery} from '../../../../__generated__/NewTeamQuery.graphql' import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' import useRouter from '../../../../hooks/useRouter' -import newTeamQuery, {NewTeamQuery} from '../../../../__generated__/NewTeamQuery.graphql' import NewTeam from '../../NewTeam' const NewTeamRoot = () => { diff --git a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx index 30a500b6392..5f1ce1a37ba 100644 --- a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx +++ b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx @@ -3,14 +3,15 @@ import graphql from 'babel-plugin-relay/macro' import {EditorState} from 'draft-js' import React, {memo, RefObject} from 'react' import {useFragment} from 'react-relay' -import EditingStatus from '~/components/EditingStatus/EditingStatus' -import {PALETTE} from '~/styles/paletteV3' import {OutcomeCard_task$key} from '~/__generated__/OutcomeCard_task.graphql' import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql' +import EditingStatus from '~/components/EditingStatus/EditingStatus' +import {PALETTE} from '~/styles/paletteV3' import IntegratedTaskContent from '../../../../components/IntegratedTaskContent' import TaskEditor from '../../../../components/TaskEditor/TaskEditor' import TaskIntegrationLink from '../../../../components/TaskIntegrationLink' import TaskWatermark from '../../../../components/TaskWatermark' +import useAtmosphere from '../../../../hooks/useAtmosphere' import useTaskChildFocus, {UseTaskChild} from '../../../../hooks/useTaskChildFocus' import {cardFocusShadow, cardHoverShadow, cardShadow, Elevation} from '../../../../styles/elevation' import cardRootStyles from '../../../../styles/helpers/cardRootStyles' @@ -21,7 +22,6 @@ import isTempId from '../../../../utils/relay/isTempId' import {taskStatusLabels} from '../../../../utils/taskStatus' import TaskFooter from '../OutcomeCardFooter/TaskFooter' import OutcomeCardStatusIndicator from '../OutcomeCardStatusIndicator/OutcomeCardStatusIndicator' -import useAtmosphere from '../../../../hooks/useAtmosphere' const RootCard = styled('div')<{ isTaskHovered: boolean diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx index c36d02b3385..52da89bd3e3 100644 --- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx +++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx @@ -1,13 +1,15 @@ import graphql from 'babel-plugin-relay/macro' import React, {useMemo, useState} from 'react' import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay' +import {TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery} from '~/__generated__/TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery.graphql' import {EmptyDropdownMenuItemLabel} from '~/components/EmptyDropdownMenuItemLabel' import {SearchMenuItem} from '~/components/SearchMenuItem' import useEventCallback from '~/hooks/useEventCallback' import useModal from '~/hooks/useModal' import useSearchFilter from '~/hooks/useSearchFilter' import {useQueryParameterParser} from '~/utils/useQueryParameterParser' -import {TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery} from '~/__generated__/TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery.graphql' +import {TaskFooterTeamAssigneeMenuQuery} from '../../../../__generated__/TaskFooterTeamAssigneeMenuQuery.graphql' +import {TaskFooterTeamAssigneeMenu_task$key} from '../../../../__generated__/TaskFooterTeamAssigneeMenu_task.graphql' import DropdownMenuLabel from '../../../../components/DropdownMenuLabel' import Menu from '../../../../components/Menu' import MenuItem from '../../../../components/MenuItem' @@ -15,8 +17,6 @@ import useAtmosphere from '../../../../hooks/useAtmosphere' import {MenuProps} from '../../../../hooks/useMenu' import useMutationProps from '../../../../hooks/useMutationProps' import ChangeTaskTeamMutation from '../../../../mutations/ChangeTaskTeamMutation' -import {TaskFooterTeamAssigneeMenuQuery} from '../../../../__generated__/TaskFooterTeamAssigneeMenuQuery.graphql' -import {TaskFooterTeamAssigneeMenu_task$key} from '../../../../__generated__/TaskFooterTeamAssigneeMenu_task.graphql' import TaskFooterTeamAssigneeAddIntegrationDialog from './TaskFooterTeamAssigneeAddIntegrationDialog' const query = graphql` diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx index eb43c9da077..c985bf70f49 100644 --- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx +++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx @@ -1,11 +1,13 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' -import {useFragment, PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay' +import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql' import {EmptyDropdownMenuItemLabel} from '~/components/EmptyDropdownMenuItemLabel' import {SearchMenuItem} from '~/components/SearchMenuItem' import useSearchFilter from '~/hooks/useSearchFilter' -import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql' +import {TaskFooterUserAssigneeMenuQuery} from '../../../../__generated__/TaskFooterUserAssigneeMenuQuery.graphql' +import {TaskFooterUserAssigneeMenu_task$key} from '../../../../__generated__/TaskFooterUserAssigneeMenu_task.graphql' import DropdownMenuLabel from '../../../../components/DropdownMenuLabel' import Menu from '../../../../components/Menu' import MenuAvatar from '../../../../components/MenuAvatar' @@ -15,8 +17,6 @@ import useAtmosphere from '../../../../hooks/useAtmosphere' import {MenuProps} from '../../../../hooks/useMenu' import UpdateTaskMutation from '../../../../mutations/UpdateTaskMutation' import avatarUser from '../../../../styles/theme/images/avatar-user.svg' -import {TaskFooterUserAssigneeMenuQuery} from '../../../../__generated__/TaskFooterUserAssigneeMenuQuery.graphql' -import {TaskFooterUserAssigneeMenu_task$key} from '../../../../__generated__/TaskFooterUserAssigneeMenu_task.graphql' const StyledPreferredName = styled('div')({ whiteSpace: 'nowrap', diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx index 77a8f7e9708..6853f991fd0 100644 --- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx +++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx @@ -4,6 +4,7 @@ import {EditorState} from 'draft-js' import React from 'react' import {useFragment} from 'react-relay' import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql' +import {TaskFooter_task$key} from '../../../../__generated__/TaskFooter_task.graphql' import CardButton from '../../../../components/CardButton' import IconLabel from '../../../../components/IconLabel' import useAtmosphere from '../../../../hooks/useAtmosphere' @@ -15,7 +16,6 @@ import {USER_DASH} from '../../../../utils/constants' import removeContentTag from '../../../../utils/draftjs/removeContentTag' import isTaskArchived from '../../../../utils/isTaskArchived' import setLocalTaskError from '../../../../utils/relay/setLocalTaskError' -import {TaskFooter_task$key} from '../../../../__generated__/TaskFooter_task.graphql' import OutcomeCardMessage from '../OutcomeCardMessage/OutcomeCardMessage' import TaskFooterIntegrateToggle from './TaskFooterIntegrateToggle' import TaskFooterTagMenuToggle from './TaskFooterTagMenuToggle' diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx index 58f47f7dd07..bcf5f8e1cd0 100644 --- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx +++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx @@ -1,7 +1,7 @@ import {EditorState} from 'draft-js' import React from 'react' -import useTooltip from '~/hooks/useTooltip' import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql' +import useTooltip from '~/hooks/useTooltip' import CardButton from '../../../../components/CardButton' import IconLabel from '../../../../components/IconLabel' import {MenuPosition} from '../../../../hooks/useCoords' diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx index b8ef7a9eecc..06478015f97 100644 --- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx +++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx @@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useTooltip from '~/hooks/useTooltip' +import {TaskFooterTeamAssignee_task$key} from '../../../../__generated__/TaskFooterTeamAssignee_task.graphql' import CardButton from '../../../../components/CardButton' import {MenuPosition} from '../../../../hooks/useCoords' import useMenu from '../../../../hooks/useMenu' @@ -11,7 +12,6 @@ import textOverflow from '../../../../styles/helpers/textOverflow' import {PALETTE} from '../../../../styles/paletteV3' import {Radius} from '../../../../types/constEnums' import lazyPreload from '../../../../utils/lazyPreload' -import {TaskFooterTeamAssignee_task$key} from '../../../../__generated__/TaskFooterTeamAssignee_task.graphql' const TooltipToggle = styled('div')({ width: '100%' diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx index aa6f98b71b2..c9d2744f814 100644 --- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx +++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx @@ -4,6 +4,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useTooltip from '~/hooks/useTooltip' +import {TaskFooterUserAssignee_task$key} from '../../../../__generated__/TaskFooterUserAssignee_task.graphql' import BaseButton from '../../../../components/BaseButton' import {MenuPosition} from '../../../../hooks/useCoords' import useMenu from '../../../../hooks/useMenu' @@ -12,7 +13,6 @@ import textOverflow from '../../../../styles/helpers/textOverflow' import {PALETTE} from '../../../../styles/paletteV3' import avatarUser from '../../../../styles/theme/images/avatar-user.svg' import lazyPreload from '../../../../utils/lazyPreload' -import {TaskFooterUserAssignee_task$key} from '../../../../__generated__/TaskFooterUserAssignee_task.graphql' const label = { ...textOverflow, diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx index fdd078811bf..820389e901e 100644 --- a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx +++ b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx @@ -3,6 +3,7 @@ import {EditorState} from 'draft-js' import React from 'react' import {useFragment} from 'react-relay' import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql' +import {TaskFooterTagMenu_task$key} from '../../../../__generated__/TaskFooterTagMenu_task.graphql' import Menu from '../../../../components/Menu' import MenuItem from '../../../../components/MenuItem' import MenuItemDot from '../../../../components/MenuItemDot' @@ -18,7 +19,6 @@ import {TaskStatus} from '../../../../types/constEnums' import addContentTag from '../../../../utils/draftjs/addContentTag' import removeContentTag from '../../../../utils/draftjs/removeContentTag' import isTaskPrivate from '../../../../utils/isTaskPrivate' -import {TaskFooterTagMenu_task$key} from '../../../../__generated__/TaskFooterTagMenu_task.graphql' import TaskFooterTagMenuStatusItem from './TaskFooterTagMenuStatusItem' const statusItems = [TaskStatus.DONE, TaskStatus.ACTIVE, TaskStatus.STUCK, TaskStatus.FUTURE] diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx index 082ede4e2c7..80b15babf37 100644 --- a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx +++ b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx @@ -2,13 +2,13 @@ import graphql from 'babel-plugin-relay/macro' import React, {forwardRef} from 'react' import {useFragment} from 'react-relay' import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql' +import {TaskFooterTagMenuStatusItem_task$key} from '../../../../__generated__/TaskFooterTagMenuStatusItem_task.graphql' import MenuItem from '../../../../components/MenuItem' import MenuItemDot from '../../../../components/MenuItemDot' import MenuItemLabel from '../../../../components/MenuItemLabel' import useAtmosphere from '../../../../hooks/useAtmosphere' import UpdateTaskMutation from '../../../../mutations/UpdateTaskMutation' import {taskStatusColors, taskStatusLabels} from '../../../../utils/taskStatus' -import {TaskFooterTagMenuStatusItem_task$key} from '../../../../__generated__/TaskFooterTagMenuStatusItem_task.graphql' interface Props { area: AreaEnum diff --git a/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx b/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx index 3a0099ffc19..1d9bb53ad24 100644 --- a/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx +++ b/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx @@ -1,15 +1,15 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' -import {MenuProps} from '../../../hooks/useMenu' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' -import {UseTaskChild} from '../../../hooks/useTaskChildFocus' -import {Loader} from '../../../utils/relay/renderLoader' import taskFooterUserAssigneeMenuQuery, { TaskFooterUserAssigneeMenuQuery } from '../../../__generated__/TaskFooterUserAssigneeMenuQuery.graphql' import {TaskFooterUserAssigneeMenuRoot_task$key} from '../../../__generated__/TaskFooterUserAssigneeMenuRoot_task.graphql' import {AreaEnum} from '../../../__generated__/UpdateTaskMutation.graphql' +import {MenuProps} from '../../../hooks/useMenu' +import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' +import {UseTaskChild} from '../../../hooks/useTaskChildFocus' +import {Loader} from '../../../utils/relay/renderLoader' import TaskFooterUserAssigneeMenu from './OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu' interface Props { diff --git a/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx b/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx index b736bcf20b0..14e9804204c 100644 --- a/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx +++ b/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx @@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro' import {ContentState, convertToRaw} from 'draft-js' import React, {memo, useEffect, useRef, useState} from 'react' import {useFragment} from 'react-relay' +import {OutcomeCardContainer_task$key} from '~/__generated__/OutcomeCardContainer_task.graphql' +import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql' import useClickAway from '~/hooks/useClickAway' import useScrollIntoView from '~/hooks/useScrollIntoVIew' import SetTaskHighlightMutation from '~/mutations/SetTaskHighlightMutation' -import {OutcomeCardContainer_task$key} from '~/__generated__/OutcomeCardContainer_task.graphql' -import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql' import useAtmosphere from '../../../../hooks/useAtmosphere' import useEditorState from '../../../../hooks/useEditorState' import useTaskChildFocus from '../../../../hooks/useTaskChildFocus' diff --git a/packages/client/modules/summary/components/NewMeetingSummary.tsx b/packages/client/modules/summary/components/NewMeetingSummary.tsx index 11e11406a67..cb42c5637a8 100644 --- a/packages/client/modules/summary/components/NewMeetingSummary.tsx +++ b/packages/client/modules/summary/components/NewMeetingSummary.tsx @@ -1,8 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' -import DashSidebar from '../../../components/Dashboard/DashSidebar' +import {NewMeetingSummaryQuery} from '../../../__generated__/NewMeetingSummaryQuery.graphql' import DashTopBar from '../../../components/DashTopBar' +import DashSidebar from '../../../components/Dashboard/DashSidebar' import MeetingLockedOverlay from '../../../components/MeetingLockedOverlay' import useDocumentTitle from '../../../hooks/useDocumentTitle' import useRouter from '../../../hooks/useRouter' @@ -12,7 +13,6 @@ import {APP_CORS_OPTIONS} from '../../../types/cors' import {MEETING_SUMMARY_LABEL} from '../../../utils/constants' import isDemoRoute from '../../../utils/isDemoRoute' import makeHref from '../../../utils/makeHref' -import {NewMeetingSummaryQuery} from '../../../__generated__/NewMeetingSummaryQuery.graphql' import {demoTeamId} from '../../demo/initDB' import MeetingSummaryEmail from '../../email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail' diff --git a/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx b/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx index 1d318a7aef2..9ba0a91c003 100644 --- a/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx +++ b/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx @@ -1,11 +1,11 @@ import React, {Suspense} from 'react' +import newMeetingSummaryQuery, { + NewMeetingSummaryQuery +} from '../../../__generated__/NewMeetingSummaryQuery.graphql' import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' import useRouter from '../../../hooks/useRouter' import {LoaderSize} from '../../../types/constEnums' import {Loader} from '../../../utils/relay/renderLoader' -import newMeetingSummaryQuery, { - NewMeetingSummaryQuery -} from '../../../__generated__/NewMeetingSummaryQuery.graphql' import NewMeetingSummary from './NewMeetingSummary' const NewMeetingSummaryRoot = () => { diff --git a/packages/client/modules/team/components/NewTeamOrgPicker.tsx b/packages/client/modules/team/components/NewTeamOrgPicker.tsx index f0e942e07da..a4f208672b4 100644 --- a/packages/client/modules/team/components/NewTeamOrgPicker.tsx +++ b/packages/client/modules/team/components/NewTeamOrgPicker.tsx @@ -2,13 +2,13 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useEffect, useMemo} from 'react' import {useFragment} from 'react-relay' +import {NewTeamOrgPicker_organizations$key} from '../../../__generated__/NewTeamOrgPicker_organizations.graphql' import DropdownMenuToggle from '../../../components/DropdownMenuToggle' import TierTag from '../../../components/Tag/TierTag' import {MenuPosition} from '../../../hooks/useCoords' import useMenu from '../../../hooks/useMenu' import lazyPreload from '../../../utils/lazyPreload' import sortByTier from '../../../utils/sortByTier' -import {NewTeamOrgPicker_organizations$key} from '../../../__generated__/NewTeamOrgPicker_organizations.graphql' const MenuToggleInner = styled('div')({ alignItems: 'center', diff --git a/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx b/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx index 81e30e21738..774fe017c27 100644 --- a/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx +++ b/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx @@ -3,6 +3,7 @@ import {Add} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {useRef} from 'react' import {useFragment} from 'react-relay' +import {AgendaInput_team$key} from '../../../../__generated__/AgendaInput_team.graphql' import useAtmosphere from '../../../../hooks/useAtmosphere' import useAtmosphereListener from '../../../../hooks/useAtmosphereListener' import {MenuPosition} from '../../../../hooks/useCoords' @@ -17,7 +18,6 @@ import {PALETTE} from '../../../../styles/paletteV3' import ui from '../../../../styles/ui' import getNextSortOrder from '../../../../utils/getNextSortOrder' import toTeamMemberId from '../../../../utils/relay/toTeamMemberId' -import {AgendaInput_team$key} from '../../../../__generated__/AgendaInput_team.graphql' const AgendaInputBlock = styled('div')({ padding: `8px 0`, diff --git a/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx b/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx index 3fe10d1af0c..f338fe6a7a0 100644 --- a/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx +++ b/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx @@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import { - AgendaListAndInput_meeting$key, - AgendaListAndInput_meeting$data + AgendaListAndInput_meeting$data, + AgendaListAndInput_meeting$key } from '~/__generated__/AgendaListAndInput_meeting.graphql' -import useGotoStageId from '../../../../hooks/useGotoStageId' import {AgendaListAndInput_team$key} from '../../../../__generated__/AgendaListAndInput_team.graphql' +import useGotoStageId from '../../../../hooks/useGotoStageId' import AgendaInput from '../AgendaInput/AgendaInput' import AgendaList from '../AgendaList/AgendaList' diff --git a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx index dfa5e8319cc..b72437a5de2 100644 --- a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx +++ b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {ArchiveOrganizationForm_organization$key} from '~/__generated__/ArchiveOrganizationForm_organization.graphql' import useAtmosphere from '~/hooks/useAtmosphere' import useForm from '~/hooks/useForm' import useMutationProps from '~/hooks/useMutationProps' import useRouter from '~/hooks/useRouter' import ArchiveOrganizationMutation from '~/mutations/ArchiveOrganizationMutation' -import {ArchiveOrganizationForm_organization$key} from '~/__generated__/ArchiveOrganizationForm_organization.graphql' import FieldLabel from '../../../../components/FieldLabel/FieldLabel' import BasicInput from '../../../../components/InputField/BasicInput' import Legitity from '../../../../validation/Legitity' diff --git a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx index cd390663f21..bc57a0a1419 100644 --- a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx +++ b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx @@ -2,12 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {ArchiveTeamForm_team$key} from '~/__generated__/ArchiveTeamForm_team.graphql' import SecondaryButton from '~/components/SecondaryButton' import useAtmosphere from '~/hooks/useAtmosphere' import useForm from '~/hooks/useForm' import useMutationProps from '~/hooks/useMutationProps' import useRouter from '~/hooks/useRouter' -import {ArchiveTeamForm_team$key} from '~/__generated__/ArchiveTeamForm_team.graphql' import FieldLabel from '../../../../components/FieldLabel/FieldLabel' import BasicInput from '../../../../components/InputField/BasicInput' import PrimaryButton from '../../../../components/PrimaryButton' diff --git a/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx b/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx index 295d27e9862..257f4525787 100644 --- a/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx +++ b/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx @@ -3,12 +3,12 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' +import {EditableTeamName_team$key} from '../../../../__generated__/EditableTeamName_team.graphql' import EditableText from '../../../../components/EditableText' import UpdateTeamNameMutation from '../../../../mutations/UpdateTeamNameMutation' import {FONT_FAMILY} from '../../../../styles/typographyV2' import withMutationProps, {WithMutationProps} from '../../../../utils/relay/withMutationProps' import teamNameValidation from '../../../../validation/teamNameValidation' -import {EditableTeamName_team$key} from '../../../../__generated__/EditableTeamName_team.graphql' interface Props extends WithMutationProps { team: EditableTeamName_team$key diff --git a/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx b/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx index b90e145b708..6354a84f718 100644 --- a/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx +++ b/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {LeaveTeamModal_teamMember$key} from '../../../../__generated__/LeaveTeamModal_teamMember.graphql' import DialogContainer from '../../../../components/DialogContainer' import DialogContent from '../../../../components/DialogContent' import DialogTitle from '../../../../components/DialogTitle' @@ -10,7 +11,6 @@ import PrimaryButton from '../../../../components/PrimaryButton' import useAtmosphere from '../../../../hooks/useAtmosphere' import useRouter from '../../../../hooks/useRouter' import RemoveTeamMemberMutation from '../../../../mutations/RemoveTeamMemberMutation' -import {LeaveTeamModal_teamMember$key} from '../../../../__generated__/LeaveTeamModal_teamMember.graphql' const StyledDialogContainer = styled(DialogContainer)({ width: 356 diff --git a/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx b/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx index 5c4208bd2e8..8536b80cd54 100644 --- a/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx +++ b/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx @@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' +import {PromoteTeamMemberModal_teamMember$key} from '../../../../__generated__/PromoteTeamMemberModal_teamMember.graphql' import DialogContainer from '../../../../components/DialogContainer' import DialogContent from '../../../../components/DialogContent' import DialogTitle from '../../../../components/DialogTitle' @@ -10,7 +11,6 @@ import IconLabel from '../../../../components/IconLabel' import PrimaryButton from '../../../../components/PrimaryButton' import PromoteToTeamLeadMutation from '../../../../mutations/PromoteToTeamLeadMutation' import withMutationProps, {WithMutationProps} from '../../../../utils/relay/withMutationProps' -import {PromoteTeamMemberModal_teamMember$key} from '../../../../__generated__/PromoteTeamMemberModal_teamMember.graphql' const StyledDialogContainer = styled(DialogContainer)({ width: 420 diff --git a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx index 6f2360fad6b..2e5881b2706 100644 --- a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx @@ -2,18 +2,18 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {ProviderListQuery} from '../../../../__generated__/ProviderListQuery.graphql' import SettingsWrapper from '../../../../components/Settings/SettingsWrapper' import {PALETTE} from '../../../../styles/paletteV3' -import {ProviderListQuery} from '../../../../__generated__/ProviderListQuery.graphql' import AtlassianProviderRow from '../ProviderRow/AtlassianProviderRow' import AzureDevOpsProviderRow from '../ProviderRow/AzureDevOpsProviderRow' +import GcalProviderRow from '../ProviderRow/GcalProviderRow' import GitHubProviderRow from '../ProviderRow/GitHubProviderRow' import GitLabProviderRow from '../ProviderRow/GitLabProviderRow' import JiraServerProviderRow from '../ProviderRow/JiraServerProviderRow' -import MattermostProviderRow from '../ProviderRow/MattermostProviderRow' import MSTeamsProviderRow from '../ProviderRow/MSTeamsProviderRow' +import MattermostProviderRow from '../ProviderRow/MattermostProviderRow' import SlackProviderRow from '../ProviderRow/SlackProviderRow' -import GcalProviderRow from '../ProviderRow/GcalProviderRow' interface Props { queryRef: PreloadedQuery diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx index e88012c723b..f9cbb9c06b5 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx @@ -3,6 +3,7 @@ import jwtDecode from 'jwt-decode' import React, {useEffect, useMemo} from 'react' import {useFragment} from 'react-relay' import AtlassianProviderLogo from '../../../../AtlassianProviderLogo' +import {AtlassianProviderRow_viewer$key} from '../../../../__generated__/AtlassianProviderRow_viewer.graphql' import AtlassianConfigMenu from '../../../../components/AtlassianConfigMenu' import useAtmosphere from '../../../../hooks/useAtmosphere' import {MenuPosition} from '../../../../hooks/useCoords' @@ -11,7 +12,6 @@ import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutation import {AuthToken} from '../../../../types/AuthToken' import {ExternalLinks, Providers} from '../../../../types/constEnums' import AtlassianClientManager, {ERROR_POPUP_CLOSED} from '../../../../utils/AtlassianClientManager' -import {AtlassianProviderRow_viewer$key} from '../../../../__generated__/AtlassianProviderRow_viewer.graphql' import ProviderRow from './ProviderRow' interface Props { diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx index 69de67e2b2c..c8675c83689 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx @@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' +import {AzureDevOpsProviderRow_viewer$key} from '../../../../__generated__/AzureDevOpsProviderRow_viewer.graphql' import AzureDevOpsConfigMenu from '../../../../components/AzureDevOpsConfigMenu' import AzureDevOpsProviderLogo from '../../../../components/AzureDevOpsProviderLogo' import {MenuPosition} from '../../../../hooks/useCoords' @@ -9,7 +10,6 @@ import useMenu from '../../../../hooks/useMenu' import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutationProps' import {Providers} from '../../../../types/constEnums' import AzureDevOpsClientManager from '../../../../utils/AzureDevOpsClientManager' -import {AzureDevOpsProviderRow_viewer$key} from '../../../../__generated__/AzureDevOpsProviderRow_viewer.graphql' import ProviderRow from './ProviderRow' interface Props { diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx index c29ac58985a..208ede99d93 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx @@ -1,16 +1,16 @@ -import React from 'react' import graphql from 'babel-plugin-relay/macro' +import React from 'react' +import {useFragment} from 'react-relay' +import {GcalProviderRow_viewer$key} from '../../../../__generated__/GcalProviderRow_viewer.graphql' +import GcalConfigMenu from '../../../../components/GcalConfigMenu' import GcalProviderLogo from '../../../../components/GcalProviderLogo' +import useAtmosphere from '../../../../hooks/useAtmosphere' import {MenuPosition} from '../../../../hooks/useCoords' import useMenu from '../../../../hooks/useMenu' import useMutationProps from '../../../../hooks/useMutationProps' import {Providers} from '../../../../types/constEnums' -import ProviderRow from './ProviderRow' -import GcalConfigMenu from '../../../../components/GcalConfigMenu' -import {useFragment} from 'react-relay' -import useAtmosphere from '../../../../hooks/useAtmosphere' -import {GcalProviderRow_viewer$key} from '../../../../__generated__/GcalProviderRow_viewer.graphql' import GcalClientManager from '../../../../utils/GcalClientManager' +import ProviderRow from './ProviderRow' type Props = { teamId: string diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx index fbb70f01cc2..9fcb4f755b9 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx @@ -1,6 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {GitHubProviderRow_viewer$key} from '../../../../__generated__/GitHubProviderRow_viewer.graphql' import GitHubConfigMenu from '../../../../components/GitHubConfigMenu' import GitHubProviderLogo from '../../../../components/GitHubProviderLogo' import useAtmosphere from '../../../../hooks/useAtmosphere' @@ -9,7 +10,6 @@ import useMenu from '../../../../hooks/useMenu' import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutationProps' import {Providers} from '../../../../types/constEnums' import GitHubClientManager from '../../../../utils/GitHubClientManager' -import {GitHubProviderRow_viewer$key} from '../../../../__generated__/GitHubProviderRow_viewer.graphql' import ProviderRow from './ProviderRow' interface Props { diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx index 7750f4b48c7..187e453ac1e 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx @@ -1,13 +1,13 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {GitLabProviderRow_viewer$key} from '../../../../__generated__/GitLabProviderRow_viewer.graphql' import GitLabProviderLogo from '../../../../components/GitLabProviderLogo' import useAtmosphere from '../../../../hooks/useAtmosphere' import {MenuPosition} from '../../../../hooks/useCoords' import useMenu from '../../../../hooks/useMenu' import useMutationProps from '../../../../hooks/useMutationProps' import GitLabClientManager from '../../../../utils/GitLabClientManager' -import {GitLabProviderRow_viewer$key} from '../../../../__generated__/GitLabProviderRow_viewer.graphql' import GitLabConfigMenu from './GitLabConfigMenu' import ProviderRow from './ProviderRow' diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx index 4c231bbae2c..c7ec67958d9 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx @@ -8,9 +8,9 @@ import useAtmosphere from '../../../../hooks/useAtmosphere' import {MenuPosition} from '../../../../hooks/useCoords' import useMenu from '../../../../hooks/useMenu' import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutationProps' -import SendClientSideEvent from '../../../../utils/SendClientSideEvent' import {ExternalLinks, Providers} from '../../../../types/constEnums' import JiraServerClientManager from '../../../../utils/JiraServerClientManager' +import SendClientSideEvent from '../../../../utils/SendClientSideEvent' import ProviderRowContactUs from './ProviderRowContactUs' interface Props { diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx index 9f42ae9afee..4b4ea36591d 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx @@ -2,11 +2,12 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {FormEvent} from 'react' import {useFragment} from 'react-relay' +import {MSTeamsPanel_viewer$key} from '~/__generated__/MSTeamsPanel_viewer.graphql' import {MenuPosition} from '~/hooks/useCoords' import useForm from '~/hooks/useForm' import useTooltip from '~/hooks/useTooltip' import linkify from '~/utils/linkify' -import {MSTeamsPanel_viewer$key} from '~/__generated__/MSTeamsPanel_viewer.graphql' +import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../../../../__generated__/AddIntegrationProviderMutation.graphql' import FlatButton from '../../../../components/FlatButton' import BasicInput from '../../../../components/InputField/BasicInput' import LabelHeading from '../../../../components/LabelHeading/LabelHeading' @@ -19,7 +20,6 @@ import UpdateIntegrationProviderMutation from '../../../../mutations/UpdateInteg import {PALETTE} from '../../../../styles/paletteV3' import {Layout} from '../../../../types/constEnums' import Legitity from '../../../../validation/Legitity' -import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../../../../__generated__/AddIntegrationProviderMutation.graphql' interface Props { viewerRef: MSTeamsPanel_viewer$key diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx index d8f0a8147c6..fb67dfbb884 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx @@ -3,11 +3,12 @@ import {Info as InfoIcon} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {FormEvent} from 'react' import {useFragment} from 'react-relay' +import {MattermostPanel_viewer$key} from '~/__generated__/MattermostPanel_viewer.graphql' import {MenuPosition} from '~/hooks/useCoords' import useForm from '~/hooks/useForm' import useTooltip from '~/hooks/useTooltip' import linkify from '~/utils/linkify' -import {MattermostPanel_viewer$key} from '~/__generated__/MattermostPanel_viewer.graphql' +import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../../../../__generated__/AddIntegrationProviderMutation.graphql' import FlatButton from '../../../../components/FlatButton' import BasicInput from '../../../../components/InputField/BasicInput' import LabelHeading from '../../../../components/LabelHeading/LabelHeading' @@ -20,7 +21,6 @@ import UpdateIntegrationProviderMutation from '../../../../mutations/UpdateInteg import {PALETTE} from '../../../../styles/paletteV3' import {Layout} from '../../../../types/constEnums' import Legitity from '../../../../validation/Legitity' -import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../../../../__generated__/AddIntegrationProviderMutation.graphql' interface Props { viewerRef: MattermostPanel_viewer$key diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx index 793b7dee707..9b25abbe96b 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx @@ -8,8 +8,8 @@ import useAtmosphere from '../../../../hooks/useAtmosphere' import {MenuPosition} from '../../../../hooks/useCoords' import useMenu from '../../../../hooks/useMenu' import useMutationProps from '../../../../hooks/useMutationProps' -import lazyPreload from '../../../../utils/lazyPreload' import SlackClientManager from '../../../../utils/SlackClientManager' +import lazyPreload from '../../../../utils/lazyPreload' interface Props { isTokenValid: boolean diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx index 399d34aa072..f6029e9502b 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx @@ -3,6 +3,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import SetDefaultSlackChannelMutation from '~/mutations/SetDefaultSlackChannelMutation' +import { + SlackNotificationEventEnum, + SlackNotificationList_viewer$key +} from '../../../../__generated__/SlackNotificationList_viewer.graphql' import LabelHeading from '../../../../components/LabelHeading/LabelHeading' import {SlackChannelDropdownOnClick} from '../../../../components/SlackChannelDropdown' import StyledError from '../../../../components/StyledError' @@ -13,10 +17,6 @@ import useSlackChannels from '../../../../hooks/useSlackChannels' import SetSlackNotificationMutation from '../../../../mutations/SetSlackNotificationMutation' import {PALETTE} from '../../../../styles/paletteV3' import {Layout} from '../../../../types/constEnums' -import { - SlackNotificationEventEnum, - SlackNotificationList_viewer$key -} from '../../../../__generated__/SlackNotificationList_viewer.graphql' import SlackChannelPicker from './SlackChannelPicker' import SlackNotificationRow from './SlackNotificationRow' diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx index 52e5393c417..8c832e697bd 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx @@ -2,16 +2,16 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import { + SlackNotificationEventEnum, + SlackNotificationRow_viewer$key +} from '../../../../__generated__/SlackNotificationRow_viewer.graphql' import StyledError from '../../../../components/StyledError' import Toggle from '../../../../components/Toggle/Toggle' import useAtmosphere from '../../../../hooks/useAtmosphere' import useMutationProps from '../../../../hooks/useMutationProps' import SetSlackNotificationMutation from '../../../../mutations/SetSlackNotificationMutation' import {MeetingLabels} from '../../../../types/constEnums' -import { - SlackNotificationEventEnum, - SlackNotificationRow_viewer$key -} from '../../../../__generated__/SlackNotificationRow_viewer.graphql' interface Props { event: SlackNotificationEventEnum diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx index 5f8ae1def86..f11a91bb864 100644 --- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx +++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx @@ -1,6 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {SlackProviderRow_viewer$key} from '../../../../__generated__/SlackProviderRow_viewer.graphql' import SlackConfigMenu from '../../../../components/SlackConfigMenu' import SlackProviderLogo from '../../../../components/SlackProviderLogo' import useAtmosphere from '../../../../hooks/useAtmosphere' @@ -9,7 +10,6 @@ import useMenu from '../../../../hooks/useMenu' import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutationProps' import {Providers} from '../../../../types/constEnums' import SlackClientManager from '../../../../utils/SlackClientManager' -import {SlackProviderRow_viewer$key} from '../../../../__generated__/SlackProviderRow_viewer.graphql' import ProviderRow from './ProviderRow' import SlackNotificationList from './SlackNotificationList' diff --git a/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx b/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx index cd339f21f81..fb7a5c6a8bb 100644 --- a/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx +++ b/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx @@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import useAtmosphere from '~/hooks/useAtmosphere' +import {RemoveTeamMemberModal_teamMember$key} from '../../../../__generated__/RemoveTeamMemberModal_teamMember.graphql' import DialogContainer from '../../../../components/DialogContainer' import DialogContent from '../../../../components/DialogContent' import DialogTitle from '../../../../components/DialogTitle' import IconLabel from '../../../../components/IconLabel' import PrimaryButton from '../../../../components/PrimaryButton' import RemoveTeamMemberMutation from '../../../../mutations/RemoveTeamMemberMutation' -import {RemoveTeamMemberModal_teamMember$key} from '../../../../__generated__/RemoveTeamMemberModal_teamMember.graphql' const StyledDialogContainer = styled(DialogContainer)({ width: 320 diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx index cc5880c7322..ebaf8d161ea 100644 --- a/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx +++ b/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx @@ -1,10 +1,10 @@ +import {Close} from '@mui/icons-material' import React from 'react' +import DialogTitle from '../../../../components/DialogTitle' +import FlatButton from '../../../../components/FlatButton' import useAtmosphere from '../../../../hooks/useAtmosphere' import useMutationProps from '../../../../hooks/useMutationProps' import BatchArchiveTasksMutation from '../../../../mutations/BatchArchiveTasksMutation' -import {Close} from '@mui/icons-material' -import FlatButton from '../../../../components/FlatButton' -import DialogTitle from '../../../../components/DialogTitle' type Props = { taskIds: string[] diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx index e52ec7dddb3..5ab592b4081 100644 --- a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx +++ b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx @@ -5,15 +5,15 @@ import {Droppable, DroppableProvided, DroppableStateSnapshot} from 'react-beauti import {useFragment} from 'react-relay' import {TaskColumn_teams$key} from '~/__generated__/TaskColumn_teams.graphql' import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql' +import {TaskColumn_tasks$key} from '../../../../__generated__/TaskColumn_tasks.graphql' +import useModal from '../../../../hooks/useModal' import {PALETTE} from '../../../../styles/paletteV3' import {BezierCurve, DroppableType} from '../../../../types/constEnums' import {DONE, TEAM_DASH, USER_DASH} from '../../../../utils/constants' import {taskStatusLabels} from '../../../../utils/taskStatus' -import {TaskColumn_tasks$key} from '../../../../__generated__/TaskColumn_tasks.graphql' +import ArchiveAllDoneTasksModal from './ArchiveAllDoneTasksModal' import TaskColumnAddTask from './TaskColumnAddTask' import TaskColumnInner from './TaskColumnInner' -import useModal from '../../../../hooks/useModal' -import ArchiveAllDoneTasksModal from './ArchiveAllDoneTasksModal' const Column = styled('div')<{isDragging: boolean}>(({isDragging}) => ({ background: isDragging ? PALETTE.SLATE_300 : undefined, diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx index 58b3f8768c8..d58e99dc84c 100644 --- a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx +++ b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx @@ -3,6 +3,7 @@ import React from 'react' import {useFragment} from 'react-relay' import {TaskColumnAddTask_teams$key} from '~/__generated__/TaskColumnAddTask_teams.graphql' import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql' +import {TaskColumnAddTask_tasks$key} from '../../../../__generated__/TaskColumnAddTask_tasks.graphql' import AddTaskButton from '../../../../components/AddTaskButton/AddTaskButton' import useAtmosphere from '../../../../hooks/useAtmosphere' import CreateTaskMutation from '../../../../mutations/CreateTaskMutation' @@ -10,7 +11,6 @@ import dndNoise from '../../../../utils/dndNoise' import getNextSortOrder from '../../../../utils/getNextSortOrder' import fromTeamMemberId from '../../../../utils/relay/fromTeamMemberId' import {taskStatusLabels} from '../../../../utils/taskStatus' -import {TaskColumnAddTask_tasks$key} from '../../../../__generated__/TaskColumnAddTask_tasks.graphql' import TaskColumnAddTaskSelectTeam from './TaskColumnAddTaskSelectTeam' interface Props { diff --git a/packages/client/modules/teamDashboard/components/Team/Team.tsx b/packages/client/modules/teamDashboard/components/Team/Team.tsx index b552e9dcaab..0051f53821a 100644 --- a/packages/client/modules/teamDashboard/components/Team/Team.tsx +++ b/packages/client/modules/teamDashboard/components/Team/Team.tsx @@ -4,11 +4,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {lazy, ReactNode, Suspense} from 'react' import {useFragment} from 'react-relay' import {Layout} from '~/types/constEnums' +import {Team_team$key} from '../../../../__generated__/Team_team.graphql' import DashContent from '../../../../components/Dashboard/DashContent' import FlatButton from '../../../../components/FlatButton' import useRouter from '../../../../hooks/useRouter' import {PALETTE} from '../../../../styles/paletteV3' -import {Team_team$key} from '../../../../__generated__/Team_team.graphql' import EditableTeamName from '../EditTeamName/EditableTeamName' // import DebugButton from '../../../userDashboard/components/UserDashMain/DebugButton' diff --git a/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx b/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx index dd5c27b76fe..3f3f190f8af 100644 --- a/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx +++ b/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx @@ -11,16 +11,16 @@ import { InfiniteLoaderProps } from 'react-virtualized' import {GridCellRenderer, GridCoreProps} from 'react-virtualized/dist/es/Grid' +import {TeamArchive_team$key} from '~/__generated__/TeamArchive_team.graphql' import extractTextFromDraftString from '~/utils/draftjs/extractTextFromDraftString' import getSafeRegex from '~/utils/getSafeRegex' import toTeamMemberId from '~/utils/relay/toTeamMemberId' -import {TeamArchive_team$key} from '~/__generated__/TeamArchive_team.graphql' -import NullableTask from '../../../../components/NullableTask/NullableTask' -import {PALETTE} from '../../../../styles/paletteV3' -import {Card, Layout, MathEnum} from '../../../../types/constEnums' import {TeamArchiveArchivedTasksQuery} from '../../../../__generated__/TeamArchiveArchivedTasksQuery.graphql' import {TeamArchiveQuery} from '../../../../__generated__/TeamArchiveQuery.graphql' import {TeamArchive_query$key} from '../../../../__generated__/TeamArchive_query.graphql' +import NullableTask from '../../../../components/NullableTask/NullableTask' +import {PALETTE} from '../../../../styles/paletteV3' +import {Card, Layout, MathEnum} from '../../../../types/constEnums' import UserTasksHeader from '../../../userDashboard/components/UserTasksHeader/UserTasksHeader' import getRallyLink from '../../../userDashboard/helpers/getRallyLink' import TeamArchiveHeader from '../TeamArchiveHeader/TeamArchiveHeader' diff --git a/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx b/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx index 7f5963a3a04..1698bc099a5 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx @@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {TeamDashActivityTab_team$key} from '~/__generated__/TeamDashActivityTab_team.graphql' -import useTransition from '../../../../hooks/useTransition' -import MeetingCard from '../../../../components/MeetingCard' import DemoMeetingCard from '../../../../components/DemoMeetingCard' +import MeetingCard from '../../../../components/MeetingCard' import TutorialMeetingCard from '../../../../components/TutorialMeetingCard' +import useTransition from '../../../../hooks/useTransition' import TeamDashInsights from '../TeamDashInsights/TeamDashInsights' interface Props { diff --git a/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx b/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx index 86274843a65..d4b427dcffd 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx @@ -8,6 +8,7 @@ import {NavLink} from 'react-router-dom' import DashboardAvatars from '~/components/DashboardAvatars/DashboardAvatars' import AgendaToggle from '~/modules/teamDashboard/components/AgendaToggle/AgendaToggle' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' +import {TeamDashHeader_team$key} from '../../../../__generated__/TeamDashHeader_team.graphql' import DashSectionHeader from '../../../../components/Dashboard/DashSectionHeader' import InviteTeamMemberAvatar from '../../../../components/InviteTeamMemberAvatar' import Tab from '../../../../components/Tab/Tab' @@ -15,7 +16,6 @@ import Tabs from '../../../../components/Tabs/Tabs' import useRouter from '../../../../hooks/useRouter' import {PALETTE} from '../../../../styles/paletteV3' import {Breakpoint} from '../../../../types/constEnums' -import {TeamDashHeader_team$key} from '../../../../__generated__/TeamDashHeader_team.graphql' const desktopBreakpoint = makeMinWidthMediaQuery(Breakpoint.SIDEBAR_LEFT) diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamDashInsights.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamDashInsights.tsx index 219fbe54e83..b44166bfa8d 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamDashInsights.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamDashInsights.tsx @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {TeamDashInsights_insights$key} from '~/__generated__/TeamDashInsights_insights.graphql' -import MostUsedEmojisCard from './MostUsedEmojisCard' import MeetingEngagementCard from './MeetingEngagementCard' +import MostUsedEmojisCard from './MostUsedEmojisCard' import TopRetroTemplatesCard from './TopRetroTemplatesCard' interface Props { diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx index 6e9922db025..7dbec07dc73 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx @@ -1,15 +1,14 @@ +import {Info as InfoIcon, ThumbDown, ThumbUp} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' +import clsx from 'clsx' import React, {ReactNode, useState} from 'react' import {useFragment} from 'react-relay' -import SimpleTooltip from '../../../../components/SimpleTooltip' -import {Info as InfoIcon} from '@mui/icons-material' -import {ThumbUp, ThumbDown} from '@mui/icons-material' +import {TeamInsightsCard_insights$key} from '../../../../__generated__/TeamInsightsCard_insights.graphql' import FlatButton from '../../../../components/FlatButton' -import SendClientSideEvent from '../../../../utils/SendClientSideEvent' +import SimpleTooltip from '../../../../components/SimpleTooltip' import useAtmosphere from '../../../../hooks/useAtmosphere' -import {TeamInsightsCard_insights$key} from '../../../../__generated__/TeamInsightsCard_insights.graphql' import TeamInsightsId from '../../../../shared/gqlIds/TeamInsightsId' -import clsx from 'clsx' +import SendClientSideEvent from '../../../../utils/SendClientSideEvent' interface Props { title: string diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx index 68aff4dab59..76ebc65219e 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {useHistory} from 'react-router' import {TopRetroTemplatesCard_insights$key} from '~/__generated__/TopRetroTemplatesCard_insights.graphql' import SimpleTooltip from '../../../../components/SimpleTooltip' -import TeamInsightsCard from './TeamInsightsCard' import plural from '../../../../utils/plural' -import {useHistory} from 'react-router' +import TeamInsightsCard from './TeamInsightsCard' interface Props { teamInsightsRef: TopRetroTemplatesCard_insights$key diff --git a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx index 9d1cb8125de..49165b16447 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx @@ -2,16 +2,16 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {Route, Switch} from 'react-router-dom' import {TeamDashMainQuery} from '~/__generated__/TeamDashMainQuery.graphql' import StartMeetingFAB from '../../../../components/StartMeetingFAB' import useDocumentTitle from '../../../../hooks/useDocumentTitle' +import getTeamIdFromPathname from '../../../../utils/getTeamIdFromPathname' import TeamTasksHeaderContainer from '../../containers/TeamTasksHeader/TeamTasksHeaderContainer' -import TeamDrawer from './TeamDrawer' -import TeamDashTasksTab from '../TeamDashTasksTab/TeamDashTasksTab' import TeamDashActivityTab from '../TeamDashActivityTab/TeamDashActivityTab' import TeamDashIntegrationsTab from '../TeamDashIntegrationsTab/TeamDashIntegrationsTab' -import {Route, Switch} from 'react-router-dom' -import getTeamIdFromPathname from '../../../../utils/getTeamIdFromPathname' +import TeamDashTasksTab from '../TeamDashTasksTab/TeamDashTasksTab' +import TeamDrawer from './TeamDrawer' const AbsoluteFab = styled(StartMeetingFAB)({ position: 'absolute' diff --git a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx index 185b8a86c8d..629d63eb193 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useRef} from 'react' import {useFragment} from 'react-relay' -import LabelHeading from '~/components/LabelHeading/LabelHeading' import {TeamDrawer_viewer$key} from '~/__generated__/TeamDrawer_viewer.graphql' import {TeamDrawer as TeamDrawerType} from '~/__generated__/ToggleTeamDrawerMutation.graphql' +import LabelHeading from '~/components/LabelHeading/LabelHeading' import MassInvitationTokenLinkRoot from '../../../../components/MassInvitationTokenLinkRoot' import ResponsiveDashSidebar from '../../../../components/ResponsiveDashSidebar' import useAtmosphere from '../../../../hooks/useAtmosphere' diff --git a/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx b/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx index bdf90931725..e689777851d 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx @@ -1,12 +1,12 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' -import useRouter from '../../../hooks/useRouter' +import setPreferredTeamId from '~/utils/relay/setPreferredTeamId' import teamDashMainQuery, { TeamDashMainQuery } from '../../../__generated__/TeamDashMainQuery.graphql' -import TeamDashMain from './TeamDashMain/TeamDashMain' -import setPreferredTeamId from '~/utils/relay/setPreferredTeamId' import useAtmosphere from '../../../hooks/useAtmosphere' +import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' +import useRouter from '../../../hooks/useRouter' +import TeamDashMain from './TeamDashMain/TeamDashMain' const TeamDashMainRoot = () => { const {match} = useRouter<{teamId: string}>() diff --git a/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx b/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx index beecd407edd..0b10307db31 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx @@ -2,14 +2,14 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {TeamDashTasksTab_viewer$key} from '~/__generated__/TeamDashTasksTab_viewer.graphql' -import TeamColumnsContainer from '../../containers/TeamColumns/TeamColumnsContainer' import DashFilterToggle from '~/components/DashFilterToggle/DashFilterToggle' import DashNavControl from '../../../../components/DashNavControl/DashNavControl' -import useRouter from '../../../../hooks/useRouter' -import useMenu from '../../../../hooks/useMenu' +import DashSectionHeader from '../../../../components/Dashboard/DashSectionHeader' import {MenuPosition} from '../../../../hooks/useCoords' +import useMenu from '../../../../hooks/useMenu' +import useRouter from '../../../../hooks/useRouter' import lazyPreload from '../../../../utils/lazyPreload' -import DashSectionHeader from '../../../../components/Dashboard/DashSectionHeader' +import TeamColumnsContainer from '../../containers/TeamColumns/TeamColumnsContainer' const TeamDashTeamMemberMenu = lazyPreload( () => diff --git a/packages/client/modules/teamDashboard/components/TeamRoot.tsx b/packages/client/modules/teamDashboard/components/TeamRoot.tsx index 91f30abec73..4a76301379b 100644 --- a/packages/client/modules/teamDashboard/components/TeamRoot.tsx +++ b/packages/client/modules/teamDashboard/components/TeamRoot.tsx @@ -1,9 +1,9 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' -import useRouter from '../../../hooks/useRouter' import teamContainerQuery, { TeamContainerQuery } from '../../../__generated__/TeamContainerQuery.graphql' +import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' +import useRouter from '../../../hooks/useRouter' import TeamContainer from '../containers/Team/TeamContainer' const TeamRoot = () => { diff --git a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx index 62ffb8f934f..e59561f09fc 100644 --- a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx +++ b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {TeamSettingsQuery} from '../../../../__generated__/TeamSettingsQuery.graphql' import Panel from '../../../../components/Panel/Panel' import PrimaryButton from '../../../../components/PrimaryButton' import Row from '../../../../components/Row/Row' @@ -9,7 +10,6 @@ import useDocumentTitle from '../../../../hooks/useDocumentTitle' import useRouter from '../../../../hooks/useRouter' import {PALETTE} from '../../../../styles/paletteV3' import {Layout, TierLabel} from '../../../../types/constEnums' -import {TeamSettingsQuery} from '../../../../__generated__/TeamSettingsQuery.graphql' import ArchiveTeam from '../ArchiveTeam/ArchiveTeam' const TeamSettingsLayout = styled('div')({ diff --git a/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx b/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx index 99442780b81..4e5150bd2b2 100644 --- a/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx +++ b/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx @@ -1,10 +1,10 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' -import {LoaderSize} from '../../../types/constEnums' -import {Loader} from '../../../utils/relay/renderLoader' import teamSettingsQuery, { TeamSettingsQuery } from '../../../__generated__/TeamSettingsQuery.graphql' +import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' +import {LoaderSize} from '../../../types/constEnums' +import {Loader} from '../../../utils/relay/renderLoader' import TeamSettings from './TeamSettings/TeamSettings' interface Props { diff --git a/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx b/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx index 0017042dde4..bff4ca38f97 100644 --- a/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx +++ b/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx @@ -1,7 +1,9 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' +import {UpgradeCTALocationEnumType} from 'parabol-server/graphql/types/UpgradeCTALocationEnum' import React, {useEffect} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {UnpaidTeamModalQuery} from '../../../../__generated__/UnpaidTeamModalQuery.graphql' import DashModal from '../../../../components/Dashboard/DashModal' import DialogContent from '../../../../components/DialogContent' import DialogTitle from '../../../../components/DialogTitle' @@ -9,11 +11,9 @@ import IconLabel from '../../../../components/IconLabel' import PrimaryButton from '../../../../components/PrimaryButton' import useAtmosphere from '../../../../hooks/useAtmosphere' import useRouter from '../../../../hooks/useRouter' -import SendClientSideEvent from '../../../../utils/SendClientSideEvent' import {PALETTE} from '../../../../styles/paletteV3' import {ExternalLinks, Threshold} from '../../../../types/constEnums' -import {UpgradeCTALocationEnumType} from 'parabol-server/graphql/types/UpgradeCTALocationEnum' -import {UnpaidTeamModalQuery} from '../../../../__generated__/UnpaidTeamModalQuery.graphql' +import SendClientSideEvent from '../../../../utils/SendClientSideEvent' const StyledButton = styled(PrimaryButton)({ margin: '1.5rem auto 0' diff --git a/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx b/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx index 49bc74e5923..de50dd49dcf 100644 --- a/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx +++ b/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx @@ -4,8 +4,8 @@ import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import {Route} from 'react-router' import {matchPath, Switch} from 'react-router-dom' import ErrorBoundary from '~/components/ErrorBoundary' -import useRouter from '../../../../hooks/useRouter' import {TeamContainerQuery} from '../../../../__generated__/TeamContainerQuery.graphql' +import useRouter from '../../../../hooks/useRouter' import Team from '../../components/Team/Team' const TeamDashMain = lazy( diff --git a/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx b/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx index 05543bb0b0b..72ff4bc1337 100644 --- a/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx +++ b/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx @@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro' import React, {useMemo} from 'react' import {useFragment} from 'react-relay' import getSafeRegex from '~/utils/getSafeRegex' +import {TeamColumnsContainer_viewer$key} from '../../../../__generated__/TeamColumnsContainer_viewer.graphql' import TaskColumns from '../../../../components/TaskColumns/TaskColumns' import useAtmosphere from '../../../../hooks/useAtmosphere' import toTeamMemberId from '../../../../utils/relay/toTeamMemberId' -import {TeamColumnsContainer_viewer$key} from '../../../../__generated__/TeamColumnsContainer_viewer.graphql' interface Props { viewer: TeamColumnsContainer_viewer$key diff --git a/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx b/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx index 89739d6e260..27f62051f16 100644 --- a/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx +++ b/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx @@ -1,8 +1,8 @@ import React, {Suspense} from 'react' -import {useQueryLoaderNowWithRetry} from '../../../../hooks/useQueryLoaderNow' import providerListQuery, { ProviderListQuery } from '../../../../__generated__/ProviderListQuery.graphql' +import {useQueryLoaderNowWithRetry} from '../../../../hooks/useQueryLoaderNow' import ProviderList from '../../components/ProviderList/ProviderList' interface Props { diff --git a/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx b/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx index c20d68e87e9..bf71e5944e9 100644 --- a/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx +++ b/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import React, {useEffect} from 'react' import {useFragment} from 'react-relay' -import filterTeamMember from '~/utils/relay/filterTeamMember' import {TeamTasksHeaderContainer_team$key} from '~/__generated__/TeamTasksHeaderContainer_team.graphql' +import filterTeamMember from '~/utils/relay/filterTeamMember' import useAtmosphere from '../../../../hooks/useAtmosphere' import TeamTasksHeader from '../../components/TeamDashHeader/TeamDashHeader' diff --git a/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx b/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx index c0604bb530f..c7abd8412ad 100644 --- a/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx +++ b/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx @@ -1,9 +1,9 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' -import {Loader} from '../../../../utils/relay/renderLoader' import unpaidTeamModalQuery, { UnpaidTeamModalQuery } from '../../../../__generated__/UnpaidTeamModalQuery.graphql' +import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' +import {Loader} from '../../../../utils/relay/renderLoader' import UnpaidTeamModal from '../../components/UnpaidTeamModal/UnpaidTeamModal' interface Props { diff --git a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx index d9670495c89..05f9f708770 100644 --- a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx +++ b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx @@ -5,10 +5,10 @@ import PrimaryButton from '../../../../components/PrimaryButton' import UpgradeCreditCardFormField from '../../../../components/UpgradeCreditCardFormField' import UpgradeCreditCardNumberFormField from '../../../../components/UpgradeCreditCardNumberFormField' import useAtmosphere from '../../../../hooks/useAtmosphere' +import useClientSideTrack from '../../../../hooks/useClientSideTrack' import useForm from '../../../../hooks/useForm' import useMutationProps from '../../../../hooks/useMutationProps' import useScript from '../../../../hooks/useScript' -import useClientSideTrack from '../../../../hooks/useClientSideTrack' import OldUpdateCreditCardMutation from '../../../../mutations/OldUpdateCreditCardMutation' import OldUpgradeToTeamTierMutation from '../../../../mutations/OldUpgradeToTeamTierMutation' import {CompletedHandler} from '../../../../types/relayMutations' diff --git a/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx b/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx index a080b21e446..4348f8099bb 100644 --- a/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx +++ b/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx @@ -1,8 +1,8 @@ -import React from 'react' -import {Dayjs} from 'dayjs' -import {LocalizationProvider} from '@mui/x-date-pickers/LocalizationProvider' -import {AdapterDayjs} from '@mui/x-date-pickers/AdapterDayjs' import {DatePicker, TimePicker} from '@mui/x-date-pickers' +import {AdapterDayjs} from '@mui/x-date-pickers/AdapterDayjs' +import {LocalizationProvider} from '@mui/x-date-pickers/LocalizationProvider' +import {Dayjs} from 'dayjs' +import React from 'react' import {PALETTE} from '../../../../styles/paletteV3' const customStyles = { diff --git a/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx b/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx index 40c3c047ffc..21b77a164ab 100644 --- a/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx +++ b/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx @@ -1,27 +1,27 @@ import styled from '@emotion/styled' +import {Close} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import dayjs from 'dayjs' import React, {useEffect, useState} from 'react' +import {useFragment} from 'react-relay' +import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql' +import {CreateGcalEventInput} from '../../../../__generated__/StartRetrospectiveMutation.graphql' +import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql' +import Checkbox from '../../../../components/Checkbox' +import DialogContainer from '../../../../components/DialogContainer' import DialogContent from '../../../../components/DialogContent' import DialogTitle from '../../../../components/DialogTitle' -import {DialogActions} from '../../../../ui/Dialog/DialogActions' +import BasicTextArea from '../../../../components/InputField/BasicTextArea' +import PlainButton from '../../../../components/PlainButton/PlainButton' import PrimaryButton from '../../../../components/PrimaryButton' -import {PALETTE} from '../../../../styles/paletteV3' -import DateTimePickers from './DateTimePickers' -import Checkbox from '../../../../components/Checkbox' +import StyledError from '../../../../components/StyledError' import useForm from '../../../../hooks/useForm' -import Legitity from '../../../../validation/Legitity' -import {CreateGcalEventInput} from '../../../../__generated__/StartRetrospectiveMutation.graphql' -import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql' -import BasicTextArea from '../../../../components/InputField/BasicTextArea' +import {PALETTE} from '../../../../styles/paletteV3' +import {DialogActions} from '../../../../ui/Dialog/DialogActions' import parseEmailAddressList from '../../../../utils/parseEmailAddressList' -import {useFragment} from 'react-relay' -import StyledError from '../../../../components/StyledError' -import DialogContainer from '../../../../components/DialogContainer' -import {Close} from '@mui/icons-material' -import PlainButton from '../../../../components/PlainButton/PlainButton' +import Legitity from '../../../../validation/Legitity' +import DateTimePickers from './DateTimePickers' import VideoConferencing from './VideoConferencing' -import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql' const Wrapper = styled('div')({ display: 'flex', diff --git a/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx index de4c3c70be1..ce464d188e3 100644 --- a/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx +++ b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx @@ -2,15 +2,15 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import dayjs from 'dayjs' import React, {useEffect, useState} from 'react' -import DateTimePickers from './DateTimePickers' -import Checkbox from '../../../../components/Checkbox' +import {useFragment} from 'react-relay' import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql' +import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql' +import Checkbox from '../../../../components/Checkbox' import BasicTextArea from '../../../../components/InputField/BasicTextArea' -import parseEmailAddressList from '../../../../utils/parseEmailAddressList' -import {useFragment} from 'react-relay' import StyledError from '../../../../components/StyledError' +import parseEmailAddressList from '../../../../utils/parseEmailAddressList' +import DateTimePickers from './DateTimePickers' import VideoConferencing from './VideoConferencing' -import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql' const ErrorMessage = styled(StyledError)({ textAlign: 'left', diff --git a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx index 2c86796ee9f..f941de9d740 100644 --- a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx +++ b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx @@ -1,14 +1,14 @@ -import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown' import {Close} from '@mui/icons-material' +import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown' import React from 'react' +import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql' +import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo' +import RaisedButton from '../../../../components/RaisedButton' +import ZoomProviderLogo from '../../../../components/ZoomProviderLogo' import {MenuPosition} from '../../../../hooks/useCoords' import useMenu from '../../../../hooks/useMenu' -import VideoConferencingMenu from './VideoConferencingMenu' -import RaisedButton from '../../../../components/RaisedButton' import {Elevation} from '../../../../styles/elevation' -import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo' -import ZoomProviderLogo from '../../../../components/ZoomProviderLogo' -import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql' +import VideoConferencingMenu from './VideoConferencingMenu' type Props = { videoType: GcalVideoTypeEnum | null diff --git a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx index 403ecc966c2..8f6f67e68bb 100644 --- a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx +++ b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx @@ -1,10 +1,10 @@ import React from 'react' +import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql' +import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo' import Menu from '../../../../components/Menu' import MenuItem from '../../../../components/MenuItem' -import {MenuProps} from '../../../../hooks/useMenu' -import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo' import ZoomProviderLogo from '../../../../components/ZoomProviderLogo' -import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql' +import {MenuProps} from '../../../../hooks/useMenu' type Props = { menuProps: MenuProps diff --git a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx index b357811a1e1..3a71858359a 100644 --- a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx +++ b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx @@ -1,11 +1,11 @@ -import graphql from 'babel-plugin-relay/macro' import styled from '@emotion/styled' -import {ElementWidth} from '../../../../types/constEnums' +import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import {OrgAuthenticationQuery} from '../../../../__generated__/OrgAuthenticationQuery.graphql' import DialogTitle from '../../../../components/DialogTitle' import Panel from '../../../../components/Panel/Panel' +import {ElementWidth} from '../../../../types/constEnums' import OrgAuthenticationMetadata from './OrgAuthenticationMetadata' import OrgAuthenticationSSOFrame from './OrgAuthenticationSSOFrame' import OrgAuthenticationSignOnUrl from './OrgAuthenticationSignOnUrl' diff --git a/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx b/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx index c7e12b65530..a70094f3c44 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx @@ -1,22 +1,22 @@ -import React, {useState} from 'react' import styled from '@emotion/styled' import { - CardNumberElement, - CardExpiryElement, CardCvcElement, - useStripe, - useElements + CardExpiryElement, + CardNumberElement, + useElements, + useStripe } from '@stripe/react-stripe-js' +import {StripeElementChangeEvent} from '@stripe/stripe-js' +import React, {useState} from 'react' +import {CreateStripeSubscriptionMutation$data} from '../../../../__generated__/CreateStripeSubscriptionMutation.graphql' +import Ellipsis from '../../../../components/Ellipsis/Ellipsis' import PrimaryButton from '../../../../components/PrimaryButton' -import {PALETTE} from '../../../../styles/paletteV3' +import StyledError from '../../../../components/StyledError' import useAtmosphere from '../../../../hooks/useAtmosphere' import useMutationProps from '../../../../hooks/useMutationProps' -import StyledError from '../../../../components/StyledError' -import SendClientSideEvent from '../../../../utils/SendClientSideEvent' -import {StripeElementChangeEvent} from '@stripe/stripe-js' import CreateStripeSubscriptionMutation from '../../../../mutations/CreateStripeSubscriptionMutation' -import {CreateStripeSubscriptionMutation$data} from '../../../../__generated__/CreateStripeSubscriptionMutation.graphql' -import Ellipsis from '../../../../components/Ellipsis/Ellipsis' +import {PALETTE} from '../../../../styles/paletteV3' +import SendClientSideEvent from '../../../../utils/SendClientSideEvent' const ButtonBlock = styled('div')({ display: 'flex', diff --git a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx index 193c1e74ed2..935b199cf86 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx @@ -1,19 +1,19 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' -import BillingLeader from './BillingLeader' +import {useFragment} from 'react-relay' +import {BillingLeaders_organization$key} from '../../../../__generated__/BillingLeaders_organization.graphql' +import FlatButton from '../../../../components/FlatButton' +import IconLabel from '../../../../components/IconLabel' import Panel from '../../../../components/Panel/Panel' import Row from '../../../../components/Row/Row' +import RowInfo from '../../../../components/Row/RowInfo' +import RowInfoHeader from '../../../../components/Row/RowInfoHeader' +import RowInfoHeading from '../../../../components/Row/RowInfoHeading' import {PALETTE} from '../../../../styles/paletteV3' import {ElementWidth} from '../../../../types/constEnums' -import RowInfoHeading from '../../../../components/Row/RowInfoHeading' -import RowInfoHeader from '../../../../components/Row/RowInfoHeader' -import FlatButton from '../../../../components/FlatButton' -import RowInfo from '../../../../components/Row/RowInfo' -import {useFragment} from 'react-relay' -import {BillingLeaders_organization$key} from '../../../../__generated__/BillingLeaders_organization.graphql' -import IconLabel from '../../../../components/IconLabel' import plural from '../../../../utils/plural' +import BillingLeader from './BillingLeader' import NewBillingLeaderInput from './NewBillingLeaderInput' const StyledPanel = styled(Panel)({ diff --git a/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx b/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx index 93020f9a2a3..3f00b0790a7 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx @@ -1,26 +1,25 @@ import styled from '@emotion/styled' -import {Error as ErrorIcon} from '@mui/icons-material' -import {Close} from '@mui/icons-material' +import {Close, Error as ErrorIcon} from '@mui/icons-material' import {Checkbox} from '@mui/material' +import graphql from 'babel-plugin-relay/macro' import React, {useState} from 'react' +import {useFragment} from 'react-relay' +import {ReadableReasonToDowngradeEnum} from '../../../../../server/graphql/types/ReasonToDowngrade' +import {DowngradeModal_organization$key} from '../../../../__generated__/DowngradeModal_organization.graphql' import DialogContainer from '../../../../components/DialogContainer' import DialogContent from '../../../../components/DialogContent' import DialogTitle from '../../../../components/DialogTitle' import PlainButton from '../../../../components/PlainButton/PlainButton' import useAtmosphere from '../../../../hooks/useAtmosphere' +import useMutationProps from '../../../../hooks/useMutationProps' +import DowngradeToStarterMutation from '../../../../mutations/DowngradeToStarterMutation' import {PALETTE} from '../../../../styles/paletteV3' +import SendClientSideEvent from '../../../../utils/SendClientSideEvent' import { + TeamBenefits, readableReasonsToDowngrade, - reasonsToDowngradeLookup, - TeamBenefits + reasonsToDowngradeLookup } from '../../../../utils/constants' -import DowngradeToStarterMutation from '../../../../mutations/DowngradeToStarterMutation' -import {useFragment} from 'react-relay' -import graphql from 'babel-plugin-relay/macro' -import useMutationProps from '../../../../hooks/useMutationProps' -import SendClientSideEvent from '../../../../utils/SendClientSideEvent' -import {DowngradeModal_organization$key} from '../../../../__generated__/DowngradeModal_organization.graphql' -import {ReadableReasonToDowngradeEnum} from '../../../../../server/graphql/types/ReasonToDowngrade' const StyledDialogContainer = styled(DialogContainer)({ padding: 8 diff --git a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx index 42dfb47317b..0d7bf3a8acc 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx @@ -3,15 +3,15 @@ import {Person} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React, {useEffect, useRef} from 'react' import {useFragment} from 'react-relay' +import {NewBillingLeaderInput_organization$key} from '~/__generated__/NewBillingLeaderInput_organization.graphql' import {MenuPosition} from '~/hooks/useCoords' import useMenu from '~/hooks/useMenu' import {PALETTE} from '~/styles/paletteV3' -import {NewBillingLeaderInput_organization$key} from '~/__generated__/NewBillingLeaderInput_organization.graphql' import StyledError from '../../../../components/StyledError' import useForm from '../../../../hooks/useForm' import {PortalStatus} from '../../../../hooks/usePortal' -import NewBillingLeaderMenu from './NewBillingLeaderMenu' import {ElementWidth} from '../../../../types/constEnums' +import NewBillingLeaderMenu from './NewBillingLeaderMenu' const StyledIcon = styled(Person)({ color: PALETTE.SKY_500, diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx index 998048c07d5..4a8eafe5035 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx @@ -3,8 +3,8 @@ import {Email as EmailIcon} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import ArchiveOrganization from '~/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganization' import {OrgBillingDangerZone_organization$key} from '~/__generated__/OrgBillingDangerZone_organization.graphql' +import ArchiveOrganization from '~/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganization' import Panel from '../../../../components/Panel/Panel' import {PALETTE} from '../../../../styles/paletteV3' import {ElementWidth, Layout} from '../../../../types/constEnums' diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx index bacc91f9508..cc13cdee052 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx @@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {usePaginationFragment} from 'react-relay' import {OrgBillingInvoices_query$key} from '~/__generated__/OrgBillingInvoices_query.graphql' +import {OrgBillingInvoicesPaginationQuery} from '../../../../__generated__/OrgBillingInvoicesPaginationQuery.graphql' import Panel from '../../../../components/Panel/Panel' import SecondaryButton from '../../../../components/SecondaryButton' import {ElementWidth, Layout} from '../../../../types/constEnums' -import {OrgBillingInvoicesPaginationQuery} from '../../../../__generated__/OrgBillingInvoicesPaginationQuery.graphql' import InvoiceRow from '../InvoiceRow/InvoiceRow' const StyledPanel = styled(Panel)<{isWide: boolean}>(({isWide}) => ({ diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx index 012b9f7247f..6784b5bb14b 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx @@ -51,17 +51,13 @@ const OrgDetails = (props: Props) => {
{modalPortal()} {isBillingLeader ? ( - + ) : ( -
+
)} -
+
{isBillingLeader ? ( ) : ( diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx index aa6101a8847..af763e72a3c 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx @@ -1,13 +1,13 @@ -import React, {useState} from 'react' +import styled from '@emotion/styled' import {Info} from '@mui/icons-material' -import {Elevation} from '../../../../styles/elevation' -import BaseButton from '../../../../components/BaseButton' -import {Radius} from '../../../../types/constEnums' -import {PALETTE} from '../../../../styles/paletteV3' +import React, {useState} from 'react' import {TierEnum} from '../../../../__generated__/OrganizationSubscription.graphql' -import styled from '@emotion/styled' -import useTooltip from '../../../../hooks/useTooltip' +import BaseButton from '../../../../components/BaseButton' import {MenuPosition} from '../../../../hooks/useCoords' +import useTooltip from '../../../../hooks/useTooltip' +import {Elevation} from '../../../../styles/elevation' +import {PALETTE} from '../../../../styles/paletteV3' +import {Radius} from '../../../../types/constEnums' const PlanTitle = styled('h6')({ color: PALETTE.SLATE_700, diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx index 7b8ef509728..39766aa6e5e 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx @@ -1,20 +1,20 @@ -import React from 'react' import styled from '@emotion/styled' +import {Close} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' import {OrgPlanDrawer_organization$key} from '../../../../__generated__/OrgPlanDrawer_organization.graphql' -import ResponsiveDashSidebar from '../../../../components/ResponsiveDashSidebar' -import {Close} from '@mui/icons-material' -import {PALETTE} from '../../../../styles/paletteV3' -import {BezierCurve, Breakpoint, DiscussionThreadEnum, ZIndex} from '../../../../types/constEnums' +import Confetti from '../../../../components/Confetti' import LabelHeading from '../../../../components/LabelHeading/LabelHeading' -import {desktopSidebarShadow} from '../../../../styles/elevation' -import useBreakpoint from '../../../../hooks/useBreakpoint' import PlainButton from '../../../../components/PlainButton/PlainButton' +import ResponsiveDashSidebar from '../../../../components/ResponsiveDashSidebar' import useAtmosphere from '../../../../hooks/useAtmosphere' +import useBreakpoint from '../../../../hooks/useBreakpoint' +import {desktopSidebarShadow} from '../../../../styles/elevation' +import {PALETTE} from '../../../../styles/paletteV3' import {ICON_SIZE} from '../../../../styles/typographyV2' +import {BezierCurve, Breakpoint, DiscussionThreadEnum, ZIndex} from '../../../../types/constEnums' import OrgPlanDrawerContent from './OrgPlanDrawerContent' -import Confetti from '../../../../components/Confetti' const DrawerHeader = styled('div')({ alignItems: 'center', diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx index d545d2b2dc5..dfd3bbe1089 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx @@ -1,9 +1,9 @@ -import React from 'react' import styled from '@emotion/styled' +import React from 'react' +import {TierEnum} from '../../../../__generated__/DowngradeToStarterMutation.graphql' import {PALETTE} from '../../../../styles/paletteV3' import {EnterpriseBenefits, TeamBenefits} from '../../../../utils/constants' import {upperFirst} from '../../../../utils/upperFirst' -import {TierEnum} from '../../../../__generated__/DowngradeToStarterMutation.graphql' const List = styled('div')({ display: 'flex', diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx index 2b419f3ea4d..42f3fbfb619 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx @@ -2,21 +2,21 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' -import Panel from '../../../../components/Panel/Panel' -import Row from '../../../../components/Row/Row' +import useBreakpoint from '~/hooks/useBreakpoint' +import {Breakpoint} from '~/types/constEnums' import {OrgPlans_organization$key} from '../../../../__generated__/OrgPlans_organization.graphql' -import {ElementWidth} from '../../../../types/constEnums' import {TierEnum} from '../../../../__generated__/OrganizationSubscription.graphql' -import OrgStats from './OrgStats' +import LimitExceededWarning from '../../../../components/LimitExceededWarning' +import Panel from '../../../../components/Panel/Panel' +import Row from '../../../../components/Row/Row' +import useAtmosphere from '../../../../hooks/useAtmosphere' import useModal from '../../../../hooks/useModal' -import DowngradeModal from './DowngradeModal' -import {EnterpriseBenefits, StarterBenefits, TeamBenefits} from '../../../../utils/constants' +import {ElementWidth} from '../../../../types/constEnums' import SendClientSideEvent from '../../../../utils/SendClientSideEvent' -import useAtmosphere from '../../../../hooks/useAtmosphere' -import LimitExceededWarning from '../../../../components/LimitExceededWarning' -import {Breakpoint} from '~/types/constEnums' -import useBreakpoint from '~/hooks/useBreakpoint' +import {EnterpriseBenefits, StarterBenefits, TeamBenefits} from '../../../../utils/constants' +import DowngradeModal from './DowngradeModal' import OrgPlan from './OrgPlan' +import OrgStats from './OrgStats' const StyledPanel = styled(Panel)({ maxWidth: ElementWidth.PANEL_WIDTH, diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx index dab1cf3309e..bb00f1fecae 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx @@ -1,17 +1,17 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense, useState} from 'react' import {PreloadedQuery, useFragment, usePreloadedQuery, useRefetchableFragment} from 'react-relay' -import {OrgPlansAndBilling_organization$key} from '../../../../__generated__/OrgPlansAndBilling_organization.graphql' -import PaymentDetails from './PaymentDetails' -import BillingLeaders from './BillingLeaders' -import OrgPlans from './OrgPlans' -import OrgPlansAndBillingHeading from './OrgPlansAndBillingHeading' -import OrgPlanDrawer from './OrgPlanDrawer' -import OrgBillingInvoices from './OrgBillingInvoices' import {OrgPlansAndBillingQuery} from '../../../../__generated__/OrgPlansAndBillingQuery.graphql' import {OrgPlansAndBillingRefetchQuery} from '../../../../__generated__/OrgPlansAndBillingRefetchQuery.graphql' +import {OrgPlansAndBilling_organization$key} from '../../../../__generated__/OrgPlansAndBilling_organization.graphql' import {OrgPlansAndBilling_query$key} from '../../../../__generated__/OrgPlansAndBilling_query.graphql' +import BillingLeaders from './BillingLeaders' import OrgBillingCreditCardInfo from './OrgBillingCreditCardInfo' +import OrgBillingInvoices from './OrgBillingInvoices' +import OrgPlanDrawer from './OrgPlanDrawer' +import OrgPlans from './OrgPlans' +import OrgPlansAndBillingHeading from './OrgPlansAndBillingHeading' +import PaymentDetails from './PaymentDetails' type Props = { organizationRef: OrgPlansAndBilling_organization$key diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx index 04bec647405..c2f874e8e62 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx @@ -3,12 +3,12 @@ import {Article} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {commitLocalUpdate, useFragment} from 'react-relay' +import {OrgPlansAndBillingHeading_organization$key} from '../../../../__generated__/OrgPlansAndBillingHeading_organization.graphql' import PlainButton from '../../../../components/PlainButton/PlainButton' import useAtmosphere from '../../../../hooks/useAtmosphere' import {PALETTE} from '../../../../styles/paletteV3' import {ElementWidth} from '../../../../types/constEnums' import {upperFirst} from '../../../../utils/upperFirst' -import {OrgPlansAndBillingHeading_organization$key} from '../../../../__generated__/OrgPlansAndBillingHeading_organization.graphql' const Wrapper = styled('div')({ alignItems: 'center', diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx index 8c3c14768f1..a3ef216c0ac 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' -import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' import orgPlansAndBillingQuery, { OrgPlansAndBillingQuery } from '../../../../__generated__/OrgPlansAndBillingQuery.graphql' import {OrgPlansAndBillingRoot_organization$key} from '../../../../__generated__/OrgPlansAndBillingRoot_organization.graphql' +import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' import OrgPlansAndBilling from './OrgPlansAndBilling' interface Props { diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgStats.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgStats.tsx index ce3f65d979a..2daf9322716 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgStats.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgStats.tsx @@ -3,11 +3,11 @@ import {Info} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' +import {OrgStats_organization$key} from '../../../../__generated__/OrgStats_organization.graphql' import {tooltipTextLookup} from '../../../../components/InsightsDomainPanel' import {MenuPosition} from '../../../../hooks/useCoords' import useTooltip from '../../../../hooks/useTooltip' import {PALETTE} from '../../../../styles/paletteV3' -import {OrgStats_organization$key} from '../../../../__generated__/OrgStats_organization.graphql' const StatBlocks = styled('div')({ display: 'flex', diff --git a/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx b/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx index ceab6eb6e09..56da27a707a 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx @@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro' import React, {lazy} from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' import {Redirect, Route, Switch, useRouteMatch} from 'react-router' +import {OrganizationQuery} from '../../../../__generated__/OrganizationQuery.graphql' import { AUTHENTICATION_PAGE, BILLING_PAGE, @@ -9,9 +10,8 @@ import { ORG_SETTINGS_PAGE, TEAMS_PAGE } from '../../../../utils/constants' -import {OrganizationQuery} from '../../../../__generated__/OrganizationQuery.graphql' -import OrgNav from '../Organization/OrgNav' import OrgTeams from '../OrgTeams/OrgTeams' +import OrgNav from '../Organization/OrgNav' const OrgPlansAndBillingRoot = lazy( () => import(/* webpackChunkName: 'OrgBillingRoot' */ './OrgPlansAndBillingRoot') diff --git a/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx b/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx index 068e34d98cf..643649acff4 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx @@ -1,18 +1,18 @@ import styled from '@emotion/styled' -import {PaymentDetails_organization$key} from '../../../../__generated__/PaymentDetails_organization.graphql' -import graphql from 'babel-plugin-relay/macro' -import {useFragment} from 'react-relay' import {Divider} from '@mui/material' import {Elements} from '@stripe/react-stripe-js' import {loadStripe} from '@stripe/stripe-js' +import graphql from 'babel-plugin-relay/macro' import React, {useRef} from 'react' +import {useFragment} from 'react-relay' +import {PaymentDetails_organization$key} from '../../../../__generated__/PaymentDetails_organization.graphql' import Panel from '../../../../components/Panel/Panel' import Row from '../../../../components/Row/Row' +import useScrollIntoView from '../../../../hooks/useScrollIntoVIew' import {PALETTE} from '../../../../styles/paletteV3' import {ElementWidth} from '../../../../types/constEnums' -import BillingForm from './BillingForm' import {MONTHLY_PRICE} from '../../../../utils/constants' -import useScrollIntoView from '../../../../hooks/useScrollIntoVIew' +import BillingForm from './BillingForm' const StyledPanel = styled(Panel)({ maxWidth: ElementWidth.PANEL_WIDTH diff --git a/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx b/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx index 80bd46bb6f5..be005030d6c 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx @@ -6,16 +6,16 @@ import { useElements, useStripe } from '@stripe/react-stripe-js' +import {StripeElementChangeEvent} from '@stripe/stripe-js' import React, {useState} from 'react' +import {UpdateCreditCardMutation$data} from '../../../../__generated__/UpdateCreditCardMutation.graphql' import PrimaryButton from '../../../../components/PrimaryButton' import SecondaryButton from '../../../../components/SecondaryButton' -import {PALETTE} from '../../../../styles/paletteV3' -import UpdateCreditCardMutation from '../../../../mutations/UpdateCreditCardMutation' +import StyledError from '../../../../components/StyledError' import useAtmosphere from '../../../../hooks/useAtmosphere' import useMutationProps from '../../../../hooks/useMutationProps' -import StyledError from '../../../../components/StyledError' -import {UpdateCreditCardMutation$data} from '../../../../__generated__/UpdateCreditCardMutation.graphql' -import {StripeElementChangeEvent} from '@stripe/stripe-js' +import UpdateCreditCardMutation from '../../../../mutations/UpdateCreditCardMutation' +import {PALETTE} from '../../../../styles/paletteV3' const UpgradeButton = styled(PrimaryButton)<{disabled: boolean}>(({disabled}) => ({ background: disabled ? PALETTE.SLATE_200 : PALETTE.SKY_500, diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx index 7526eb55775..7c9731c18af 100644 --- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx +++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx @@ -1,13 +1,13 @@ import styled from '@emotion/styled' -import React from 'react' import graphql from 'babel-plugin-relay/macro' -import useAtmosphere from '~/hooks/useAtmosphere' +import React from 'react' import {useFragment} from 'react-relay' -import {MenuProps} from '../../../../hooks/useMenu' +import useAtmosphere from '~/hooks/useAtmosphere' +import {OrgTeamMemberMenu_teamMember$key} from '../../../../__generated__/OrgTeamMemberMenu_teamMember.graphql' import Menu from '../../../../components/Menu' import MenuItem from '../../../../components/MenuItem' import MenuItemLabel from '../../../../components/MenuItemLabel' -import {OrgTeamMemberMenu_teamMember$key} from '../../../../__generated__/OrgTeamMemberMenu_teamMember.graphql' +import {MenuProps} from '../../../../hooks/useMenu' interface OrgTeamMemberMenuProps { isLead: boolean diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx index 602a4b48ee5..76781ca966c 100644 --- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx +++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx @@ -1,17 +1,17 @@ -import React from 'react' -import graphql from 'babel-plugin-relay/macro' import {ArrowBack} from '@mui/icons-material' +import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' -import {OrgTeamMembersQuery} from '../../../../__generated__/OrgTeamMembersQuery.graphql' -import {OrgTeamMembersRow} from './OrgTeamMembersRow' -import {Button} from '../../../../ui/Button/Button' import {Link} from 'react-router-dom' -import {ORGANIZATIONS} from '../../../../utils/constants' +import {OrgTeamMembersQuery} from '../../../../__generated__/OrgTeamMembersQuery.graphql' +import DeleteTeamDialog from '../../../../components/DeleteTeamDialog' import {MenuPosition} from '../../../../hooks/useCoords' import useMenu from '../../../../hooks/useMenu' -import {OrgTeamMembersMenu} from './OrgTeamMembersMenu' +import {Button} from '../../../../ui/Button/Button' import {useDialogState} from '../../../../ui/Dialog/useDialogState' -import DeleteTeamDialog from '../../../../components/DeleteTeamDialog' +import {ORGANIZATIONS} from '../../../../utils/constants' +import {OrgTeamMembersMenu} from './OrgTeamMembersMenu' +import {OrgTeamMembersRow} from './OrgTeamMembersRow' interface Props { queryRef: PreloadedQuery diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx index bc53031bfc8..80a22e31ee2 100644 --- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx +++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx @@ -1,7 +1,7 @@ import React from 'react' -import {MenuProps} from '../../../../hooks/useMenu' import Menu from '../../../../components/Menu' import MenuItem from '../../../../components/MenuItem' +import {MenuProps} from '../../../../hooks/useMenu' interface OrgTeamMembersMenuProps { menuProps: MenuProps diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx index c0c959d084c..ec85d790003 100644 --- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx +++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx @@ -1,10 +1,10 @@ import React, {Suspense} from 'react' import orgTeamMembersQuery, {OrgTeamMembersQuery} from '~/__generated__/OrgTeamMembersQuery.graphql' import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' +import useRouter from '../../../../hooks/useRouter' import {LoaderSize} from '../../../../types/constEnums' import {Loader} from '../../../../utils/relay/renderLoader' import {OrgTeamMembers} from './OrgTeamMembers' -import useRouter from '../../../../hooks/useRouter' const OrgTeamMembersRoot = () => { const {match} = useRouter<{teamId: string}>() diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx index 3f544d7dd27..6bcd5cda9ad 100644 --- a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx +++ b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx @@ -1,12 +1,12 @@ -import React from 'react' import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {useFragment} from 'react-relay' -import OrgTeamsRow from './OrgTeamsRow' import {OrgTeams_organization$key} from '../../../../__generated__/OrgTeams_organization.graphql' import AddTeamDialogRoot from '../../../../components/AddTeamDialogRoot' import {Button} from '../../../../ui/Button/Button' import {useDialogState} from '../../../../ui/Dialog/useDialogState' import plural from '../../../../utils/plural' +import OrgTeamsRow from './OrgTeamsRow' type Props = { organizationRef: OrgTeams_organization$key diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx index d6da2e5e6c6..e2ea7697f82 100644 --- a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx +++ b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx @@ -1,11 +1,11 @@ -import React from 'react' -import {Link} from 'react-router-dom' +import {ChevronRight} from '@mui/icons-material' import graphql from 'babel-plugin-relay/macro' +import React from 'react' import {useFragment} from 'react-relay' -import {ChevronRight} from '@mui/icons-material' +import {Link} from 'react-router-dom' -import plural from '../../../../utils/plural' import {OrgTeamsRow_team$key} from '../../../../__generated__/OrgTeamsRow_team.graphql' +import plural from '../../../../utils/plural' type Props = { teamRef: OrgTeamsRow_team$key diff --git a/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx b/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx index 2d92fae6d53..ab2ebbbe9ab 100644 --- a/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx +++ b/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx @@ -4,9 +4,9 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {useHistory} from 'react-router' +import {OrgNav_organization$key} from '../../../../__generated__/OrgNav_organization.graphql' import {PALETTE} from '../../../../styles/paletteV3' import {ElementWidth} from '../../../../types/constEnums' -import {OrgNav_organization$key} from '../../../../__generated__/OrgNav_organization.graphql' const Wrapper = styled('div')({ display: 'flex', diff --git a/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx b/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx index a324f885835..a652e9aab41 100644 --- a/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx +++ b/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {OrganizationsQuery} from '../../../../__generated__/OrganizationsQuery.graphql' import LinkButton from '../../../../components/LinkButton' import Panel from '../../../../components/Panel/Panel' import SettingsWrapper from '../../../../components/Settings/SettingsWrapper' import useDocumentTitle from '../../../../hooks/useDocumentTitle' import useRouter from '../../../../hooks/useRouter' -import {OrganizationsQuery} from '../../../../__generated__/OrganizationsQuery.graphql' import EmptyOrgsCallOut from '../EmptyOrgsCallOut/EmptyOrgsCallOut' import OrganizationRow from '../OrganizationRow/OrganizationRow' import UserSettingsWrapper from '../UserSettingsWrapper/UserSettingsWrapper' diff --git a/packages/client/modules/userDashboard/components/UserProfile.tsx b/packages/client/modules/userDashboard/components/UserProfile.tsx index 0a7e0d7b96d..e1252b7e82f 100644 --- a/packages/client/modules/userDashboard/components/UserProfile.tsx +++ b/packages/client/modules/userDashboard/components/UserProfile.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React from 'react' import {PreloadedQuery, usePreloadedQuery} from 'react-relay' +import {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql' import DeleteAccount from '../../../components/DeleteAccount' import EmailNotifications from '../../../components/EmailNotifications' import Panel from '../../../components/Panel/Panel' @@ -9,7 +10,6 @@ import PasswordResetLink from '../../../components/PasswordResetLink' import useDocumentTitle from '../../../hooks/useDocumentTitle' import {PALETTE} from '../../../styles/paletteV3' import {AuthIdentityTypeEnum, Layout} from '../../../types/constEnums' -import {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql' import UserSettingsForm from './UserSettingsForm/UserSettingsForm' import UserSettingsWrapper from './UserSettingsWrapper/UserSettingsWrapper' diff --git a/packages/client/modules/userDashboard/components/UserProfileRoot.tsx b/packages/client/modules/userDashboard/components/UserProfileRoot.tsx index a02029a13e9..3a473107b08 100644 --- a/packages/client/modules/userDashboard/components/UserProfileRoot.tsx +++ b/packages/client/modules/userDashboard/components/UserProfileRoot.tsx @@ -1,9 +1,9 @@ import React, {Suspense} from 'react' import {RouteComponentProps, withRouter} from 'react-router-dom' +import userProfileQuery, {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql' import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow' import useSubscription from '../../../hooks/useSubscription' import NotificationSubscription from '../../../subscriptions/NotificationSubscription' -import userProfileQuery, {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql' import UserProfile from './UserProfile' interface Props extends RouteComponentProps<{teamId: string}> {} diff --git a/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx b/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx index e4a1db28093..b5825124913 100644 --- a/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx +++ b/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx @@ -2,6 +2,10 @@ import styled from '@emotion/styled' import graphql from 'babel-plugin-relay/macro' import React, {useMemo, useRef} from 'react' import {useFragment} from 'react-relay' +import { + UserTasksHeader_viewer$data, + UserTasksHeader_viewer$key +} from '~/__generated__/UserTasksHeader_viewer.graphql' import Checkbox from '~/components/Checkbox' import LinkButton from '~/components/LinkButton' import useRouter from '~/hooks/useRouter' @@ -11,13 +15,9 @@ import {Breakpoint, FilterLabels} from '~/types/constEnums' import constructFilterQueryParamURL from '~/utils/constructFilterQueryParamURL' import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery' import {useQueryParameterParser} from '~/utils/useQueryParameterParser' -import { - UserTasksHeader_viewer$data, - UserTasksHeader_viewer$key -} from '~/__generated__/UserTasksHeader_viewer.graphql' +import DashFilterToggle from '../../../../components/DashFilterToggle/DashFilterToggle' import DashSectionControls from '../../../../components/Dashboard/DashSectionControls' import DashSectionHeader from '../../../../components/Dashboard/DashSectionHeader' -import DashFilterToggle from '../../../../components/DashFilterToggle/DashFilterToggle' import useAtmosphere from '../../../../hooks/useAtmosphere' import {MenuPosition} from '../../../../hooks/useCoords' import useMenu from '../../../../hooks/useMenu' diff --git a/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx b/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx index 37dda9781cd..893d4082eaa 100644 --- a/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx +++ b/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import React, {Suspense} from 'react' import {useFragment} from 'react-relay' -import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' import orgBillingQuery, {OrgBillingQuery} from '../../../../__generated__/OrgBillingQuery.graphql' import {OrgBillingRoot_organization$key} from '../../../../__generated__/OrgBillingRoot_organization.graphql' +import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' import OrgBilling from '../../components/OrgBilling/OrgBilling' interface Props { diff --git a/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx b/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx index 28f34aa970b..994ee399c4e 100644 --- a/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx +++ b/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx @@ -1,10 +1,10 @@ import React, {Suspense} from 'react' import {RouteComponentProps} from 'react-router' -import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' -import {Loader} from '../../../../utils/relay/renderLoader' import organizationQuery, { OrganizationQuery } from '../../../../__generated__/OrganizationQuery.graphql' +import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' +import {Loader} from '../../../../utils/relay/renderLoader' import Organization from '../../components/OrgBilling/Organization' interface Props extends RouteComponentProps<{orgId: string}> {} diff --git a/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx b/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx index 15dc366b6cb..614fa4d17cb 100644 --- a/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx +++ b/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx @@ -1,10 +1,10 @@ import React, {Suspense} from 'react' -import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' -import {LoaderSize} from '../../../../types/constEnums' -import {Loader} from '../../../../utils/relay/renderLoader' import organizationsQuery, { OrganizationsQuery } from '../../../../__generated__/OrganizationsQuery.graphql' +import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow' +import {LoaderSize} from '../../../../types/constEnums' +import {Loader} from '../../../../utils/relay/renderLoader' import Organizations from '../../components/Organizations/Organizations' const OrganizationsRoot = () => { diff --git a/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx b/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx index 72aebf89936..807d484a5ca 100644 --- a/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx +++ b/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx @@ -3,9 +3,9 @@ import React, {useMemo} from 'react' import {useFragment} from 'react-relay' import toTeamMemberId from '~/utils/relay/toTeamMemberId' import {useQueryParameterParser} from '~/utils/useQueryParameterParser' +import {UserColumnsContainer_viewer$key} from '../../../../__generated__/UserColumnsContainer_viewer.graphql' import TaskColumns from '../../../../components/TaskColumns/TaskColumns' import getSafeRegex from '../../../../utils/getSafeRegex' -import {UserColumnsContainer_viewer$key} from '../../../../__generated__/UserColumnsContainer_viewer.graphql' interface Props { viewerRef: UserColumnsContainer_viewer$key diff --git a/packages/client/mutations/AcceptTeamInvitationMutation.ts b/packages/client/mutations/AcceptTeamInvitationMutation.ts index fc92e2fa0e3..d34825bfd41 100644 --- a/packages/client/mutations/AcceptTeamInvitationMutation.ts +++ b/packages/client/mutations/AcceptTeamInvitationMutation.ts @@ -1,8 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {InvitationTokenError, LOCKED_MESSAGE} from '~/types/constEnums' import {AcceptTeamInvitationMutation_notification$data} from '~/__generated__/AcceptTeamInvitationMutation_notification.graphql' +import {InvitationTokenError, LOCKED_MESSAGE} from '~/types/constEnums' import Atmosphere from '../Atmosphere' +import {AcceptTeamInvitationMutation as TAcceptTeamInvitationMutation} from '../__generated__/AcceptTeamInvitationMutation.graphql' +import {AcceptTeamInvitationMutation_team$data} from '../__generated__/AcceptTeamInvitationMutation_team.graphql' import { HistoryMaybeLocalHandler, OnNextHandler, @@ -11,8 +13,6 @@ import { } from '../types/relayMutations' import fromTeamMemberId from '../utils/relay/fromTeamMemberId' import getGraphQLError from '../utils/relay/getGraphQLError' -import {AcceptTeamInvitationMutation as TAcceptTeamInvitationMutation} from '../__generated__/AcceptTeamInvitationMutation.graphql' -import {AcceptTeamInvitationMutation_team$data} from '../__generated__/AcceptTeamInvitationMutation_team.graphql' import handleAddOrganization from './handlers/handleAddOrganization' import handleAddTeamMembers from './handlers/handleAddTeamMembers' import handleAddTeams from './handlers/handleAddTeams' diff --git a/packages/client/mutations/AddAgendaItemMutation.ts b/packages/client/mutations/AddAgendaItemMutation.ts index 13cc776b0a6..22d6d480c1e 100644 --- a/packages/client/mutations/AddAgendaItemMutation.ts +++ b/packages/client/mutations/AddAgendaItemMutation.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {AddAgendaItemMutation as TAddAgendaItemMutation} from '../__generated__/AddAgendaItemMutation.graphql' +import {AddAgendaItemMutation_team$data} from '../__generated__/AddAgendaItemMutation_team.graphql' import {SharedUpdater, StandardMutation} from '../types/relayMutations' import clientTempId from '../utils/relay/clientTempId' import createProxyRecord from '../utils/relay/createProxyRecord' -import {AddAgendaItemMutation as TAddAgendaItemMutation} from '../__generated__/AddAgendaItemMutation.graphql' -import {AddAgendaItemMutation_team$data} from '../__generated__/AddAgendaItemMutation_team.graphql' import handleAddAgendaItems from './handlers/handleAddAgendaItems' graphql` fragment AddAgendaItemMutation_team on AddAgendaItemPayload { diff --git a/packages/client/mutations/AddAtlassianAuthMutation.ts b/packages/client/mutations/AddAtlassianAuthMutation.ts index 358b7441f75..16a1ddfe904 100644 --- a/packages/client/mutations/AddAtlassianAuthMutation.ts +++ b/packages/client/mutations/AddAtlassianAuthMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {AddAtlassianAuthMutation as TAddAtlassianAuthMutation} from '../__generated__/AddAtlassianAuthMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment AddAtlassianAuthMutation_team on AddAtlassianAuthPayload { diff --git a/packages/client/mutations/AddCommentMutation.ts b/packages/client/mutations/AddCommentMutation.ts index 0547a88de2d..b55d6f1a0bb 100644 --- a/packages/client/mutations/AddCommentMutation.ts +++ b/packages/client/mutations/AddCommentMutation.ts @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {AddCommentMutation_meeting$data} from '~/__generated__/AddCommentMutation_meeting.graphql' import makeEmptyStr from '~/utils/draftjs/makeEmptyStr' import addNodeToArray from '~/utils/relay/addNodeToArray' import createProxyRecord from '~/utils/relay/createProxyRecord' -import {AddCommentMutation_meeting$data} from '~/__generated__/AddCommentMutation_meeting.graphql' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' import {AddCommentMutation as TAddCommentMutation} from '../__generated__/AddCommentMutation.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import getDiscussionThreadConn from './connections/getDiscussionThreadConn' import safePutNodeInConn from './handlers/safePutNodeInConn' diff --git a/packages/client/mutations/AddGitHubAuthMutation.ts b/packages/client/mutations/AddGitHubAuthMutation.ts index 3b3cf2cde77..8045830f6fa 100644 --- a/packages/client/mutations/AddGitHubAuthMutation.ts +++ b/packages/client/mutations/AddGitHubAuthMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {AddGitHubAuthMutation as TAddGitHubAuthMutation} from '../__generated__/AddGitHubAuthMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment AddGitHubAuthMutation_team on AddGitHubAuthPayload { diff --git a/packages/client/mutations/AddIntegrationProviderMutation.ts b/packages/client/mutations/AddIntegrationProviderMutation.ts index 07f401e4766..3e4d831de08 100644 --- a/packages/client/mutations/AddIntegrationProviderMutation.ts +++ b/packages/client/mutations/AddIntegrationProviderMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../__generated__/AddIntegrationProviderMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment AddIntegrationProviderMutation_team on AddIntegrationProviderSuccess { diff --git a/packages/client/mutations/AddOrgMutation.ts b/packages/client/mutations/AddOrgMutation.ts index af80c053890..2b19332a808 100644 --- a/packages/client/mutations/AddOrgMutation.ts +++ b/packages/client/mutations/AddOrgMutation.ts @@ -1,5 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {AddOrgMutation as TAddOrgMutation} from '../__generated__/AddOrgMutation.graphql' +import {AddOrgMutation_notification$data} from '../__generated__/AddOrgMutation_notification.graphql' +import {AddOrgMutation_organization$data} from '../__generated__/AddOrgMutation_organization.graphql' import { HistoryLocalHandler, OnNextHandler, @@ -7,9 +10,6 @@ import { StandardMutation } from '../types/relayMutations' import getGraphQLError from '../utils/relay/getGraphQLError' -import {AddOrgMutation as TAddOrgMutation} from '../__generated__/AddOrgMutation.graphql' -import {AddOrgMutation_notification$data} from '../__generated__/AddOrgMutation_notification.graphql' -import {AddOrgMutation_organization$data} from '../__generated__/AddOrgMutation_organization.graphql' import handleAddOrganization from './handlers/handleAddOrganization' import handleAddTeams from './handlers/handleAddTeams' import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions' diff --git a/packages/client/mutations/AddPokerTemplateDimensionMutation.ts b/packages/client/mutations/AddPokerTemplateDimensionMutation.ts index 6f71fee7fae..5eb276afcd2 100644 --- a/packages/client/mutations/AddPokerTemplateDimensionMutation.ts +++ b/packages/client/mutations/AddPokerTemplateDimensionMutation.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {SprintPokerDefaults} from '~/types/constEnums' -import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations' -import createProxyRecord from '../utils/relay/createProxyRecord' import {AddPokerTemplateDimensionMutation as TAddPokerTemplateDimensionMutation} from '../__generated__/AddPokerTemplateDimensionMutation.graphql' import {AddPokerTemplateDimensionMutation_dimension$data} from '../__generated__/AddPokerTemplateDimensionMutation_dimension.graphql' +import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations' +import createProxyRecord from '../utils/relay/createProxyRecord' import handleAddPokerTemplateDimension from './handlers/handleAddPokerTemplateDimension' interface Handlers extends BaseLocalHandlers { diff --git a/packages/client/mutations/AddPokerTemplateMutation.ts b/packages/client/mutations/AddPokerTemplateMutation.ts index 7de55a43760..698dd1d14d2 100644 --- a/packages/client/mutations/AddPokerTemplateMutation.ts +++ b/packages/client/mutations/AddPokerTemplateMutation.ts @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {SprintPokerDefaults} from '~/types/constEnums' +import {AddPokerTemplateMutation as TAddPokerTemplateMutation} from '../__generated__/AddPokerTemplateMutation.graphql' +import {AddPokerTemplateMutation_team$data} from '../__generated__/AddPokerTemplateMutation_team.graphql' import {SharedUpdater, StandardMutation} from '../types/relayMutations' import createProxyRecord from '../utils/relay/createProxyRecord' import {setActiveTemplateInRelayStore} from '../utils/relay/setActiveTemplate' -import {AddPokerTemplateMutation as TAddPokerTemplateMutation} from '../__generated__/AddPokerTemplateMutation.graphql' -import {AddPokerTemplateMutation_team$data} from '../__generated__/AddPokerTemplateMutation_team.graphql' import handleAddMeetingTemplate from './handlers/handleAddMeetingTemplate' graphql` @@ -15,7 +15,6 @@ graphql` } pokerTemplate { ...TemplateSharing_template - ...PokerTemplateDetailsTemplate ...ActivityDetails_template id teamId diff --git a/packages/client/mutations/AddPokerTemplateScaleMutation.ts b/packages/client/mutations/AddPokerTemplateScaleMutation.ts index 38f14db5187..c45932bc919 100644 --- a/packages/client/mutations/AddPokerTemplateScaleMutation.ts +++ b/packages/client/mutations/AddPokerTemplateScaleMutation.ts @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {AddPokerTemplateScaleMutation as TAddPokerTemplateScaleMutation} from '../__generated__/AddPokerTemplateScaleMutation.graphql' +import {AddPokerTemplateScaleMutation_scale$data} from '../__generated__/AddPokerTemplateScaleMutation_scale.graphql' import {PALETTE} from '../styles/paletteV3' import {PokerCards} from '../types/constEnums' import {SharedUpdater, StandardMutation} from '../types/relayMutations' import createProxyRecord from '../utils/relay/createProxyRecord' -import {AddPokerTemplateScaleMutation as TAddPokerTemplateScaleMutation} from '../__generated__/AddPokerTemplateScaleMutation.graphql' -import {AddPokerTemplateScaleMutation_scale$data} from '../__generated__/AddPokerTemplateScaleMutation_scale.graphql' import handleAddPokerTemplateScale from './handlers/handleAddPokerTemplateScale' graphql` diff --git a/packages/client/mutations/AddPokerTemplateScaleValueMutation.ts b/packages/client/mutations/AddPokerTemplateScaleValueMutation.ts index ca999c5d874..74c291f2748 100644 --- a/packages/client/mutations/AddPokerTemplateScaleValueMutation.ts +++ b/packages/client/mutations/AddPokerTemplateScaleValueMutation.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {AddPokerTemplateScaleValueMutation as TAddPokerTemplateScaleValueMutation} from '../__generated__/AddPokerTemplateScaleValueMutation.graphql' import {StandardMutation} from '../types/relayMutations' import dndNoise from '../utils/dndNoise' import addNodeToArray from '../utils/relay/addNodeToArray' import createProxyRecord from '../utils/relay/createProxyRecord' -import {AddPokerTemplateScaleValueMutation as TAddPokerTemplateScaleValueMutation} from '../__generated__/AddPokerTemplateScaleValueMutation.graphql' graphql` fragment AddPokerTemplateScaleValueMutation_scale on AddPokerTemplateScaleValuePayload { diff --git a/packages/client/mutations/AddReactjiToReactableMutation.ts b/packages/client/mutations/AddReactjiToReactableMutation.ts index 51ee83cfe0c..37fca00f436 100644 --- a/packages/client/mutations/AddReactjiToReactableMutation.ts +++ b/packages/client/mutations/AddReactjiToReactableMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import createProxyRecord from '~/utils/relay/createProxyRecord' -import {StandardMutation} from '../types/relayMutations' import {AddReactjiToReactableMutation as TAddReactjiToReactableMutation} from '../__generated__/AddReactjiToReactableMutation.graphql' +import {StandardMutation} from '../types/relayMutations' import SendClientSideEvent from '../utils/SendClientSideEvent' graphql` diff --git a/packages/client/mutations/AddReflectTemplateMutation.ts b/packages/client/mutations/AddReflectTemplateMutation.ts index 0b74c28760a..19d73535764 100644 --- a/packages/client/mutations/AddReflectTemplateMutation.ts +++ b/packages/client/mutations/AddReflectTemplateMutation.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {AddReflectTemplateMutation as TAddReflectTemplateMutation} from '../__generated__/AddReflectTemplateMutation.graphql' +import {AddReflectTemplateMutation_team$data} from '../__generated__/AddReflectTemplateMutation_team.graphql' import {SharedUpdater, StandardMutation} from '../types/relayMutations' import createProxyRecord from '../utils/relay/createProxyRecord' import {setActiveTemplateInRelayStore} from '../utils/relay/setActiveTemplate' -import {AddReflectTemplateMutation as TAddReflectTemplateMutation} from '../__generated__/AddReflectTemplateMutation.graphql' -import {AddReflectTemplateMutation_team$data} from '../__generated__/AddReflectTemplateMutation_team.graphql' import handleAddMeetingTemplate from './handlers/handleAddMeetingTemplate' graphql` @@ -14,7 +14,6 @@ graphql` } reflectTemplate { ...TemplateSharing_template - ...ReflectTemplateDetailsTemplate ...ActivityDetails_template id teamId diff --git a/packages/client/mutations/AddReflectTemplatePromptMutation.ts b/packages/client/mutations/AddReflectTemplatePromptMutation.ts index b7025a5055e..9daa5ec6a5f 100644 --- a/packages/client/mutations/AddReflectTemplatePromptMutation.ts +++ b/packages/client/mutations/AddReflectTemplatePromptMutation.ts @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations' -import createProxyRecord from '../utils/relay/createProxyRecord' import {AddReflectTemplatePromptMutation as TAddReflectTemplatePromptMutation} from '../__generated__/AddReflectTemplatePromptMutation.graphql' import {AddReflectTemplatePromptMutation_team$data} from '../__generated__/AddReflectTemplatePromptMutation_team.graphql' +import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations' +import createProxyRecord from '../utils/relay/createProxyRecord' import handleAddReflectTemplatePrompt from './handlers/handleAddReflectTemplatePrompt' interface Handlers extends BaseLocalHandlers { diff --git a/packages/client/mutations/AddSlackAuthMutation.ts b/packages/client/mutations/AddSlackAuthMutation.ts index 005cbf6b8ae..dd05181eb5a 100644 --- a/packages/client/mutations/AddSlackAuthMutation.ts +++ b/packages/client/mutations/AddSlackAuthMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {AddSlackAuthMutation as TAddSlackAuthMutation} from '../__generated__/AddSlackAuthMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment AddSlackAuthMutation_team on AddSlackAuthPayload { diff --git a/packages/client/mutations/AddTeamMemberIntegrationAuthMutation.ts b/packages/client/mutations/AddTeamMemberIntegrationAuthMutation.ts index 056fd3a5242..fbf0847e219 100644 --- a/packages/client/mutations/AddTeamMemberIntegrationAuthMutation.ts +++ b/packages/client/mutations/AddTeamMemberIntegrationAuthMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {AddTeamMemberIntegrationAuthMutation as TAddTeamMemberIntegrationAuthMutation} from '../__generated__/AddTeamMemberIntegrationAuthMutation.graphql' +import {StandardMutation} from '../types/relayMutations' const mutation = graphql` mutation AddTeamMemberIntegrationAuthMutation( diff --git a/packages/client/mutations/AddTeamMutation.ts b/packages/client/mutations/AddTeamMutation.ts index a9d1a627da5..56578a67f61 100644 --- a/packages/client/mutations/AddTeamMutation.ts +++ b/packages/client/mutations/AddTeamMutation.ts @@ -1,5 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {AddTeamMutation as TAddTeamMutation} from '../__generated__/AddTeamMutation.graphql' +import {AddTeamMutation_notification$data} from '../__generated__/AddTeamMutation_notification.graphql' +import {AddTeamMutation_team$data} from '../__generated__/AddTeamMutation_team.graphql' import { HistoryLocalHandler, OnNextHandler, @@ -8,9 +11,6 @@ import { StandardMutation } from '../types/relayMutations' import getGraphQLError from '../utils/relay/getGraphQLError' -import {AddTeamMutation as TAddTeamMutation} from '../__generated__/AddTeamMutation.graphql' -import {AddTeamMutation_notification$data} from '../__generated__/AddTeamMutation_notification.graphql' -import {AddTeamMutation_team$data} from '../__generated__/AddTeamMutation_team.graphql' import handleAddTeams from './handlers/handleAddTeams' import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions' diff --git a/packages/client/mutations/AddTranscriptionBotMutation.ts b/packages/client/mutations/AddTranscriptionBotMutation.ts index 3b5db21542a..873161adc59 100644 --- a/packages/client/mutations/AddTranscriptionBotMutation.ts +++ b/packages/client/mutations/AddTranscriptionBotMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {AddTranscriptionBotMutation as TAddTranscriptionBotMutation} from '../__generated__/AddTranscriptionBotMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment AddTranscriptionBotMutation_meeting on AddTranscriptionBotSuccess { diff --git a/packages/client/mutations/ArchiveOrganizationMutation.ts b/packages/client/mutations/ArchiveOrganizationMutation.ts index c8cce46b029..55342e88b5b 100644 --- a/packages/client/mutations/ArchiveOrganizationMutation.ts +++ b/packages/client/mutations/ArchiveOrganizationMutation.ts @@ -1,5 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {ArchiveOrganizationMutation as TArchiveOrganizationMutation} from '../__generated__/ArchiveOrganizationMutation.graphql' +import {ArchiveOrganizationMutation_organization$data} from '../__generated__/ArchiveOrganizationMutation_organization.graphql' import { HistoryLocalHandler, OnNextHandler, @@ -10,8 +12,6 @@ import { import onMeetingRoute from '../utils/onMeetingRoute' import onTeamRoute from '../utils/onTeamRoute' import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray' -import {ArchiveOrganizationMutation as TArchiveOrganizationMutation} from '../__generated__/ArchiveOrganizationMutation.graphql' -import {ArchiveOrganizationMutation_organization$data} from '../__generated__/ArchiveOrganizationMutation_organization.graphql' import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions' graphql` diff --git a/packages/client/mutations/ArchiveTeamMutation.ts b/packages/client/mutations/ArchiveTeamMutation.ts index 218fdd0c7c1..c06eae11d37 100644 --- a/packages/client/mutations/ArchiveTeamMutation.ts +++ b/packages/client/mutations/ArchiveTeamMutation.ts @@ -1,5 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {ArchiveTeamMutation as TArchiveTeamMutation} from '../__generated__/ArchiveTeamMutation.graphql' +import {ArchiveTeamMutation_team$data} from '../__generated__/ArchiveTeamMutation_team.graphql' import { HistoryLocalHandler, OnNextHandler, @@ -10,12 +12,10 @@ import { import onMeetingRoute from '../utils/onMeetingRoute' import onTeamRoute from '../utils/onTeamRoute' import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray' -import {ArchiveTeamMutation as TArchiveTeamMutation} from '../__generated__/ArchiveTeamMutation.graphql' -import {ArchiveTeamMutation_team$data} from '../__generated__/ArchiveTeamMutation_team.graphql' +import SetNotificationStatusMutation from './SetNotificationStatusMutation' import handleAddNotifications from './handlers/handleAddNotifications' import handleRemoveReflectTemplate from './handlers/handleRemoveReflectTemplate' import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions' -import SetNotificationStatusMutation from './SetNotificationStatusMutation' graphql` fragment ArchiveTeamMutation_team on ArchiveTeamPayload { diff --git a/packages/client/mutations/ArchiveTimelineEventMutation.ts b/packages/client/mutations/ArchiveTimelineEventMutation.ts index d71bc8df62a..274f9805140 100644 --- a/packages/client/mutations/ArchiveTimelineEventMutation.ts +++ b/packages/client/mutations/ArchiveTimelineEventMutation.ts @@ -1,10 +1,10 @@ +import {ArchiveTimelineEventMutation_notification$data} from '__generated__/ArchiveTimelineEventMutation_notification.graphql' import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {RecordSourceSelectorProxy} from 'relay-runtime' -import {ArchiveTimelineEventMutation_notification$data} from '__generated__/ArchiveTimelineEventMutation_notification.graphql' import safeRemoveNodeFromConn from '~/utils/relay/safeRemoveNodeFromConn' -import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import {ArchiveTimelineEventMutation as TArchiveTimelineEventMutation} from '../__generated__/ArchiveTimelineEventMutation.graphql' +import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import getUserTimelineEventsConn from './connections/getUserTimelineEventsConn' graphql` diff --git a/packages/client/mutations/AutogroupMutation.ts b/packages/client/mutations/AutogroupMutation.ts index 18bbdf2a3ba..3a66969a2e1 100644 --- a/packages/client/mutations/AutogroupMutation.ts +++ b/packages/client/mutations/AutogroupMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {AutogroupMutation as TAutogroupMutation} from '../__generated__/AutogroupMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment AutogroupMutation_meeting on AutogroupSuccess { diff --git a/packages/client/mutations/BatchArchiveTasksMutation.ts b/packages/client/mutations/BatchArchiveTasksMutation.ts index c7c9c8d7095..4963f72303f 100644 --- a/packages/client/mutations/BatchArchiveTasksMutation.ts +++ b/packages/client/mutations/BatchArchiveTasksMutation.ts @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' +import {BatchArchiveTasksMutation_tasks$data} from '~/__generated__/BatchArchiveTasksMutation_tasks.graphql' import ITask from '../../server/database/types/Task' import {BatchArchiveTasksMutation as TBatchArchiveTasksMutation} from '../__generated__/BatchArchiveTasksMutation.graphql' -import {BatchArchiveTasksMutation_tasks$data} from '~/__generated__/BatchArchiveTasksMutation_tasks.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import getTagsFromEntityMap from '../utils/draftjs/getTagsFromEntityMap' -import handleUpsertTasks from './handlers/handleUpsertTasks' import handleRemoveTasks from './handlers/handleRemoveTasks' +import handleUpsertTasks from './handlers/handleUpsertTasks' graphql` fragment BatchArchiveTasksMutation_tasks on BatchArchiveTasksSuccess { diff --git a/packages/client/mutations/ChangeTaskTeamMutation.ts b/packages/client/mutations/ChangeTaskTeamMutation.ts index 156a7f498cc..0e873a41947 100644 --- a/packages/client/mutations/ChangeTaskTeamMutation.ts +++ b/packages/client/mutations/ChangeTaskTeamMutation.ts @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {ChangeTaskTeamMutation_task$data} from '~/__generated__/ChangeTaskTeamMutation_task.graphql' +import {ChangeTaskTeamMutation as TChangeTaskTeamMutation} from '../__generated__/ChangeTaskTeamMutation.graphql' import {SharedUpdater, StandardMutation} from '../types/relayMutations' import getBaseRecord from '../utils/relay/getBaseRecord' import safeRemoveNodeFromUnknownConn from '../utils/relay/safeRemoveNodeFromUnknownConn' import updateProxyRecord from '../utils/relay/updateProxyRecord' -import {ChangeTaskTeamMutation as TChangeTaskTeamMutation} from '../__generated__/ChangeTaskTeamMutation.graphql' import handleUpsertTasks from './handlers/handleUpsertTasks' graphql` diff --git a/packages/client/mutations/CreateImposterTokenMutation.ts b/packages/client/mutations/CreateImposterTokenMutation.ts index dda11a6d1a1..adf70b0d252 100644 --- a/packages/client/mutations/CreateImposterTokenMutation.ts +++ b/packages/client/mutations/CreateImposterTokenMutation.ts @@ -2,9 +2,9 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {LocalStorageKey} from '~/types/constEnums' import Atmosphere from '../Atmosphere' +import {CreateImposterTokenMutation as ICreateImposterTokenMutation} from '../__generated__/CreateImposterTokenMutation.graphql' import {SimpleMutation} from '../types/relayMutations' import getGraphQLError from '../utils/relay/getGraphQLError' -import {CreateImposterTokenMutation as ICreateImposterTokenMutation} from '../__generated__/CreateImposterTokenMutation.graphql' graphql` fragment CreateImposterTokenMutation_agendaItem on CreateImposterTokenPayload { diff --git a/packages/client/mutations/CreateMassInvitationMutation.ts b/packages/client/mutations/CreateMassInvitationMutation.ts index dc188b7d857..999a0a6490d 100644 --- a/packages/client/mutations/CreateMassInvitationMutation.ts +++ b/packages/client/mutations/CreateMassInvitationMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {CreateMassInvitationMutation as TCreateMassInvitationMutation} from '../__generated__/CreateMassInvitationMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment CreateMassInvitationMutation_team on CreateMassInvitationSuccess { diff --git a/packages/client/mutations/CreateOAuth1AuthorizeUrlMutation.ts b/packages/client/mutations/CreateOAuth1AuthorizeUrlMutation.ts index 9fbaf3d6e16..be15c2c2b7e 100644 --- a/packages/client/mutations/CreateOAuth1AuthorizeUrlMutation.ts +++ b/packages/client/mutations/CreateOAuth1AuthorizeUrlMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import Atmosphere from '../Atmosphere' -import {OptionalHandlers, StandardMutation} from '../types/relayMutations' import {CreateOAuth1AuthorizeUrlMutation as TCreateOAuth1AuthorizeUrlMutation} from '../__generated__/CreateOAuth1AuthorizeUrlMutation.graphql' +import {OptionalHandlers, StandardMutation} from '../types/relayMutations' const mutation = graphql` mutation CreateOAuth1AuthorizeUrlMutation($providerId: ID!, $teamId: ID!) { diff --git a/packages/client/mutations/CreatePollMutation.ts b/packages/client/mutations/CreatePollMutation.ts index 2d165d50e3c..58418a91d4a 100644 --- a/packages/client/mutations/CreatePollMutation.ts +++ b/packages/client/mutations/CreatePollMutation.ts @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {CreatePollMutation_meeting$data} from '~/__generated__/CreatePollMutation_meeting.graphql' -import {LocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations' import {CreatePollMutation as TCreatePollMutation} from '../__generated__/CreatePollMutation.graphql' import {ThreadedPollBase_poll$data} from '../__generated__/ThreadedPollBase_poll.graphql' +import {LocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations' import getDiscussionThreadConn from './connections/getDiscussionThreadConn' import safePutNodeInConn from './handlers/safePutNodeInConn' diff --git a/packages/client/mutations/CreateReflectionMutation.ts b/packages/client/mutations/CreateReflectionMutation.ts index 03956f301f1..f4974284134 100644 --- a/packages/client/mutations/CreateReflectionMutation.ts +++ b/packages/client/mutations/CreateReflectionMutation.ts @@ -5,13 +5,13 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {CreateReflectionMutation_meeting$data} from '~/__generated__/CreateReflectionMutation_meeting.graphql' +import {CreateReflectionMutation as TCreateReflectionMutation} from '../__generated__/CreateReflectionMutation.graphql' import {SharedUpdater, StandardMutation} from '../types/relayMutations' +import SendClientSideEvent from '../utils/SendClientSideEvent' import makeEmptyStr from '../utils/draftjs/makeEmptyStr' import clientTempId from '../utils/relay/clientTempId' import createProxyRecord from '../utils/relay/createProxyRecord' -import {CreateReflectionMutation as TCreateReflectionMutation} from '../__generated__/CreateReflectionMutation.graphql' import handleAddReflectionGroups from './handlers/handleAddReflectionGroups' -import SendClientSideEvent from '../utils/SendClientSideEvent' graphql` fragment CreateReflectionMutation_meeting on CreateReflectionPayload { diff --git a/packages/client/mutations/CreateStripeSubscriptionMutation.ts b/packages/client/mutations/CreateStripeSubscriptionMutation.ts index 2868c24173a..09064ae2665 100644 --- a/packages/client/mutations/CreateStripeSubscriptionMutation.ts +++ b/packages/client/mutations/CreateStripeSubscriptionMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {CreateStripeSubscriptionMutation as TCreateStripeSubscriptionMutation} from '../__generated__/CreateStripeSubscriptionMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment CreateStripeSubscriptionMutation_organization on CreateStripeSubscriptionSuccess { diff --git a/packages/client/mutations/CreateTaskIntegrationMutation.ts b/packages/client/mutations/CreateTaskIntegrationMutation.ts index 411ef942c1c..d87e8d15b2f 100644 --- a/packages/client/mutations/CreateTaskIntegrationMutation.ts +++ b/packages/client/mutations/CreateTaskIntegrationMutation.ts @@ -3,12 +3,12 @@ import {stateToHTML} from 'draft-js-export-html' import {commitMutation} from 'react-relay' import {RecordSourceSelectorProxy} from 'relay-runtime' import JiraProjectId from '~/shared/gqlIds/JiraProjectId' +import {CreateTaskIntegrationMutation as TCreateTaskIntegrationMutation} from '../__generated__/CreateTaskIntegrationMutation.graphql' import {StandardMutation} from '../types/relayMutations' +import SendClientSideEvent from '../utils/SendClientSideEvent' import splitDraftContent from '../utils/draftjs/splitDraftContent' import getMeetingPathParams from '../utils/meetings/getMeetingPathParams' import createProxyRecord from '../utils/relay/createProxyRecord' -import {CreateTaskIntegrationMutation as TCreateTaskIntegrationMutation} from '../__generated__/CreateTaskIntegrationMutation.graphql' -import SendClientSideEvent from '../utils/SendClientSideEvent' graphql` fragment CreateTaskIntegrationMutation_task on CreateTaskIntegrationPayload { diff --git a/packages/client/mutations/CreateTaskMutation.ts b/packages/client/mutations/CreateTaskMutation.ts index 256efc3f5f8..0ff880cdf4d 100644 --- a/packages/client/mutations/CreateTaskMutation.ts +++ b/packages/client/mutations/CreateTaskMutation.ts @@ -3,6 +3,9 @@ import {commitMutation} from 'react-relay' import AzureDevOpsProjectId from '~/shared/gqlIds/AzureDevOpsProjectId' import extractTextFromDraftString from '~/utils/draftjs/extractTextFromDraftString' import Atmosphere from '../Atmosphere' +import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql' +import {CreateTaskMutation_notification$data} from '../__generated__/CreateTaskMutation_notification.graphql' +import {CreateTaskMutation_task$data} from '../__generated__/CreateTaskMutation_task.graphql' import GitHubIssueId from '../shared/gqlIds/GitHubIssueId' import JiraProjectId from '../shared/gqlIds/JiraProjectId' import { @@ -16,9 +19,6 @@ import makeEmptyStr from '../utils/draftjs/makeEmptyStr' import clientTempId from '../utils/relay/clientTempId' import createProxyRecord from '../utils/relay/createProxyRecord' import getOptimisticTaskEditor from '../utils/relay/getOptimisticTaskEditor' -import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql' -import {CreateTaskMutation_notification$data} from '../__generated__/CreateTaskMutation_notification.graphql' -import {CreateTaskMutation_task$data} from '../__generated__/CreateTaskMutation_task.graphql' import handleAddNotifications from './handlers/handleAddNotifications' import handleAzureCreateIssue from './handlers/handleAzureCreateIssue' import handleEditTask from './handlers/handleEditTask' diff --git a/packages/client/mutations/DeleteCommentMutation.ts b/packages/client/mutations/DeleteCommentMutation.ts index e85b917f1fa..4eaee0f1d9a 100644 --- a/packages/client/mutations/DeleteCommentMutation.ts +++ b/packages/client/mutations/DeleteCommentMutation.ts @@ -1,12 +1,12 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime' +import {DeleteCommentMutation_meeting$data} from '~/__generated__/DeleteCommentMutation_meeting.graphql' import convertToTaskContent from '~/utils/draftjs/convertToTaskContent' import safeRemoveNodeFromArray from '~/utils/relay/safeRemoveNodeFromArray' import safeRemoveNodeFromConn from '~/utils/relay/safeRemoveNodeFromConn' -import {DeleteCommentMutation_meeting$data} from '~/__generated__/DeleteCommentMutation_meeting.graphql' -import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import {DeleteCommentMutation as TDeleteCommentMutation} from '../__generated__/DeleteCommentMutation.graphql' +import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import getDiscussionThreadConn from './connections/getDiscussionThreadConn' graphql` diff --git a/packages/client/mutations/DeleteUserMutation.ts b/packages/client/mutations/DeleteUserMutation.ts index 54ac02647ee..58add7a7157 100644 --- a/packages/client/mutations/DeleteUserMutation.ts +++ b/packages/client/mutations/DeleteUserMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SimpleMutation} from '../types/relayMutations' import {DeleteUserMutation as TDeleteUserMutation} from '../__generated__/DeleteUserMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' const mutation = graphql` mutation DeleteUserMutation($userId: ID!, $reason: String) { diff --git a/packages/client/mutations/DenyPushInvitationMutation.ts b/packages/client/mutations/DenyPushInvitationMutation.ts index 4430f779e66..13dd77f70b9 100644 --- a/packages/client/mutations/DenyPushInvitationMutation.ts +++ b/packages/client/mutations/DenyPushInvitationMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {OnNextHandler, SimpleMutation} from '../types/relayMutations' import {DenyPushInvitationMutation as TDenyPushInvitationMutation} from '../__generated__/DenyPushInvitationMutation.graphql' import {DenyPushInvitationMutation_team$data} from '../__generated__/DenyPushInvitationMutation_team.graphql' +import {OnNextHandler, SimpleMutation} from '../types/relayMutations' graphql` fragment DenyPushInvitationMutation_team on DenyPushInvitationPayload { diff --git a/packages/client/mutations/DismissNewFeatureMutation.ts b/packages/client/mutations/DismissNewFeatureMutation.ts index 184981c43db..4059256c690 100644 --- a/packages/client/mutations/DismissNewFeatureMutation.ts +++ b/packages/client/mutations/DismissNewFeatureMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {DismissNewFeatureMutation as TDismissNewFeatureMutation} from '../__generated__/DismissNewFeatureMutation.graphql' +import {StandardMutation} from '../types/relayMutations' const mutation = graphql` mutation DismissNewFeatureMutation { diff --git a/packages/client/mutations/DismissSuggestedActionMutation.ts b/packages/client/mutations/DismissSuggestedActionMutation.ts index 9c05f1465f2..fb95e4ed36d 100644 --- a/packages/client/mutations/DismissSuggestedActionMutation.ts +++ b/packages/client/mutations/DismissSuggestedActionMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {DismissSuggestedActionMutation as TDismissSuggestedActionMutation} from '../__generated__/DismissSuggestedActionMutation.graphql' +import {StandardMutation} from '../types/relayMutations' import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions' const mutation = graphql` diff --git a/packages/client/mutations/DowngradeToStarterMutation.ts b/packages/client/mutations/DowngradeToStarterMutation.ts index b20a89ecf53..10e19e8ce7f 100644 --- a/packages/client/mutations/DowngradeToStarterMutation.ts +++ b/packages/client/mutations/DowngradeToStarterMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {DowngradeToStarterMutation as TDowngradeToStarterMutation} from '../__generated__/DowngradeToStarterMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment DowngradeToStarterMutation_organization on DowngradeToStarterPayload { diff --git a/packages/client/mutations/DragDiscussionTopicMutation.ts b/packages/client/mutations/DragDiscussionTopicMutation.ts index c9692e16203..e4423f36414 100644 --- a/packages/client/mutations/DragDiscussionTopicMutation.ts +++ b/packages/client/mutations/DragDiscussionTopicMutation.ts @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {DragDiscussionTopicMutation_meeting$data} from '~/__generated__/DragDiscussionTopicMutation_meeting.graphql' +import {DragDiscussionTopicMutation as IDragDiscussionTopicMutation} from '../__generated__/DragDiscussionTopicMutation.graphql' import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import {DISCUSS} from '../utils/constants' -import {DragDiscussionTopicMutation as IDragDiscussionTopicMutation} from '../__generated__/DragDiscussionTopicMutation.graphql' import handleUpdateStageSort from './handlers/handleUpdateStageSort' graphql` diff --git a/packages/client/mutations/DragEstimatingTaskMutation.ts b/packages/client/mutations/DragEstimatingTaskMutation.ts index 5b11756552a..fd9403da94b 100644 --- a/packages/client/mutations/DragEstimatingTaskMutation.ts +++ b/packages/client/mutations/DragEstimatingTaskMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SimpleMutation} from '../types/relayMutations' import {DragEstimatingTaskMutation as IDragEstimatingTaskMutation} from '../__generated__/DragEstimatingTaskMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' graphql` fragment DragEstimatingTaskMutation_meeting on DragEstimatingTaskSuccess { diff --git a/packages/client/mutations/EditCommentingMutation.ts b/packages/client/mutations/EditCommentingMutation.ts index b1145ffe8d5..058d1b0258c 100644 --- a/packages/client/mutations/EditCommentingMutation.ts +++ b/packages/client/mutations/EditCommentingMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {EditCommentingMutation as TEditCommentingMutation} from '../__generated__/EditCommentingMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment EditCommentingMutation_meeting on EditCommentingSuccess { diff --git a/packages/client/mutations/EditReflectionMutation.ts b/packages/client/mutations/EditReflectionMutation.ts index bc454756ba7..867989bdd7b 100644 --- a/packages/client/mutations/EditReflectionMutation.ts +++ b/packages/client/mutations/EditReflectionMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {EditReflectionMutation_meeting$data} from '~/__generated__/EditReflectionMutation_meeting.graphql' -import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import {EditReflectionMutation as TEditReflectionMutation} from '../__generated__/EditReflectionMutation.graphql' +import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import handleEditReflection from './handlers/handleEditReflection' graphql` diff --git a/packages/client/mutations/EditTaskMutation.ts b/packages/client/mutations/EditTaskMutation.ts index 5f9ee7b5278..3cab5e4f868 100644 --- a/packages/client/mutations/EditTaskMutation.ts +++ b/packages/client/mutations/EditTaskMutation.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {EditTaskMutation as TEditTaskMutation} from '../__generated__/EditTaskMutation.graphql' +import {EditTaskMutation_task$data} from '../__generated__/EditTaskMutation_task.graphql' import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import getOptimisticTaskEditor from '../utils/relay/getOptimisticTaskEditor' import isTempId from '../utils/relay/isTempId' -import {EditTaskMutation as TEditTaskMutation} from '../__generated__/EditTaskMutation.graphql' -import {EditTaskMutation_task$data} from '../__generated__/EditTaskMutation_task.graphql' import handleEditTask from './handlers/handleEditTask' graphql` diff --git a/packages/client/mutations/EmailPasswordResetMutation.ts b/packages/client/mutations/EmailPasswordResetMutation.ts index 27d26cebe80..22277029f73 100644 --- a/packages/client/mutations/EmailPasswordResetMutation.ts +++ b/packages/client/mutations/EmailPasswordResetMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {EmailPasswordResetMutation as TEmailPasswordResetMutation} from '../__generated__/EmailPasswordResetMutation.graphql' import {AuthenticationError} from '../types/constEnums' import {LocalHandlers, StandardMutation} from '../types/relayMutations' -import {EmailPasswordResetMutation as TEmailPasswordResetMutation} from '../__generated__/EmailPasswordResetMutation.graphql' export enum ForgotPasswordResType { GOOGLE = 'goog', diff --git a/packages/client/mutations/EndCheckInMutation.ts b/packages/client/mutations/EndCheckInMutation.ts index 9b96beb70ec..656c1427468 100644 --- a/packages/client/mutations/EndCheckInMutation.ts +++ b/packages/client/mutations/EndCheckInMutation.ts @@ -1,9 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {RecordProxy} from 'relay-runtime' -import onMeetingRoute from '~/utils/onMeetingRoute' import {EndCheckInMutation_notification$data} from '~/__generated__/EndCheckInMutation_notification.graphql' import {EndCheckInMutation_team$data} from '~/__generated__/EndCheckInMutation_team.graphql' +import onMeetingRoute from '~/utils/onMeetingRoute' +import {EndCheckInMutation as TEndCheckInMutation} from '../__generated__/EndCheckInMutation.graphql' import { HistoryMaybeLocalHandler, OnNextHandler, @@ -11,7 +12,6 @@ import { SharedUpdater, StandardMutation } from '../types/relayMutations' -import {EndCheckInMutation as TEndCheckInMutation} from '../__generated__/EndCheckInMutation.graphql' import handleAddTimelineEvent from './handlers/handleAddTimelineEvent' import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions' import handleRemoveTasks from './handlers/handleRemoveTasks' diff --git a/packages/client/mutations/EndRetrospectiveMutation.ts b/packages/client/mutations/EndRetrospectiveMutation.ts index afd7feafdc8..5d27418cdd1 100644 --- a/packages/client/mutations/EndRetrospectiveMutation.ts +++ b/packages/client/mutations/EndRetrospectiveMutation.ts @@ -1,9 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {RecordProxy} from 'relay-runtime' -import onMeetingRoute from '~/utils/onMeetingRoute' import {EndRetrospectiveMutation_notification$data} from '~/__generated__/EndRetrospectiveMutation_notification.graphql' import {EndRetrospectiveMutation_team$data} from '~/__generated__/EndRetrospectiveMutation_team.graphql' +import onMeetingRoute from '~/utils/onMeetingRoute' +import {EndRetrospectiveMutation as TEndRetrospectiveMutation} from '../__generated__/EndRetrospectiveMutation.graphql' import {RetroDemo} from '../types/constEnums' import { HistoryMaybeLocalHandler, @@ -12,7 +13,6 @@ import { SharedUpdater, StandardMutation } from '../types/relayMutations' -import {EndRetrospectiveMutation as TEndRetrospectiveMutation} from '../__generated__/EndRetrospectiveMutation.graphql' import handleAddTimelineEvent from './handlers/handleAddTimelineEvent' import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions' import popEndMeetingToast from './toasts/popEndMeetingToast' diff --git a/packages/client/mutations/EndSprintPokerMutation.ts b/packages/client/mutations/EndSprintPokerMutation.ts index 3e132fd6273..74effc113a0 100644 --- a/packages/client/mutations/EndSprintPokerMutation.ts +++ b/packages/client/mutations/EndSprintPokerMutation.ts @@ -1,7 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import onMeetingRoute from '~/utils/onMeetingRoute' import {EndSprintPokerMutation_team$data} from '~/__generated__/EndSprintPokerMutation_team.graphql' +import onMeetingRoute from '~/utils/onMeetingRoute' +import {EndSprintPokerMutation as TEndSprintPokerMutation} from '../__generated__/EndSprintPokerMutation.graphql' import { HistoryMaybeLocalHandler, OnNextHandler, @@ -9,7 +10,6 @@ import { SharedUpdater, StandardMutation } from '../types/relayMutations' -import {EndSprintPokerMutation as TEndSprintPokerMutation} from '../__generated__/EndSprintPokerMutation.graphql' import handleRemoveTasks from './handlers/handleRemoveTasks' import popEndMeetingToast from './toasts/popEndMeetingToast' diff --git a/packages/client/mutations/EndTeamPromptMutation.ts b/packages/client/mutations/EndTeamPromptMutation.ts index c1b294a5f03..3b6597bd55e 100644 --- a/packages/client/mutations/EndTeamPromptMutation.ts +++ b/packages/client/mutations/EndTeamPromptMutation.ts @@ -1,8 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {RecordProxy} from 'relay-runtime' -import onMeetingRoute from '~/utils/onMeetingRoute' import {EndTeamPromptMutation_team$data} from '~/__generated__/EndTeamPromptMutation_team.graphql' +import onMeetingRoute from '~/utils/onMeetingRoute' +import {EndTeamPromptMutation as TEndTeamPromptMutation} from '../__generated__/EndTeamPromptMutation.graphql' import { HistoryMaybeLocalHandler, OnNextHandler, @@ -10,7 +11,6 @@ import { SharedUpdater, StandardMutation } from '../types/relayMutations' -import {EndTeamPromptMutation as TEndTeamPromptMutation} from '../__generated__/EndTeamPromptMutation.graphql' import handleAddTimelineEvent from './handlers/handleAddTimelineEvent' graphql` diff --git a/packages/client/mutations/FlagReadyToAdvanceMutation.ts b/packages/client/mutations/FlagReadyToAdvanceMutation.ts index 2b9fba68fcf..ed609eeb501 100644 --- a/packages/client/mutations/FlagReadyToAdvanceMutation.ts +++ b/packages/client/mutations/FlagReadyToAdvanceMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SimpleMutation} from '../types/relayMutations' import {FlagReadyToAdvanceMutation as TFlagReadyToAdvanceMutation} from '../__generated__/FlagReadyToAdvanceMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' graphql` fragment FlagReadyToAdvanceMutation_meeting on FlagReadyToAdvanceSuccess { diff --git a/packages/client/mutations/GetTemplateSuggestionMutation.ts b/packages/client/mutations/GetTemplateSuggestionMutation.ts index eda5c1812ff..fc1cfe1bd9e 100644 --- a/packages/client/mutations/GetTemplateSuggestionMutation.ts +++ b/packages/client/mutations/GetTemplateSuggestionMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {GetTemplateSuggestionMutation as TGetTemplateSuggestionMutation} from '../__generated__/GetTemplateSuggestionMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment GetTemplateSuggestionMutation_viewer on GetTemplateSuggestionSuccess { diff --git a/packages/client/mutations/InvalidateSessionsMutation.ts b/packages/client/mutations/InvalidateSessionsMutation.ts index 975ef83253b..e3f9809c8e5 100644 --- a/packages/client/mutations/InvalidateSessionsMutation.ts +++ b/packages/client/mutations/InvalidateSessionsMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {InvalidateSessionsMutation as TInvalidateSessionsMutation} from '../__generated__/InvalidateSessionsMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment InvalidateSessionsMutation_notification on InvalidateSessionsPayload { diff --git a/packages/client/mutations/InviteToTeamMutation.ts b/packages/client/mutations/InviteToTeamMutation.ts index eca0fc3187e..f662151ca52 100644 --- a/packages/client/mutations/InviteToTeamMutation.ts +++ b/packages/client/mutations/InviteToTeamMutation.ts @@ -1,6 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {matchPath} from 'react-router' +import {InviteToTeamMutation as TInviteToTeamMutation} from '../__generated__/InviteToTeamMutation.graphql' +import {InviteToTeamMutation_notification$data} from '../__generated__/InviteToTeamMutation_notification.graphql' import { LocalHandlers, OnNextHandler, @@ -8,8 +10,6 @@ import { SharedUpdater, StandardMutation } from '../types/relayMutations' -import {InviteToTeamMutation as TInviteToTeamMutation} from '../__generated__/InviteToTeamMutation.graphql' -import {InviteToTeamMutation_notification$data} from '../__generated__/InviteToTeamMutation_notification.graphql' import AcceptTeamInvitationMutation from './AcceptTeamInvitationMutation' import handleAddNotifications from './handlers/handleAddNotifications' import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions' diff --git a/packages/client/mutations/JoinMeetingMutation.ts b/packages/client/mutations/JoinMeetingMutation.ts index e50db516eb1..66a2caff22e 100644 --- a/packages/client/mutations/JoinMeetingMutation.ts +++ b/packages/client/mutations/JoinMeetingMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {JoinMeetingMutation as TJoinMeetingMutation} from '../__generated__/JoinMeetingMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment JoinMeetingMutation_meeting on JoinMeetingSuccess { diff --git a/packages/client/mutations/LoginWithGoogleMutation.ts b/packages/client/mutations/LoginWithGoogleMutation.ts index e020f7d72a9..b64e6b5ee5e 100644 --- a/packages/client/mutations/LoginWithGoogleMutation.ts +++ b/packages/client/mutations/LoginWithGoogleMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin' -import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {LoginWithGoogleMutation as TLoginWithGoogleMutation} from '../__generated__/LoginWithGoogleMutation.graphql' +import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {handleAcceptTeamInvitationErrors} from './AcceptTeamInvitationMutation' import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect' diff --git a/packages/client/mutations/LoginWithMicrosoftMutation.ts b/packages/client/mutations/LoginWithMicrosoftMutation.ts index 696d7fe0dfc..7293cffa73e 100644 --- a/packages/client/mutations/LoginWithMicrosoftMutation.ts +++ b/packages/client/mutations/LoginWithMicrosoftMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin' -import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {LoginWithMicrosoftMutation as TLoginWithMicrosoftMutation} from '../__generated__/LoginWithMicrosoftMutation.graphql' +import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {handleAcceptTeamInvitationErrors} from './AcceptTeamInvitationMutation' import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect' diff --git a/packages/client/mutations/LoginWithPasswordMutation.ts b/packages/client/mutations/LoginWithPasswordMutation.ts index 9efdfa4283e..af89a6cd827 100644 --- a/packages/client/mutations/LoginWithPasswordMutation.ts +++ b/packages/client/mutations/LoginWithPasswordMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin' -import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {LoginWithPasswordMutation as TLoginWithPasswordMutation} from '../__generated__/LoginWithPasswordMutation.graphql' +import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {handleAcceptTeamInvitationErrors} from './AcceptTeamInvitationMutation' import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect' diff --git a/packages/client/mutations/MovePokerTemplateDimensionMutation.ts b/packages/client/mutations/MovePokerTemplateDimensionMutation.ts index e29fddca74c..3e20d7d7e75 100644 --- a/packages/client/mutations/MovePokerTemplateDimensionMutation.ts +++ b/packages/client/mutations/MovePokerTemplateDimensionMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {MovePokerTemplateDimensionMutation as TMovePokerTemplateDimensionMutation} from '~/__generated__/MovePokerTemplateDimensionMutation.graphql' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' import {MovePokerTemplateDimensionMutation_team$data} from '../__generated__/MovePokerTemplateDimensionMutation_team.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import handleMovePokerTemplateDimension from './handlers/handleMovePokerTemplateDimension' graphql` diff --git a/packages/client/mutations/MovePokerTemplateScaleValueMutation.ts b/packages/client/mutations/MovePokerTemplateScaleValueMutation.ts index 25ba330b30b..44951285b9a 100644 --- a/packages/client/mutations/MovePokerTemplateScaleValueMutation.ts +++ b/packages/client/mutations/MovePokerTemplateScaleValueMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {MovePokerTemplateScaleValueMutation as TMovePokerTemplateScaleValueMutation} from '../__generated__/MovePokerTemplateScaleValueMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment MovePokerTemplateScaleValueMutation_team on MovePokerTemplateScaleValueSuccess { diff --git a/packages/client/mutations/MoveReflectTemplatePromptMutation.ts b/packages/client/mutations/MoveReflectTemplatePromptMutation.ts index 8a5c288b64c..531d10357dc 100644 --- a/packages/client/mutations/MoveReflectTemplatePromptMutation.ts +++ b/packages/client/mutations/MoveReflectTemplatePromptMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {MoveReflectTemplatePromptMutation as TMoveReflectTemplatePromptMutation} from '~/__generated__/MoveReflectTemplatePromptMutation.graphql' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' import {MoveReflectTemplatePromptMutation_team$data} from '../__generated__/MoveReflectTemplatePromptMutation_team.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import handleMoveTemplatePrompt from './handlers/handleMoveTemplatePrompt' interface Context { templateId: string diff --git a/packages/client/mutations/NavigateMeetingMutation.ts b/packages/client/mutations/NavigateMeetingMutation.ts index bad2b92505b..fff2549f231 100644 --- a/packages/client/mutations/NavigateMeetingMutation.ts +++ b/packages/client/mutations/NavigateMeetingMutation.ts @@ -6,6 +6,7 @@ import { } from '~/__generated__/NavigateMeetingMutation_meeting.graphql' import {NavigateMeetingMutation_team$data} from '~/__generated__/NavigateMeetingMutation_team.graphql' import {ReflectionGroup_reflectionGroup$data} from '~/__generated__/ReflectionGroup_reflectionGroup.graphql' +import {NavigateMeetingMutation as TNavigateMeetingMutation} from '../__generated__/NavigateMeetingMutation.graphql' import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import {REFLECT, VOTE} from '../utils/constants' import isInterruptingChickenPhase from '../utils/isInterruptingChickenPhase' @@ -13,7 +14,6 @@ import getBaseRecord from '../utils/relay/getBaseRecord' import safeProxy from '../utils/relay/safeProxy' import {setLocalStageAndPhase} from '../utils/relay/updateLocalStage' import {isViewerTypingInComment, isViewerTypingInTask} from '../utils/viewerTypingUtils' -import {NavigateMeetingMutation as TNavigateMeetingMutation} from '../__generated__/NavigateMeetingMutation.graphql' import handleRemoveReflectionGroups from './handlers/handleRemoveReflectionGroups' graphql` diff --git a/packages/client/mutations/OldUpdateCreditCardMutation.ts b/packages/client/mutations/OldUpdateCreditCardMutation.ts index 6abc853dd5a..724321c1530 100644 --- a/packages/client/mutations/OldUpdateCreditCardMutation.ts +++ b/packages/client/mutations/OldUpdateCreditCardMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {OldUpdateCreditCardMutation as TOldUpdateCreditCardMutation} from '../__generated__/OldUpdateCreditCardMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment OldUpdateCreditCardMutation_organization on OldUpdateCreditCardPayload { diff --git a/packages/client/mutations/OldUpgradeToTeamTierMutation.ts b/packages/client/mutations/OldUpgradeToTeamTierMutation.ts index 6b2e6e3a2d7..0dbbdbb2e51 100644 --- a/packages/client/mutations/OldUpgradeToTeamTierMutation.ts +++ b/packages/client/mutations/OldUpgradeToTeamTierMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {OldUpgradeToTeamTierMutation as TOldUpgradeToTeamTierMutation} from '../__generated__/OldUpgradeToTeamTierMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment OldUpgradeToTeamTierMutation_organization on OldUpgradeToTeamTierPayload { diff --git a/packages/client/mutations/PayLaterMutation.ts b/packages/client/mutations/PayLaterMutation.ts index af3ced5ad59..5da2758c95a 100644 --- a/packages/client/mutations/PayLaterMutation.ts +++ b/packages/client/mutations/PayLaterMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'relay-runtime' -import {SimpleMutation} from '../types/relayMutations' import {PayLaterMutation as TPayLaterMutation} from '../__generated__/PayLaterMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' graphql` fragment PayLaterMutation_organization on PayLaterPayload { diff --git a/packages/client/mutations/PersistGitHubSearchQueryMutation.ts b/packages/client/mutations/PersistGitHubSearchQueryMutation.ts index fa6c6338a29..f95b4000b63 100644 --- a/packages/client/mutations/PersistGitHubSearchQueryMutation.ts +++ b/packages/client/mutations/PersistGitHubSearchQueryMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SimpleMutation} from '../types/relayMutations' import {PersistGitHubSearchQueryMutation as TPersistGitHubSearchQueryMutation} from '../__generated__/PersistGitHubSearchQueryMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' graphql` fragment PersistGitHubSearchQueryMutation_notification on PersistGitHubSearchQuerySuccess { diff --git a/packages/client/mutations/PersistJiraSearchQueryMutation.ts b/packages/client/mutations/PersistJiraSearchQueryMutation.ts index 64a87afa577..c4331cf7e94 100644 --- a/packages/client/mutations/PersistJiraSearchQueryMutation.ts +++ b/packages/client/mutations/PersistJiraSearchQueryMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SimpleMutation} from '../types/relayMutations' import {PersistJiraSearchQueryMutation as TPersistJiraSearchQueryMutation} from '../__generated__/PersistJiraSearchQueryMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' graphql` fragment PersistJiraSearchQueryMutation_notification on PersistJiraSearchQuerySuccess { diff --git a/packages/client/mutations/PersistJiraServerSearchQueryMutation.ts b/packages/client/mutations/PersistJiraServerSearchQueryMutation.ts index e6676d8b867..cc4012b61aa 100644 --- a/packages/client/mutations/PersistJiraServerSearchQueryMutation.ts +++ b/packages/client/mutations/PersistJiraServerSearchQueryMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SimpleMutation} from '../types/relayMutations' import {PersistJiraServerSearchQueryMutation as TPersistJiraServerSearchQueryMutation} from '../__generated__/PersistJiraServerSearchQueryMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' graphql` fragment PersistJiraServerSearchQueryMutation_notification on PersistIntegrationSearchQuerySuccess { diff --git a/packages/client/mutations/PokerAnnounceDeckHoverMutation.ts b/packages/client/mutations/PokerAnnounceDeckHoverMutation.ts index 0ac6e368f97..cfb6aa2cdfe 100644 --- a/packages/client/mutations/PokerAnnounceDeckHoverMutation.ts +++ b/packages/client/mutations/PokerAnnounceDeckHoverMutation.ts @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {RecordProxy} from 'relay-runtime' -import {SharedUpdater, SimpleMutation} from '../types/relayMutations' -import createProxyRecord from '../utils/relay/createProxyRecord' import {PokerAnnounceDeckHoverMutation as TPokerAnnounceDeckHoverMutation} from '../__generated__/PokerAnnounceDeckHoverMutation.graphql' import {PokerAnnounceDeckHoverMutation_meeting$data} from '../__generated__/PokerAnnounceDeckHoverMutation_meeting.graphql' import {PokerMeeting_meeting$data} from '../__generated__/PokerMeeting_meeting.graphql' +import {SharedUpdater, SimpleMutation} from '../types/relayMutations' +import createProxyRecord from '../utils/relay/createProxyRecord' // asking for the correct hoveringUsers array would be fine, except we know a user can existing in exactly 1 hoveringUsers array at a time // which means we have to iterate over each stage & remove it from all others (because mouseEnter/mouseLeave are not always reliable) diff --git a/packages/client/mutations/PokerResetDimensionMutation.ts b/packages/client/mutations/PokerResetDimensionMutation.ts index 1a0c238dabb..1939a0dd0f0 100644 --- a/packages/client/mutations/PokerResetDimensionMutation.ts +++ b/packages/client/mutations/PokerResetDimensionMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {PokerResetDimensionMutation as TPokerResetDimensionMutation} from '../__generated__/PokerResetDimensionMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment PokerResetDimensionMutation_meeting on PokerResetDimensionSuccess { diff --git a/packages/client/mutations/PromoteNewMeetingFacilitatorMutation.ts b/packages/client/mutations/PromoteNewMeetingFacilitatorMutation.ts index b632f194b99..085309e7859 100644 --- a/packages/client/mutations/PromoteNewMeetingFacilitatorMutation.ts +++ b/packages/client/mutations/PromoteNewMeetingFacilitatorMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {OnNextHandler, SimpleMutation} from '../types/relayMutations' import {PromoteNewMeetingFacilitatorMutation as TPromoteNewMeetingFacilitatorMutation} from '../__generated__/PromoteNewMeetingFacilitatorMutation.graphql' import {PromoteNewMeetingFacilitatorMutation_meeting$data} from '../__generated__/PromoteNewMeetingFacilitatorMutation_meeting.graphql' +import {OnNextHandler, SimpleMutation} from '../types/relayMutations' graphql` fragment PromoteNewMeetingFacilitatorMutation_meeting on PromoteNewMeetingFacilitatorPayload { diff --git a/packages/client/mutations/PromoteToTeamLeadMutation.ts b/packages/client/mutations/PromoteToTeamLeadMutation.ts index af3325b1808..fba4d965c6e 100644 --- a/packages/client/mutations/PromoteToTeamLeadMutation.ts +++ b/packages/client/mutations/PromoteToTeamLeadMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {PromoteToTeamLeadMutation as TPromoteToTeamLeadMutation} from '../__generated__/PromoteToTeamLeadMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment PromoteToTeamLeadMutation_team on PromoteToTeamLeadPayload { team { diff --git a/packages/client/mutations/PushInvitationMutation.ts b/packages/client/mutations/PushInvitationMutation.ts index af7252d1625..b4dc41146e7 100644 --- a/packages/client/mutations/PushInvitationMutation.ts +++ b/packages/client/mutations/PushInvitationMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {OnNextHandler, StandardMutation} from '../types/relayMutations' import {PushInvitationMutation as TPushInvitationMutation} from '../__generated__/PushInvitationMutation.graphql' import {PushInvitationMutation_team$data} from '../__generated__/PushInvitationMutation_team.graphql' +import {OnNextHandler, StandardMutation} from '../types/relayMutations' import DenyPushInvitationMutation from './DenyPushInvitationMutation' import InviteToTeamMutation from './InviteToTeamMutation' diff --git a/packages/client/mutations/ReflectTemplatePromptUpdateDescriptionMutation.ts b/packages/client/mutations/ReflectTemplatePromptUpdateDescriptionMutation.ts index e4126838116..166f1202558 100644 --- a/packages/client/mutations/ReflectTemplatePromptUpdateDescriptionMutation.ts +++ b/packages/client/mutations/ReflectTemplatePromptUpdateDescriptionMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {ReflectTemplatePromptUpdateDescriptionMutation as TReflectTemplatePromptUpdateDescriptionMutation} from '../__generated__/ReflectTemplatePromptUpdateDescriptionMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment ReflectTemplatePromptUpdateDescriptionMutation_team on ReflectTemplatePromptUpdateDescriptionPayload { diff --git a/packages/client/mutations/ReflectTemplatePromptUpdateGroupColorMutation.ts b/packages/client/mutations/ReflectTemplatePromptUpdateGroupColorMutation.ts index abab45f0b58..254f8f6facf 100644 --- a/packages/client/mutations/ReflectTemplatePromptUpdateGroupColorMutation.ts +++ b/packages/client/mutations/ReflectTemplatePromptUpdateGroupColorMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SimpleMutation} from '../types/relayMutations' import {ReflectTemplatePromptUpdateGroupColorMutation as TReflectTemplatePromptUpdateGroupColorMutation} from '../__generated__/ReflectTemplatePromptUpdateGroupColorMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' graphql` fragment ReflectTemplatePromptUpdateGroupColorMutation_team on ReflectTemplatePromptUpdateGroupColorPayload { diff --git a/packages/client/mutations/RemoveAgendaItemMutation.ts b/packages/client/mutations/RemoveAgendaItemMutation.ts index f698ac1200f..865e63319b9 100644 --- a/packages/client/mutations/RemoveAgendaItemMutation.ts +++ b/packages/client/mutations/RemoveAgendaItemMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' import {RemoveAgendaItemMutation as TRemoveAgendaItemMutation} from '../__generated__/RemoveAgendaItemMutation.graphql' import {RemoveAgendaItemMutation_team$data} from '../__generated__/RemoveAgendaItemMutation_team.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import handleRemoveAgendaItems from './handlers/handleRemoveAgendaItems' graphql` fragment RemoveAgendaItemMutation_team on RemoveAgendaItemPayload { diff --git a/packages/client/mutations/RemoveAtlassianAuthMutation.ts b/packages/client/mutations/RemoveAtlassianAuthMutation.ts index 576a6425624..1a69d58234b 100644 --- a/packages/client/mutations/RemoveAtlassianAuthMutation.ts +++ b/packages/client/mutations/RemoveAtlassianAuthMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {RemoveAtlassianAuthMutation as TRemoveAtlassianAuthMutation} from '../__generated__/RemoveAtlassianAuthMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment RemoveAtlassianAuthMutation_team on RemoveAtlassianAuthPayload { diff --git a/packages/client/mutations/RemoveGitHubAuthMutation.ts b/packages/client/mutations/RemoveGitHubAuthMutation.ts index 1f212137fba..4e0a50c48ae 100644 --- a/packages/client/mutations/RemoveGitHubAuthMutation.ts +++ b/packages/client/mutations/RemoveGitHubAuthMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {RemoveGitHubAuthMutation as TRemoveGitHubAuthMutation} from '../__generated__/RemoveGitHubAuthMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment RemoveGitHubAuthMutation_team on RemoveGitHubAuthPayload { diff --git a/packages/client/mutations/RemoveIntegrationProviderMutation.ts b/packages/client/mutations/RemoveIntegrationProviderMutation.ts index b807ac2d615..26acc7035fe 100644 --- a/packages/client/mutations/RemoveIntegrationProviderMutation.ts +++ b/packages/client/mutations/RemoveIntegrationProviderMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {RemoveIntegrationProviderMutation as TRemoveIntegrationProviderMutation} from '../__generated__/RemoveIntegrationProviderMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment RemoveIntegrationProviderMutation_team on RemoveIntegrationProviderSuccess { diff --git a/packages/client/mutations/RemoveJiraServerSearchQueryMutation.ts b/packages/client/mutations/RemoveJiraServerSearchQueryMutation.ts index 6fe116b185c..14284935dcb 100644 --- a/packages/client/mutations/RemoveJiraServerSearchQueryMutation.ts +++ b/packages/client/mutations/RemoveJiraServerSearchQueryMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SimpleMutation} from '../types/relayMutations' import {RemoveJiraServerSearchQueryMutation as TRemoveJiraServerSearchQueryMutation} from '../__generated__/RemoveJiraServerSearchQueryMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' graphql` fragment RemoveJiraServerSearchQueryMutation_notification on RemoveIntegrationSearchQuerySuccess { diff --git a/packages/client/mutations/RemoveOrgUserMutation.ts b/packages/client/mutations/RemoveOrgUserMutation.ts index b16f85fb91e..13e86325497 100644 --- a/packages/client/mutations/RemoveOrgUserMutation.ts +++ b/packages/client/mutations/RemoveOrgUserMutation.ts @@ -2,6 +2,9 @@ import graphql from 'babel-plugin-relay/macro' import {commitLocalUpdate, commitMutation} from 'react-relay' import {RemoveOrgUserMutation as TRemoveOrgUserMutation} from '~/__generated__/RemoveOrgUserMutation.graphql' import {RemoveOrgUserMutation_team$data} from '~/__generated__/RemoveOrgUserMutation_team.graphql' +import {RemoveOrgUserMutation_notification$data} from '../__generated__/RemoveOrgUserMutation_notification.graphql' +import {RemoveOrgUserMutation_organization$data} from '../__generated__/RemoveOrgUserMutation_organization.graphql' +import {RemoveOrgUserMutation_task$data} from '../__generated__/RemoveOrgUserMutation_task.graphql' import { HistoryLocalHandler, OnNextHandler, @@ -14,12 +17,9 @@ import onExOrgRoute from '../utils/onExOrgRoute' import onMeetingRoute from '../utils/onMeetingRoute' import onTeamRoute from '../utils/onTeamRoute' import {setLocalStageAndPhase} from '../utils/relay/updateLocalStage' -import {RemoveOrgUserMutation_notification$data} from '../__generated__/RemoveOrgUserMutation_notification.graphql' -import {RemoveOrgUserMutation_organization$data} from '../__generated__/RemoveOrgUserMutation_organization.graphql' -import {RemoveOrgUserMutation_task$data} from '../__generated__/RemoveOrgUserMutation_task.graphql' import handleAddNotifications from './handlers/handleAddNotifications' -import handleRemoveOrganization from './handlers/handleRemoveOrganization' import handleRemoveOrgMembers from './handlers/handleRemoveOrgMembers' +import handleRemoveOrganization from './handlers/handleRemoveOrganization' import handleRemoveTasks from './handlers/handleRemoveTasks' import handleRemoveTeamMembers from './handlers/handleRemoveTeamMembers' import handleRemoveTeams from './handlers/handleRemoveTeams' diff --git a/packages/client/mutations/RemovePokerTemplateDimensionMutation.ts b/packages/client/mutations/RemovePokerTemplateDimensionMutation.ts index cf95494111d..8b6117f7fb5 100644 --- a/packages/client/mutations/RemovePokerTemplateDimensionMutation.ts +++ b/packages/client/mutations/RemovePokerTemplateDimensionMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' import {RemovePokerTemplateDimensionMutation as IRemovePokerTemplateDimensionMutation} from '../__generated__/RemovePokerTemplateDimensionMutation.graphql' import {RemovePokerTemplateDimensionMutation_team$data} from '../__generated__/RemovePokerTemplateDimensionMutation_team.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import handleRemovePokerTemplateDimension from './handlers/handleRemovePokerTemplateDimension' graphql` diff --git a/packages/client/mutations/RemovePokerTemplateMutation.ts b/packages/client/mutations/RemovePokerTemplateMutation.ts index f6b47ee9dba..978c8bafaf6 100644 --- a/packages/client/mutations/RemovePokerTemplateMutation.ts +++ b/packages/client/mutations/RemovePokerTemplateMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' import {RemovePokerTemplateMutation as TRemovePokerTemplateMutation} from '../__generated__/RemovePokerTemplateMutation.graphql' import {RemovePokerTemplateMutation_team$data} from '../__generated__/RemovePokerTemplateMutation_team.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import handleRemovePokerTemplate from './handlers/handleRemovePokerTemplate' graphql` @@ -32,12 +32,9 @@ export const removePokerTemplateTeamUpdater: SharedUpdater< RemovePokerTemplateMutation_team$data > = (payload, {store}) => { const templateId = payload.getLinkedRecord('pokerTemplate').getValue('id') - const teamId = payload.getLinkedRecord('pokerTemplate').getValue('teamId') - handleRemovePokerTemplate(templateId, teamId, store) + handleRemovePokerTemplate(templateId, store) } -type PokerTemplate = NonNullable - const RemovePokerTemplateMutation: StandardMutation = ( atmosphere, variables, @@ -55,9 +52,7 @@ const RemovePokerTemplateMutation: StandardMutation { const {templateId} = variables - const template = store.get(templateId)! - const teamId = template.getValue('teamId') - handleRemovePokerTemplate(templateId, teamId, store) + handleRemovePokerTemplate(templateId, store) } }) } diff --git a/packages/client/mutations/RemovePokerTemplateScaleMutation.ts b/packages/client/mutations/RemovePokerTemplateScaleMutation.ts index c88546ca0aa..fd17762e834 100644 --- a/packages/client/mutations/RemovePokerTemplateScaleMutation.ts +++ b/packages/client/mutations/RemovePokerTemplateScaleMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' import {RemovePokerTemplateScaleMutation as IRemovePokerTemplateScaleMutation} from '../__generated__/RemovePokerTemplateScaleMutation.graphql' import {RemovePokerTemplateScaleMutation_scale$data} from '../__generated__/RemovePokerTemplateScaleMutation_scale.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import handleRemovePokerTemplateScale from './handlers/handleRemovePokerTemplateScale' graphql` diff --git a/packages/client/mutations/RemovePokerTemplateScaleValueMutation.ts b/packages/client/mutations/RemovePokerTemplateScaleValueMutation.ts index 94469cd3338..c99b6514b73 100644 --- a/packages/client/mutations/RemovePokerTemplateScaleValueMutation.ts +++ b/packages/client/mutations/RemovePokerTemplateScaleValueMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import safeRemoveNodeFromArray from '~/utils/relay/safeRemoveNodeFromArray' -import {StandardMutation} from '../types/relayMutations' import {RemovePokerTemplateScaleValueMutation as IRemovePokerTemplateScaleValueMutation} from '../__generated__/RemovePokerTemplateScaleValueMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment RemovePokerTemplateScaleValueMutation_scale on RemovePokerTemplateScaleValuePayload { diff --git a/packages/client/mutations/RemoveReflectTemplateMutation.ts b/packages/client/mutations/RemoveReflectTemplateMutation.ts index ba887c5b66a..f82e6b3e99e 100644 --- a/packages/client/mutations/RemoveReflectTemplateMutation.ts +++ b/packages/client/mutations/RemoveReflectTemplateMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' import {RemoveReflectTemplateMutation as TRemoveReflectTemplateMutation} from '../__generated__/RemoveReflectTemplateMutation.graphql' import {RemoveReflectTemplateMutation_team$data} from '../__generated__/RemoveReflectTemplateMutation_team.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import handleRemoveReflectTemplate from './handlers/handleRemoveReflectTemplate' graphql` diff --git a/packages/client/mutations/RemoveReflectTemplatePromptMutation.ts b/packages/client/mutations/RemoveReflectTemplatePromptMutation.ts index 393fed94e54..d822dc855e5 100644 --- a/packages/client/mutations/RemoveReflectTemplatePromptMutation.ts +++ b/packages/client/mutations/RemoveReflectTemplatePromptMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SharedUpdater, StandardMutation} from '../types/relayMutations' import {RemoveReflectTemplatePromptMutation as TRemoveReflectTemplatePromptMutation} from '../__generated__/RemoveReflectTemplatePromptMutation.graphql' import {RemoveReflectTemplatePromptMutation_team$data} from '../__generated__/RemoveReflectTemplatePromptMutation_team.graphql' +import {SharedUpdater, StandardMutation} from '../types/relayMutations' import handleRemoveReflectTemplatePrompt from './handlers/handleRemoveReflectTemplatePrompt' graphql` diff --git a/packages/client/mutations/RemoveReflectionMutation.ts b/packages/client/mutations/RemoveReflectionMutation.ts index f3ec9118b47..23c09faa733 100644 --- a/packages/client/mutations/RemoveReflectionMutation.ts +++ b/packages/client/mutations/RemoveReflectionMutation.ts @@ -6,9 +6,9 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {RecordSourceSelectorProxy} from 'relay-runtime' import {RemoveReflectionMutation_meeting$data} from '~/__generated__/RemoveReflectionMutation_meeting.graphql' +import {RemoveReflectionMutation as TRemoveReflectionMutation} from '../__generated__/RemoveReflectionMutation.graphql' import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations' import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray' -import {RemoveReflectionMutation as TRemoveReflectionMutation} from '../__generated__/RemoveReflectionMutation.graphql' import handleRemoveReflectionGroups from './handlers/handleRemoveReflectionGroups' graphql` diff --git a/packages/client/mutations/RemoveSlackAuthMutation.ts b/packages/client/mutations/RemoveSlackAuthMutation.ts index 5f72fb137e0..59f94e9e45a 100644 --- a/packages/client/mutations/RemoveSlackAuthMutation.ts +++ b/packages/client/mutations/RemoveSlackAuthMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {RemoveSlackAuthMutation as TRemoveSlackAuthMutation} from '../__generated__/RemoveSlackAuthMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment RemoveSlackAuthMutation_team on RemoveSlackAuthPayload { diff --git a/packages/client/mutations/RemoveTeamMemberIntegrationAuthMutation.ts b/packages/client/mutations/RemoveTeamMemberIntegrationAuthMutation.ts index 669209b41e2..fcec82fdcfc 100644 --- a/packages/client/mutations/RemoveTeamMemberIntegrationAuthMutation.ts +++ b/packages/client/mutations/RemoveTeamMemberIntegrationAuthMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {RemoveTeamMemberIntegrationAuthMutation as TRemoveTeamMemberIntegrationAuthMutation} from '../__generated__/RemoveTeamMemberIntegrationAuthMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment RemoveTeamMemberIntegrationAuthMutation_team on RemoveTeamMemberIntegrationAuthSuccess { diff --git a/packages/client/mutations/RemoveTeamMemberMutation.ts b/packages/client/mutations/RemoveTeamMemberMutation.ts index f2a7362cae0..1acfef0e19f 100644 --- a/packages/client/mutations/RemoveTeamMemberMutation.ts +++ b/packages/client/mutations/RemoveTeamMemberMutation.ts @@ -1,5 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {RemoveTeamMemberMutation as TRemoveTeamMemberMutation} from '../__generated__/RemoveTeamMemberMutation.graphql' +import {RemoveTeamMemberMutation_task$data} from '../__generated__/RemoveTeamMemberMutation_task.graphql' +import {RemoveTeamMemberMutation_team$data} from '../__generated__/RemoveTeamMemberMutation_team.graphql' import { OnNextHandler, OnNextHistoryContext, @@ -8,15 +11,12 @@ import { } from '../types/relayMutations' import onMeetingRoute from '../utils/onMeetingRoute' import onTeamRoute from '../utils/onTeamRoute' -import {RemoveTeamMemberMutation as TRemoveTeamMemberMutation} from '../__generated__/RemoveTeamMemberMutation.graphql' -import {RemoveTeamMemberMutation_task$data} from '../__generated__/RemoveTeamMemberMutation_task.graphql' -import {RemoveTeamMemberMutation_team$data} from '../__generated__/RemoveTeamMemberMutation_team.graphql' +import SetNotificationStatusMutation from './SetNotificationStatusMutation' import handleAddNotifications from './handlers/handleAddNotifications' import handleRemoveTasks from './handlers/handleRemoveTasks' import handleRemoveTeamMembers from './handlers/handleRemoveTeamMembers' import handleRemoveTeams from './handlers/handleRemoveTeams' import handleUpsertTasks from './handlers/handleUpsertTasks' -import SetNotificationStatusMutation from './SetNotificationStatusMutation' graphql` fragment RemoveTeamMemberMutation_task on RemoveTeamMemberPayload { diff --git a/packages/client/mutations/RenameMeetingMutation.ts b/packages/client/mutations/RenameMeetingMutation.ts index f52e2231200..24497489eea 100644 --- a/packages/client/mutations/RenameMeetingMutation.ts +++ b/packages/client/mutations/RenameMeetingMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {RenameMeetingMutation as TRenameMeetingMutation} from '../__generated__/RenameMeetingMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment RenameMeetingMutation_team on RenameMeetingSuccess { diff --git a/packages/client/mutations/RequestToJoinDomainMutation.ts b/packages/client/mutations/RequestToJoinDomainMutation.ts index c0397785779..98fdc28ce47 100644 --- a/packages/client/mutations/RequestToJoinDomainMutation.ts +++ b/packages/client/mutations/RequestToJoinDomainMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {SimpleMutation} from '../types/relayMutations' import {RequestToJoinDomainMutation as TRequestToJoinDomainMutation} from '../__generated__/RequestToJoinDomainMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' import promptToJoinOrgSuccessToast from './toasts/promptToJoinOrgSuccessToast' const mutation = graphql` diff --git a/packages/client/mutations/ResetPasswordMutation.ts b/packages/client/mutations/ResetPasswordMutation.ts index 4d61a5a25dc..4035b67f172 100644 --- a/packages/client/mutations/ResetPasswordMutation.ts +++ b/packages/client/mutations/ResetPasswordMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import getValidRedirectParam from '~/utils/getValidRedirectParam' -import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {ResetPasswordMutation as TResetPasswordMutation} from '../__generated__/ResetPasswordMutation.graphql' +import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' const mutation = graphql` mutation ResetPasswordMutation($newPassword: String!, $token: ID!) { diff --git a/packages/client/mutations/ResetReflectionGroupsMutation.ts b/packages/client/mutations/ResetReflectionGroupsMutation.ts index eb91e7998fb..66cc437e32e 100644 --- a/packages/client/mutations/ResetReflectionGroupsMutation.ts +++ b/packages/client/mutations/ResetReflectionGroupsMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {ResetReflectionGroupsMutation as TResetReflectionGroupsMutation} from '../__generated__/ResetReflectionGroupsMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment ResetReflectionGroupsMutation_meeting on ResetReflectionGroupsSuccess { diff --git a/packages/client/mutations/ResetRetroMeetingToGroupStageMutation.ts b/packages/client/mutations/ResetRetroMeetingToGroupStageMutation.ts index 82625860e53..d547f4df8fb 100644 --- a/packages/client/mutations/ResetRetroMeetingToGroupStageMutation.ts +++ b/packages/client/mutations/ResetRetroMeetingToGroupStageMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import Atmosphere from '~/Atmosphere' -import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import {ResetRetroMeetingToGroupStageMutation as TResetRetroMeetingToGroupStageMutation} from '../__generated__/ResetRetroMeetingToGroupStageMutation.graphql' +import {SharedUpdater, SimpleMutation} from '../types/relayMutations' import getDiscussionThreadConn from './connections/getDiscussionThreadConn' graphql` diff --git a/packages/client/mutations/RevealTeamHealthVotesMutation.ts b/packages/client/mutations/RevealTeamHealthVotesMutation.ts index 5e39040b186..7e553f6bd75 100644 --- a/packages/client/mutations/RevealTeamHealthVotesMutation.ts +++ b/packages/client/mutations/RevealTeamHealthVotesMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {RevealTeamHealthVotesMutation as TRevealTeamHealthVotesMutation} from '../__generated__/RevealTeamHealthVotesMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment RevealTeamHealthVotesMutation_meeting on RevealTeamHealthVotesSuccess { diff --git a/packages/client/mutations/SelectTemplateMutation.ts b/packages/client/mutations/SelectTemplateMutation.ts index 6b151a1e670..b81021c7ec9 100644 --- a/packages/client/mutations/SelectTemplateMutation.ts +++ b/packages/client/mutations/SelectTemplateMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {SelectTemplateMutation as TSelectTemplateMutation} from '../__generated__/SelectTemplateMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment SelectTemplateMutation_team on SelectTemplatePayload { diff --git a/packages/client/mutations/SetDefaultSlackChannelMutation.ts b/packages/client/mutations/SetDefaultSlackChannelMutation.ts index 2d22c0823eb..7e216fdd129 100644 --- a/packages/client/mutations/SetDefaultSlackChannelMutation.ts +++ b/packages/client/mutations/SetDefaultSlackChannelMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import toTeamMemberId from '~/utils/relay/toTeamMemberId' -import {StandardMutation} from '../types/relayMutations' import {SetDefaultSlackChannelMutation as TSetDefaultSlackChannelMutation} from '../__generated__/SetDefaultSlackChannelMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment SetDefaultSlackChannelMutation_team on SetDefaultSlackChannelSuccess { diff --git a/packages/client/mutations/SetMeetingSettingsMutation.ts b/packages/client/mutations/SetMeetingSettingsMutation.ts index caa0bf0430e..222b65f08bd 100644 --- a/packages/client/mutations/SetMeetingSettingsMutation.ts +++ b/packages/client/mutations/SetMeetingSettingsMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {SetMeetingSettingsMutation as TSetMeetingSettingsMutation} from '../__generated__/SetMeetingSettingsMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment SetMeetingSettingsMutation_team on SetMeetingSettingsPayload { diff --git a/packages/client/mutations/SetOrgUserRoleMutation.ts b/packages/client/mutations/SetOrgUserRoleMutation.ts index c0ed2771a85..9dd46ffe948 100644 --- a/packages/client/mutations/SetOrgUserRoleMutation.ts +++ b/packages/client/mutations/SetOrgUserRoleMutation.ts @@ -1,13 +1,13 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {SetOrgUserRoleMutation as TSetOrgUserRoleMutation} from '../__generated__/SetOrgUserRoleMutation.graphql' +import {SetOrgUserRoleMutation_organization$data} from '../__generated__/SetOrgUserRoleMutation_organization.graphql' import { OnNextHandler, OnNextHistoryContext, SharedUpdater, StandardMutation } from '../types/relayMutations' -import {SetOrgUserRoleMutation as TSetOrgUserRoleMutation} from '../__generated__/SetOrgUserRoleMutation.graphql' -import {SetOrgUserRoleMutation_organization$data} from '../__generated__/SetOrgUserRoleMutation_organization.graphql' import handleAddNotifications from './handlers/handleAddNotifications' import handleAddOrganization from './handlers/handleAddOrganization' diff --git a/packages/client/mutations/SetPhaseFocusMutation.ts b/packages/client/mutations/SetPhaseFocusMutation.ts index d12333f0ec8..ab03ac82965 100644 --- a/packages/client/mutations/SetPhaseFocusMutation.ts +++ b/packages/client/mutations/SetPhaseFocusMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {SetPhaseFocusMutation as TSetPhaseFocusMutation} from '../__generated__/SetPhaseFocusMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment SetPhaseFocusMutation_meeting on SetPhaseFocusPayload { diff --git a/packages/client/mutations/SetPokerSpectateMutation.ts b/packages/client/mutations/SetPokerSpectateMutation.ts index bd1a40aa536..41efac4cc1d 100644 --- a/packages/client/mutations/SetPokerSpectateMutation.ts +++ b/packages/client/mutations/SetPokerSpectateMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {SetPokerSpectateMutation as TSetPokerSpectateMutation} from '../__generated__/SetPokerSpectateMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment SetPokerSpectateMutation_team on SetPokerSpectateSuccess { diff --git a/packages/client/mutations/SetSlackNotificationMutation.ts b/packages/client/mutations/SetSlackNotificationMutation.ts index fb0c5e734ca..436d5492586 100644 --- a/packages/client/mutations/SetSlackNotificationMutation.ts +++ b/packages/client/mutations/SetSlackNotificationMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {SetSlackNotificationMutation as TSetSlackNotificationMutation} from '../__generated__/SetSlackNotificationMutation.graphql' import {StandardMutation} from '../types/relayMutations' import toTeamMemberId from '../utils/relay/toTeamMemberId' -import {SetSlackNotificationMutation as TSetSlackNotificationMutation} from '../__generated__/SetSlackNotificationMutation.graphql' graphql` fragment SetSlackNotificationMutation_team on SetSlackNotificationPayload { diff --git a/packages/client/mutations/SetStageTimerMutation.ts b/packages/client/mutations/SetStageTimerMutation.ts index 655e904d210..470c5753049 100644 --- a/packages/client/mutations/SetStageTimerMutation.ts +++ b/packages/client/mutations/SetStageTimerMutation.ts @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {SetStageTimerMutation_meeting$data} from '~/__generated__/SetStageTimerMutation_meeting.graphql' +import {SetStageTimerMutation as _SetStageTimerMutation} from '../__generated__/SetStageTimerMutation.graphql' import {RelayDateHack, SharedUpdater, StandardMutation} from '../types/relayMutations' import LocalTimeHandler from '../utils/relay/LocalTimeHandler' -import {SetStageTimerMutation as _SetStageTimerMutation} from '../__generated__/SetStageTimerMutation.graphql' graphql` fragment SetStageTimerMutation_meeting on SetStageTimerPayload { diff --git a/packages/client/mutations/SetTaskEstimateMutation.ts b/packages/client/mutations/SetTaskEstimateMutation.ts index 70279ab322e..952dd6797d7 100644 --- a/packages/client/mutations/SetTaskEstimateMutation.ts +++ b/packages/client/mutations/SetTaskEstimateMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {BaseLocalHandlers, StandardMutation} from '../types/relayMutations' import {SetTaskEstimateMutation as TSetTaskEstimateMutation} from '../__generated__/SetTaskEstimateMutation.graphql' +import {BaseLocalHandlers, StandardMutation} from '../types/relayMutations' graphql` fragment SetTaskEstimateMutation_meeting on SetTaskEstimateSuccess { diff --git a/packages/client/mutations/SetTaskHighlightMutation.ts b/packages/client/mutations/SetTaskHighlightMutation.ts index eb3c79f19c5..61cd296ce34 100644 --- a/packages/client/mutations/SetTaskHighlightMutation.ts +++ b/packages/client/mutations/SetTaskHighlightMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import Atmosphere from '../Atmosphere' -import {SimpleMutation} from '../types/relayMutations' import {SetTaskHighlightMutation as TSetTaskHighlightMutation} from '../__generated__/SetTaskHighlightMutation.graphql' +import {SimpleMutation} from '../types/relayMutations' graphql` fragment SetTaskHighlightMutation_meeting on SetTaskHighlightSuccess { diff --git a/packages/client/mutations/SetTeamHealthVoteMutation.ts b/packages/client/mutations/SetTeamHealthVoteMutation.ts index c9bc5e419bb..b580c5e5cba 100644 --- a/packages/client/mutations/SetTeamHealthVoteMutation.ts +++ b/packages/client/mutations/SetTeamHealthVoteMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {SetTeamHealthVoteMutation as TSetTeamHealthVoteMutation} from '../__generated__/SetTeamHealthVoteMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment SetTeamHealthVoteMutation_meeting on SetTeamHealthVoteSuccess { diff --git a/packages/client/mutations/SignUpWithPasswordMutation.ts b/packages/client/mutations/SignUpWithPasswordMutation.ts index 307b71acaa1..427839cb2ef 100644 --- a/packages/client/mutations/SignUpWithPasswordMutation.ts +++ b/packages/client/mutations/SignUpWithPasswordMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin' -import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {SignUpWithPasswordMutation as TSignUpWithPasswordMutation} from '../__generated__/SignUpWithPasswordMutation.graphql' +import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {handleAcceptTeamInvitationErrors} from './AcceptTeamInvitationMutation' import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect' diff --git a/packages/client/mutations/StartCheckInMutation.ts b/packages/client/mutations/StartCheckInMutation.ts index 337b72bb0b3..bb0347404e7 100644 --- a/packages/client/mutations/StartCheckInMutation.ts +++ b/packages/client/mutations/StartCheckInMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {StartCheckInMutation as TStartCheckInMutation} from '../__generated__/StartCheckInMutation.graphql' +import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' graphql` fragment StartCheckInMutation_team on StartCheckInSuccess { diff --git a/packages/client/mutations/StartDraggingReflectionMutation.ts b/packages/client/mutations/StartDraggingReflectionMutation.ts index 970fb7477b6..c9934d253ab 100644 --- a/packages/client/mutations/StartDraggingReflectionMutation.ts +++ b/packages/client/mutations/StartDraggingReflectionMutation.ts @@ -4,9 +4,9 @@ import {matchPath} from 'react-router-dom' import {Disposable, RecordSourceProxy} from 'relay-runtime' import {StartDraggingReflectionMutation_meeting$data} from '~/__generated__/StartDraggingReflectionMutation_meeting.graphql' import Atmosphere from '../Atmosphere' +import {StartDraggingReflectionMutation as TStartDraggingReflectionMutation} from '../__generated__/StartDraggingReflectionMutation.graphql' import {ClientRetroReflection} from '../types/clientSchema' import {LocalHandlers, SharedUpdater} from '../types/relayMutations' -import {StartDraggingReflectionMutation as TStartDraggingReflectionMutation} from '../__generated__/StartDraggingReflectionMutation.graphql' graphql` fragment StartDraggingReflectionMutation_meeting on StartDraggingReflectionPayload { diff --git a/packages/client/mutations/StartSprintPokerMutation.ts b/packages/client/mutations/StartSprintPokerMutation.ts index d38ea338e2f..e078757582f 100644 --- a/packages/client/mutations/StartSprintPokerMutation.ts +++ b/packages/client/mutations/StartSprintPokerMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {StartSprintPokerMutation as TStartSprintPokerMutation} from '../__generated__/StartSprintPokerMutation.graphql' +import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' graphql` fragment StartSprintPokerMutation_team on StartSprintPokerSuccess { diff --git a/packages/client/mutations/StartTeamPromptMutation.ts b/packages/client/mutations/StartTeamPromptMutation.ts index fb9a702af72..bc8821c3bd7 100644 --- a/packages/client/mutations/StartTeamPromptMutation.ts +++ b/packages/client/mutations/StartTeamPromptMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {StartTeamPromptMutation as TStartTeamPromptMutation} from '../__generated__/StartTeamPromptMutation.graphql' +import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' graphql` fragment StartTeamPromptMutation_team on StartTeamPromptSuccess { diff --git a/packages/client/mutations/ToggleSummaryEmailMutation.ts b/packages/client/mutations/ToggleSummaryEmailMutation.ts index 6aac88ca70a..be0917cad79 100644 --- a/packages/client/mutations/ToggleSummaryEmailMutation.ts +++ b/packages/client/mutations/ToggleSummaryEmailMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {ToggleSummaryEmailMutation as TToggleSummaryEmailMutation} from '../__generated__/ToggleSummaryEmailMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment ToggleSummaryEmailMutation_team on ToggleSummaryEmailSuccess { diff --git a/packages/client/mutations/ToggleTeamDrawerMutation.ts b/packages/client/mutations/ToggleTeamDrawerMutation.ts index a1aa0d2779f..4fd322f18f1 100644 --- a/packages/client/mutations/ToggleTeamDrawerMutation.ts +++ b/packages/client/mutations/ToggleTeamDrawerMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {ToggleTeamDrawerMutation as TToggleTeamDrawerMutation} from '../__generated__/ToggleTeamDrawerMutation.graphql' import {StandardMutation} from '../types/relayMutations' import toTeamMemberId from '../utils/relay/toTeamMemberId' -import {ToggleTeamDrawerMutation as TToggleTeamDrawerMutation} from '../__generated__/ToggleTeamDrawerMutation.graphql' graphql` fragment ToggleTeamDrawerMutation_teamMember on ToggleTeamDrawerSuccess { diff --git a/packages/client/mutations/UpdateAgendaItemMutation.ts b/packages/client/mutations/UpdateAgendaItemMutation.ts index 25baf6f926d..b5844c1d871 100644 --- a/packages/client/mutations/UpdateAgendaItemMutation.ts +++ b/packages/client/mutations/UpdateAgendaItemMutation.ts @@ -4,9 +4,9 @@ import {RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime' import {ActionMeeting_meeting$data} from '~/__generated__/ActionMeeting_meeting.graphql' import {AgendaItem_agendaItem$data} from '~/__generated__/AgendaItem_agendaItem.graphql' import {UpdateAgendaItemMutation_team$data} from '~/__generated__/UpdateAgendaItemMutation_team.graphql' +import {UpdateAgendaItemMutation as TUpdateAgendaItemMutation} from '../__generated__/UpdateAgendaItemMutation.graphql' import {SharedUpdater, StandardMutation} from '../types/relayMutations' import updateProxyRecord from '../utils/relay/updateProxyRecord' -import {UpdateAgendaItemMutation as TUpdateAgendaItemMutation} from '../__generated__/UpdateAgendaItemMutation.graphql' import handleUpdateAgendaItems from './handlers/handleUpdateAgendaItems' graphql` diff --git a/packages/client/mutations/UpdateAutoJoinMutation.ts b/packages/client/mutations/UpdateAutoJoinMutation.ts index 766a53baff0..a3567bb9c0e 100644 --- a/packages/client/mutations/UpdateAutoJoinMutation.ts +++ b/packages/client/mutations/UpdateAutoJoinMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateAutoJoinMutation as TUpdateAutoJoinMutation} from '../__generated__/UpdateAutoJoinMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateAutoJoinMutation_team on UpdateAutoJoinSuccess { diff --git a/packages/client/mutations/UpdateAzureDevOpsDimensionFieldMutation.ts b/packages/client/mutations/UpdateAzureDevOpsDimensionFieldMutation.ts index a75a0b25bc1..62c2c611aaa 100644 --- a/packages/client/mutations/UpdateAzureDevOpsDimensionFieldMutation.ts +++ b/packages/client/mutations/UpdateAzureDevOpsDimensionFieldMutation.ts @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {DiscriminateProxy} from '../types/generics' -import {StandardMutation} from '../types/relayMutations' -import createProxyRecord from '../utils/relay/createProxyRecord' import {AzureDevOpsFieldMenu_stage$data} from '../__generated__/AzureDevOpsFieldMenu_stage.graphql' import {PokerMeeting_meeting$data} from '../__generated__/PokerMeeting_meeting.graphql' import {UpdateAzureDevOpsDimensionFieldMutation as TUpdateAzureDevOpsDimensionFieldMutation} from '../__generated__/UpdateAzureDevOpsDimensionFieldMutation.graphql' +import {DiscriminateProxy} from '../types/generics' +import {StandardMutation} from '../types/relayMutations' +import createProxyRecord from '../utils/relay/createProxyRecord' graphql` fragment UpdateAzureDevOpsDimensionFieldMutation_team on UpdateAzureDevOpsDimensionFieldSuccess { diff --git a/packages/client/mutations/UpdateCommentContentMutation.ts b/packages/client/mutations/UpdateCommentContentMutation.ts index 91377ca137b..d9148ea499c 100644 --- a/packages/client/mutations/UpdateCommentContentMutation.ts +++ b/packages/client/mutations/UpdateCommentContentMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateCommentContentMutation as TUpdateCommentContentMutation} from '../__generated__/UpdateCommentContentMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateCommentContentMutation_meeting on UpdateCommentContentSuccess { diff --git a/packages/client/mutations/UpdateCreditCardMutation.ts b/packages/client/mutations/UpdateCreditCardMutation.ts index 0aaff96d7cc..fedd416029a 100644 --- a/packages/client/mutations/UpdateCreditCardMutation.ts +++ b/packages/client/mutations/UpdateCreditCardMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateCreditCardMutation as TUpdateCreditCardMutation} from '../__generated__/UpdateCreditCardMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateCreditCardMutation_organization on UpdateCreditCardSuccess { diff --git a/packages/client/mutations/UpdateFeatureFlagMutation.ts b/packages/client/mutations/UpdateFeatureFlagMutation.ts index da6932b518e..cdb49794937 100644 --- a/packages/client/mutations/UpdateFeatureFlagMutation.ts +++ b/packages/client/mutations/UpdateFeatureFlagMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateFeatureFlagMutation as TUpdateFeatureFlagMutation} from '../__generated__/UpdateFeatureFlagMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateFeatureFlagMutation_notification on UpdateFeatureFlagPayload { diff --git a/packages/client/mutations/UpdateGitHubDimensionFieldMutation.ts b/packages/client/mutations/UpdateGitHubDimensionFieldMutation.ts index c618dd95366..9429f5dfba2 100644 --- a/packages/client/mutations/UpdateGitHubDimensionFieldMutation.ts +++ b/packages/client/mutations/UpdateGitHubDimensionFieldMutation.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {GitHubFieldMenu_stage$data} from '../__generated__/GitHubFieldMenu_stage.graphql' +import {UpdateGitHubDimensionFieldMutation as TUpdateGitHubDimensionFieldMutation} from '../__generated__/UpdateGitHubDimensionFieldMutation.graphql' import {DiscriminateProxy} from '../types/generics' import {StandardMutation} from '../types/relayMutations' import createProxyRecord from '../utils/relay/createProxyRecord' -import {GitHubFieldMenu_stage$data} from '../__generated__/GitHubFieldMenu_stage.graphql' -import {UpdateGitHubDimensionFieldMutation as TUpdateGitHubDimensionFieldMutation} from '../__generated__/UpdateGitHubDimensionFieldMutation.graphql' graphql` fragment UpdateGitHubDimensionFieldMutation_team on UpdateGitHubDimensionFieldSuccess { diff --git a/packages/client/mutations/UpdateGitLabDimensionFieldMutation.ts b/packages/client/mutations/UpdateGitLabDimensionFieldMutation.ts index 39828951845..19bcc503009 100644 --- a/packages/client/mutations/UpdateGitLabDimensionFieldMutation.ts +++ b/packages/client/mutations/UpdateGitLabDimensionFieldMutation.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {GitLabFieldMenu_stage$data} from '../__generated__/GitLabFieldMenu_stage.graphql' +import {UpdateGitLabDimensionFieldMutation as TUpdateGitLabDimensionFieldMutation} from '../__generated__/UpdateGitLabDimensionFieldMutation.graphql' import {DiscriminateProxy} from '../types/generics' import {StandardMutation} from '../types/relayMutations' import createProxyRecord from '../utils/relay/createProxyRecord' -import {GitLabFieldMenu_stage$data} from '../__generated__/GitLabFieldMenu_stage.graphql' -import {UpdateGitLabDimensionFieldMutation as TUpdateGitLabDimensionFieldMutation} from '../__generated__/UpdateGitLabDimensionFieldMutation.graphql' graphql` fragment UpdateGitLabDimensionFieldMutation_team on UpdateGitLabDimensionFieldSuccess { diff --git a/packages/client/mutations/UpdateIntegrationProviderMutation.ts b/packages/client/mutations/UpdateIntegrationProviderMutation.ts index f019089fcaf..31ca200844c 100644 --- a/packages/client/mutations/UpdateIntegrationProviderMutation.ts +++ b/packages/client/mutations/UpdateIntegrationProviderMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateIntegrationProviderMutation as TUpdateIntegrationProviderMutation} from '../__generated__/UpdateIntegrationProviderMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateIntegrationProviderMutation_team on UpdateIntegrationProviderSuccess { diff --git a/packages/client/mutations/UpdateJiraDimensionFieldMutation.ts b/packages/client/mutations/UpdateJiraDimensionFieldMutation.ts index b8cac7d804c..8eb2e1942ad 100644 --- a/packages/client/mutations/UpdateJiraDimensionFieldMutation.ts +++ b/packages/client/mutations/UpdateJiraDimensionFieldMutation.ts @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {DiscriminateProxy} from '../types/generics' -import {StandardMutation} from '../types/relayMutations' -import createProxyRecord from '../utils/relay/createProxyRecord' import {JiraFieldMenu_stage$data} from '../__generated__/JiraFieldMenu_stage.graphql' import {PokerMeeting_meeting$data} from '../__generated__/PokerMeeting_meeting.graphql' import {UpdateJiraDimensionFieldMutation as TUpdateJiraDimensionFieldMutation} from '../__generated__/UpdateJiraDimensionFieldMutation.graphql' +import {DiscriminateProxy} from '../types/generics' +import {StandardMutation} from '../types/relayMutations' +import createProxyRecord from '../utils/relay/createProxyRecord' graphql` fragment UpdateJiraDimensionFieldMutation_team on UpdateDimensionFieldSuccess { diff --git a/packages/client/mutations/UpdateJiraServerDimensionFieldMutation.ts b/packages/client/mutations/UpdateJiraServerDimensionFieldMutation.ts index 0367c606cfe..e8f34c1b20e 100644 --- a/packages/client/mutations/UpdateJiraServerDimensionFieldMutation.ts +++ b/packages/client/mutations/UpdateJiraServerDimensionFieldMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateJiraServerDimensionFieldMutation as TUpdateJiraServerDimensionFieldMutation} from '../__generated__/UpdateJiraServerDimensionFieldMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateJiraServerDimensionFieldMutation_team on UpdateDimensionFieldSuccess { diff --git a/packages/client/mutations/UpdateMeetingPromptMutation.ts b/packages/client/mutations/UpdateMeetingPromptMutation.ts index 357a3f76acb..4b991a81cd8 100644 --- a/packages/client/mutations/UpdateMeetingPromptMutation.ts +++ b/packages/client/mutations/UpdateMeetingPromptMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateMeetingPromptMutation as TUpdateMeetingPromptMutation} from '../__generated__/UpdateMeetingPromptMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateMeetingPromptMutation_meeting on UpdateMeetingPromptSuccess { diff --git a/packages/client/mutations/UpdateMeetingTemplateMutation.ts b/packages/client/mutations/UpdateMeetingTemplateMutation.ts index c4dd1d6951b..af1dcb1c5ae 100644 --- a/packages/client/mutations/UpdateMeetingTemplateMutation.ts +++ b/packages/client/mutations/UpdateMeetingTemplateMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateMeetingTemplateMutation as TUpdateMeetingTemplateMutation} from '../__generated__/UpdateMeetingTemplateMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateMeetingTemplateMutation_meeting on UpdateMeetingTemplateSuccess { diff --git a/packages/client/mutations/UpdateNewCheckInQuestionMutation.ts b/packages/client/mutations/UpdateNewCheckInQuestionMutation.ts index c7dc80a21e9..3fea65edfa8 100644 --- a/packages/client/mutations/UpdateNewCheckInQuestionMutation.ts +++ b/packages/client/mutations/UpdateNewCheckInQuestionMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {RecordProxy} from 'relay-runtime' -import {StandardMutation} from '../types/relayMutations' import {UpdateNewCheckInQuestionMutation as TUpdateNewCheckInQuestionMutation} from '../__generated__/UpdateNewCheckInQuestionMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateNewCheckInQuestionMutation_meeting on UpdateNewCheckInQuestionPayload { meeting { diff --git a/packages/client/mutations/UpdateOrgMutation.ts b/packages/client/mutations/UpdateOrgMutation.ts index abedff72678..de261d1ffd1 100644 --- a/packages/client/mutations/UpdateOrgMutation.ts +++ b/packages/client/mutations/UpdateOrgMutation.ts @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {Disposable} from 'relay-runtime' import Atmosphere from '../Atmosphere' -import {LocalHandlers} from '../types/relayMutations' import {UpdateOrgMutation as TUpdateOrgMutation} from '../__generated__/UpdateOrgMutation.graphql' +import {LocalHandlers} from '../types/relayMutations' graphql` fragment UpdateOrgMutation_organization on UpdateOrgPayload { organization { diff --git a/packages/client/mutations/UpdatePokerScopeMutation.ts b/packages/client/mutations/UpdatePokerScopeMutation.ts index 0fdc0774c64..6f641fdcaa3 100644 --- a/packages/client/mutations/UpdatePokerScopeMutation.ts +++ b/packages/client/mutations/UpdatePokerScopeMutation.ts @@ -3,17 +3,17 @@ import {stateToHTML} from 'draft-js-export-html' import {commitMutation} from 'react-relay' import GitLabIssueId from '~/shared/gqlIds/GitLabIssueId' //import AzureDevOpsIssueId from '~/shared/gqlIds/AzureDevOpsIssueId' +import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql' import GitHubIssueId from '../shared/gqlIds/GitHubIssueId' import JiraIssueId from '../shared/gqlIds/JiraIssueId' import {PALETTE} from '../styles/paletteV3' import {BaseLocalHandlers, StandardMutation} from '../types/relayMutations' +import SendClientSideEvent from '../utils/SendClientSideEvent' import convertToTaskContent from '../utils/draftjs/convertToTaskContent' import splitDraftContent from '../utils/draftjs/splitDraftContent' import getSearchQueryFromMeeting from '../utils/getSearchQueryFromMeeting' import clientTempId from '../utils/relay/clientTempId' import createProxyRecord from '../utils/relay/createProxyRecord' -import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql' -import SendClientSideEvent from '../utils/SendClientSideEvent' graphql` fragment UpdatePokerScopeMutation_meeting on UpdatePokerScopeSuccess { diff --git a/packages/client/mutations/UpdatePokerTemplateDimensionScaleMutation.ts b/packages/client/mutations/UpdatePokerTemplateDimensionScaleMutation.ts index 80cdf5cf9c7..f7b1318bffc 100644 --- a/packages/client/mutations/UpdatePokerTemplateDimensionScaleMutation.ts +++ b/packages/client/mutations/UpdatePokerTemplateDimensionScaleMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdatePokerTemplateDimensionScaleMutation as TUpdatePokerTemplateDimensionScaleMutation} from '../__generated__/UpdatePokerTemplateDimensionScaleMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdatePokerTemplateDimensionScaleMutation_dimension on UpdatePokerTemplateDimensionScalePayload { diff --git a/packages/client/mutations/UpdatePokerTemplateScaleValueMutation.ts b/packages/client/mutations/UpdatePokerTemplateScaleValueMutation.ts index b2bbbc0e407..9051af89991 100644 --- a/packages/client/mutations/UpdatePokerTemplateScaleValueMutation.ts +++ b/packages/client/mutations/UpdatePokerTemplateScaleValueMutation.ts @@ -3,8 +3,8 @@ import {commitMutation} from 'react-relay' import addNodeToArray from '~/utils/relay/addNodeToArray' import createProxyRecord from '~/utils/relay/createProxyRecord' import safeRemoveNodeFromArray from '~/utils/relay/safeRemoveNodeFromArray' -import {StandardMutation} from '../types/relayMutations' import {UpdatePokerTemplateScaleValueMutation as TUpdatePokerTemplateScaleValueMutation} from '../__generated__/UpdatePokerTemplateScaleValueMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdatePokerTemplateScaleValueMutation_scale on UpdatePokerTemplateScaleValuePayload { diff --git a/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts b/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts index bedbcb69f5e..2210146aaa8 100644 --- a/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts +++ b/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts @@ -1,6 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime' +import {UpdatePokerTemplateScopeMutation as TUpdateTemplateScopeMutation} from '../__generated__/UpdatePokerTemplateScopeMutation.graphql' +import { + SharingScopeEnum, + UpdatePokerTemplateScopeMutation_organization$data +} from '../__generated__/UpdatePokerTemplateScopeMutation_organization.graphql' import {SharedUpdater, StandardMutation} from '../types/relayMutations' import addNodeToArray from '../utils/relay/addNodeToArray' import getBaseRecord from '../utils/relay/getBaseRecord' @@ -8,20 +13,12 @@ import getCachedRecord from '../utils/relay/getCachedRecord' import getNodeById from '../utils/relay/getNodeById' import {insertEdgeAfter} from '../utils/relay/insertEdge' import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray' -import safeRemoveNodeFromConn from '../utils/relay/safeRemoveNodeFromConn' -import {UpdatePokerTemplateScopeMutation as TUpdateTemplateScopeMutation} from '../__generated__/UpdatePokerTemplateScopeMutation.graphql' -import { - SharingScopeEnum, - UpdatePokerTemplateScopeMutation_organization$data -} from '../__generated__/UpdatePokerTemplateScopeMutation_organization.graphql' -import getPokerTemplateOrgConn from './connections/getPokerTemplateOrgConn' graphql` fragment UpdatePokerTemplateScopeMutation_organization on UpdateTemplateScopeSuccess { template { # these fragments are needed for listening org members ...TemplateSharing_template - ...PokerTemplateDetailsTemplate id orgId scope @@ -29,7 +26,6 @@ graphql` } clonedTemplate { ...TemplateSharing_template - ...PokerTemplateDetailsTemplate orgId } } @@ -55,9 +51,6 @@ const removeTemplateFromCurrentScope = ( ) => { if (scopeList === 'TEAM') { safeRemoveNodeFromArray(templateId, meetingSettings, 'teamTemplates') - } else if (scopeList === 'ORGANIZATION') { - const orgTemplatesConn = getPokerTemplateOrgConn(meetingSettings) - safeRemoveNodeFromConn(templateId, orgTemplatesConn) } // not possible for the public list to get mutated because this is an org subscription } @@ -78,14 +71,10 @@ export const putTemplateInConnection = ( const addTemplateToScope = ( template: RecordProxy, scope: SharingScopeEnum, - meetingSettings: RecordProxy, - store: RecordSourceSelectorProxy + meetingSettings: RecordProxy ) => { if (scope === 'TEAM') { addNodeToArray(template, meetingSettings, 'teamTemplates') - } else if (scope === 'ORGANIZATION') { - const orgTemplatesConn = getPokerTemplateOrgConn(meetingSettings) - putTemplateInConnection(template, orgTemplatesConn, store) } } @@ -117,13 +106,13 @@ const handleUpdateTemplateScope = ( if (scopeList === 'TEAM') { if (clonedTemplate) { removeTemplateFromCurrentScope(templateId, scopeList, meetingSettings) - addTemplateToScope(nextTemplate, scopeList, meetingSettings, store) + addTemplateToScope(nextTemplate, scopeList, meetingSettings) } } else if (scopeList === 'ORGANIZATION') { if (isDecreasing) { removeTemplateFromCurrentScope(templateId, scopeList, meetingSettings) } else { - addTemplateToScope(nextTemplate, scopeList, meetingSettings, store) + addTemplateToScope(nextTemplate, scopeList, meetingSettings) } } }) diff --git a/packages/client/mutations/UpdateRecurrenceSettingsMutation.ts b/packages/client/mutations/UpdateRecurrenceSettingsMutation.ts index ebb091d94c6..af0168c01ea 100644 --- a/packages/client/mutations/UpdateRecurrenceSettingsMutation.ts +++ b/packages/client/mutations/UpdateRecurrenceSettingsMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateRecurrenceSettingsMutation as TUpdateRecurrenceSettingsMutation} from '../__generated__/UpdateRecurrenceSettingsMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateRecurrenceSettingsMutation_team on UpdateRecurrenceSettingsSuccess { diff --git a/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts b/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts index 815a8dea119..7e547ad17d3 100644 --- a/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts +++ b/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts @@ -1,6 +1,11 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime' +import {UpdateReflectTemplateScopeMutation as TUpdateTemplateScopeMutation} from '../__generated__/UpdateReflectTemplateScopeMutation.graphql' +import { + SharingScopeEnum, + UpdateReflectTemplateScopeMutation_organization$data +} from '../__generated__/UpdateReflectTemplateScopeMutation_organization.graphql' import {SharedUpdater, StandardMutation} from '../types/relayMutations' import addNodeToArray from '../utils/relay/addNodeToArray' import getBaseRecord from '../utils/relay/getBaseRecord' @@ -9,11 +14,6 @@ import getNodeById from '../utils/relay/getNodeById' import {insertEdgeAfter} from '../utils/relay/insertEdge' import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray' import safeRemoveNodeFromConn from '../utils/relay/safeRemoveNodeFromConn' -import {UpdateReflectTemplateScopeMutation as TUpdateTemplateScopeMutation} from '../__generated__/UpdateReflectTemplateScopeMutation.graphql' -import { - SharingScopeEnum, - UpdateReflectTemplateScopeMutation_organization$data -} from '../__generated__/UpdateReflectTemplateScopeMutation_organization.graphql' import getReflectTemplateOrgConn from './connections/getReflectTemplateOrgConn' graphql` @@ -21,7 +21,6 @@ graphql` template { # these fragments are needed for listening org members ...TemplateSharing_template - ...ReflectTemplateDetailsTemplate id orgId scope @@ -29,7 +28,6 @@ graphql` } clonedTemplate { ...TemplateSharing_template - ...ReflectTemplateDetailsTemplate orgId } } diff --git a/packages/client/mutations/UpdateReflectionContentMutation.ts b/packages/client/mutations/UpdateReflectionContentMutation.ts index baaed306e67..6905ae3ca67 100644 --- a/packages/client/mutations/UpdateReflectionContentMutation.ts +++ b/packages/client/mutations/UpdateReflectionContentMutation.ts @@ -4,9 +4,9 @@ */ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {UpdateReflectionContentMutation as TUpdateReflectionContentMutation} from '../__generated__/UpdateReflectionContentMutation.graphql' import {StandardMutation} from '../types/relayMutations' import updateProxyRecord from '../utils/relay/updateProxyRecord' -import {UpdateReflectionContentMutation as TUpdateReflectionContentMutation} from '../__generated__/UpdateReflectionContentMutation.graphql' graphql` fragment UpdateReflectionContentMutation_meeting on UpdateReflectionContentPayload { diff --git a/packages/client/mutations/UpdateReflectionGroupTitleMutation.ts b/packages/client/mutations/UpdateReflectionGroupTitleMutation.ts index fa773ae7f39..c126140ff5c 100644 --- a/packages/client/mutations/UpdateReflectionGroupTitleMutation.ts +++ b/packages/client/mutations/UpdateReflectionGroupTitleMutation.ts @@ -4,9 +4,9 @@ */ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {UpdateReflectionGroupTitleMutation as TUpdateReflectionGroupTitleMutation} from '../__generated__/UpdateReflectionGroupTitleMutation.graphql' import {StandardMutation} from '../types/relayMutations' import updateProxyRecord from '../utils/relay/updateProxyRecord' -import {UpdateReflectionGroupTitleMutation as TUpdateReflectionGroupTitleMutation} from '../__generated__/UpdateReflectionGroupTitleMutation.graphql' graphql` fragment UpdateReflectionGroupTitleMutation_meeting on UpdateReflectionGroupTitlePayload { diff --git a/packages/client/mutations/UpdateRetroMaxVotesMutation.ts b/packages/client/mutations/UpdateRetroMaxVotesMutation.ts index 53581c252f7..f54961aa5ea 100644 --- a/packages/client/mutations/UpdateRetroMaxVotesMutation.ts +++ b/packages/client/mutations/UpdateRetroMaxVotesMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateRetroMaxVotesMutation as TUpdateRetroMaxVotesMutation} from '../__generated__/UpdateRetroMaxVotesMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateRetroMaxVotesMutation_meeting on UpdateRetroMaxVotesSuccess { diff --git a/packages/client/mutations/UpdateTaskDueDateMutation.ts b/packages/client/mutations/UpdateTaskDueDateMutation.ts index d86181b26f8..db2a85246cd 100644 --- a/packages/client/mutations/UpdateTaskDueDateMutation.ts +++ b/packages/client/mutations/UpdateTaskDueDateMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {UpdateTaskDueDateMutation as TUpdateTaskDueDateMutation} from '../__generated__/UpdateTaskDueDateMutation.graphql' import {WithFieldsAsType} from '../types/generics' import {StandardMutation} from '../types/relayMutations' -import {UpdateTaskDueDateMutation as TUpdateTaskDueDateMutation} from '../__generated__/UpdateTaskDueDateMutation.graphql' graphql` fragment UpdateTaskDueDateMutation_task on UpdateTaskDueDatePayload { task { diff --git a/packages/client/mutations/UpdateTaskMutation.ts b/packages/client/mutations/UpdateTaskMutation.ts index da27db53267..d66706865bd 100644 --- a/packages/client/mutations/UpdateTaskMutation.ts +++ b/packages/client/mutations/UpdateTaskMutation.ts @@ -1,6 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import ITask from '../../server/database/types/Task' +import {UpdateTaskMutation as TUpdateTaskMutation} from '../__generated__/UpdateTaskMutation.graphql' +import {UpdateTaskMutation_task$data} from '../__generated__/UpdateTaskMutation_task.graphql' import { OnNextHandler, OnNextHistoryContext, @@ -11,8 +13,6 @@ import { import extractTextFromDraftString from '../utils/draftjs/extractTextFromDraftString' import getTagsFromEntityMap from '../utils/draftjs/getTagsFromEntityMap' import updateProxyRecord from '../utils/relay/updateProxyRecord' -import {UpdateTaskMutation as TUpdateTaskMutation} from '../__generated__/UpdateTaskMutation.graphql' -import {UpdateTaskMutation_task$data} from '../__generated__/UpdateTaskMutation_task.graphql' import handleAddNotifications from './handlers/handleAddNotifications' import handleRemoveTasks from './handlers/handleRemoveTasks' import handleUpsertTasks from './handlers/handleUpsertTasks' diff --git a/packages/client/mutations/UpdateTeamNameMutation.ts b/packages/client/mutations/UpdateTeamNameMutation.ts index e6f35e64fa8..5e5647e7b6d 100644 --- a/packages/client/mutations/UpdateTeamNameMutation.ts +++ b/packages/client/mutations/UpdateTeamNameMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateTeamNameMutation as TUpdateTeamNameMutation} from '../__generated__/UpdateTeamNameMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateTeamNameMutation_team on UpdateTeamNamePayload { team { diff --git a/packages/client/mutations/UpdateTemplateCategoryMutation.ts b/packages/client/mutations/UpdateTemplateCategoryMutation.ts index 5f1ffeca163..b60539161db 100644 --- a/packages/client/mutations/UpdateTemplateCategoryMutation.ts +++ b/packages/client/mutations/UpdateTemplateCategoryMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' +import {useMutation} from 'react-relay' import {UpdateTemplateCategoryMutation as TUpdateTemplateCategoryMutation} from '../__generated__/UpdateTemplateCategoryMutation.graphql' import useAtmosphere from '../hooks/useAtmosphere' -import {useMutation} from 'react-relay' graphql` fragment UpdateTemplateCategoryMutation_team on UpdateTemplateCategorySuccess { diff --git a/packages/client/mutations/UpdateUserProfileMutation.ts b/packages/client/mutations/UpdateUserProfileMutation.ts index 94713656ea0..19ad11c7e9e 100644 --- a/packages/client/mutations/UpdateUserProfileMutation.ts +++ b/packages/client/mutations/UpdateUserProfileMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import {StandardMutation} from '../types/relayMutations' import {UpdateUserProfileMutation as TUpdateUserProfileMutation} from '../__generated__/UpdateUserProfileMutation.graphql' +import {StandardMutation} from '../types/relayMutations' graphql` fragment UpdateUserProfileMutation_team on UpdateUserProfilePayload { diff --git a/packages/client/mutations/UploadOrgImageMutation.ts b/packages/client/mutations/UploadOrgImageMutation.ts index b6933a2011d..8cea80903bc 100644 --- a/packages/client/mutations/UploadOrgImageMutation.ts +++ b/packages/client/mutations/UploadOrgImageMutation.ts @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {UploadableMap} from 'relay-runtime' import Atmosphere from '../Atmosphere' -import {BaseLocalHandlers} from '../types/relayMutations' import {UploadOrgImageMutation as TUploadOrgImageMutation} from '../__generated__/UploadOrgImageMutation.graphql' +import {BaseLocalHandlers} from '../types/relayMutations' const mutation = graphql` mutation UploadOrgImageMutation($file: File!, $orgId: ID!) { diff --git a/packages/client/mutations/UploadUserImageMutation.ts b/packages/client/mutations/UploadUserImageMutation.ts index 47472de1ac1..b4f99663692 100644 --- a/packages/client/mutations/UploadUserImageMutation.ts +++ b/packages/client/mutations/UploadUserImageMutation.ts @@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {UploadableMap} from 'relay-runtime' import Atmosphere from '../Atmosphere' -import {BaseLocalHandlers} from '../types/relayMutations' import {UploadUserImageMutation as TUploadUserImageMutation} from '../__generated__/UploadUserImageMutation.graphql' +import {BaseLocalHandlers} from '../types/relayMutations' const mutation = graphql` mutation UploadUserImageMutation($file: File!) { uploadUserImage(file: $file) { diff --git a/packages/client/mutations/UpsertTeamPromptResponseMutation.ts b/packages/client/mutations/UpsertTeamPromptResponseMutation.ts index 46e757d24a1..6abc25f0660 100644 --- a/packages/client/mutations/UpsertTeamPromptResponseMutation.ts +++ b/packages/client/mutations/UpsertTeamPromptResponseMutation.ts @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' -import clientTempId from '~/utils/relay/clientTempId' import {UpsertTeamPromptResponseMutation_meeting$data} from '~/__generated__/UpsertTeamPromptResponseMutation_meeting.graphql' -import {LocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations' +import clientTempId from '~/utils/relay/clientTempId' import {UpsertTeamPromptResponseMutation as TUpsertTeamPromptResponseMutation} from '../__generated__/UpsertTeamPromptResponseMutation.graphql' +import {LocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations' import SendClientSideEvent from '../utils/SendClientSideEvent' graphql` diff --git a/packages/client/mutations/VerifyEmailMutation.ts b/packages/client/mutations/VerifyEmailMutation.ts index 1e62d1eeb56..4c8e45c56b2 100644 --- a/packages/client/mutations/VerifyEmailMutation.ts +++ b/packages/client/mutations/VerifyEmailMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin' -import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import {VerifyEmailMutation as TSignUpWithPasswordMutation} from '../__generated__/VerifyEmailMutation.graphql' +import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations' import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect' const mutation = graphql` diff --git a/packages/client/mutations/VoteForPokerStoryMutation.ts b/packages/client/mutations/VoteForPokerStoryMutation.ts index 46e50e9f855..7de326578aa 100644 --- a/packages/client/mutations/VoteForPokerStoryMutation.ts +++ b/packages/client/mutations/VoteForPokerStoryMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {VoteForPokerStoryMutation as TVoteForPokerStoryMutation} from '../__generated__/VoteForPokerStoryMutation.graphql' import {StandardMutation} from '../types/relayMutations' import createProxyRecord from '../utils/relay/createProxyRecord' -import {VoteForPokerStoryMutation as TVoteForPokerStoryMutation} from '../__generated__/VoteForPokerStoryMutation.graphql' graphql` fragment VoteForPokerStoryMutation_meeting on VoteForPokerStorySuccess { diff --git a/packages/client/mutations/VoteForReflectionGroupMutation.ts b/packages/client/mutations/VoteForReflectionGroupMutation.ts index cc8fa18e466..c1fb252dac6 100644 --- a/packages/client/mutations/VoteForReflectionGroupMutation.ts +++ b/packages/client/mutations/VoteForReflectionGroupMutation.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {commitMutation} from 'react-relay' +import {VoteForReflectionGroupMutation as TVoteForReflectionGroupMutation} from '../__generated__/VoteForReflectionGroupMutation.graphql' import {BaseLocalHandlers, StandardMutation} from '../types/relayMutations' import toTeamMemberId from '../utils/relay/toTeamMemberId' -import {VoteForReflectionGroupMutation as TVoteForReflectionGroupMutation} from '../__generated__/VoteForReflectionGroupMutation.graphql' graphql` fragment VoteForReflectionGroupMutation_meeting on VoteForReflectionGroupPayload { diff --git a/packages/client/mutations/connections/getPokerTemplateOrgConn.ts b/packages/client/mutations/connections/getPokerTemplateOrgConn.ts deleted file mode 100644 index b9737b45d76..00000000000 --- a/packages/client/mutations/connections/getPokerTemplateOrgConn.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {ConnectionHandler, ReadOnlyRecordProxy} from 'relay-runtime' - -const getPokerTemplateOrgConn = (pokerSettings: ReadOnlyRecordProxy | null | undefined) => { - if (pokerSettings) { - return ConnectionHandler.getConnection( - pokerSettings, - 'PokerTemplateListOrg_organizationTemplates' - ) - } - return null -} - -export default getPokerTemplateOrgConn diff --git a/packages/client/mutations/connections/getPokerTemplatePublicConn.ts b/packages/client/mutations/connections/getPokerTemplatePublicConn.ts deleted file mode 100644 index 1dd09e2f14e..00000000000 --- a/packages/client/mutations/connections/getPokerTemplatePublicConn.ts +++ /dev/null @@ -1,10 +0,0 @@ -import {ConnectionHandler, ReadOnlyRecordProxy} from 'relay-runtime' - -const getPokerTemplatePublicConn = (pokerSettings: ReadOnlyRecordProxy | null | undefined) => { - if (pokerSettings) { - return ConnectionHandler.getConnection(pokerSettings, 'PokerTemplateListPublic_publicTemplates') - } - return null -} - -export default getPokerTemplatePublicConn diff --git a/packages/client/mutations/handlers/handleAuthenticationRedirect.ts b/packages/client/mutations/handlers/handleAuthenticationRedirect.ts index aa826aa1527..b053f82e39b 100644 --- a/packages/client/mutations/handlers/handleAuthenticationRedirect.ts +++ b/packages/client/mutations/handlers/handleAuthenticationRedirect.ts @@ -1,7 +1,7 @@ import {AcceptTeamInvitationMutationReply$data} from '~/__generated__/AcceptTeamInvitationMutationReply.graphql' import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations' -import getValidRedirectParam from '../../utils/getValidRedirectParam' import SendClientSideEvent from '../../utils/SendClientSideEvent' +import getValidRedirectParam from '../../utils/getValidRedirectParam' interface OnNextMeetingId extends OnNextHistoryContext { meetingId?: string | null diff --git a/packages/client/mutations/handlers/handleAzureCreateIssue.ts b/packages/client/mutations/handlers/handleAzureCreateIssue.ts index da956a0f372..76de16b0d9b 100644 --- a/packages/client/mutations/handlers/handleAzureCreateIssue.ts +++ b/packages/client/mutations/handlers/handleAzureCreateIssue.ts @@ -1,7 +1,7 @@ import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime' import SearchQueryId from '~/shared/gqlIds/SearchQueryId' -import toTeamMemberId from '../../utils/relay/toTeamMemberId' import {CreateTaskMutation} from '../../__generated__/CreateTaskMutation.graphql' +import toTeamMemberId from '../../utils/relay/toTeamMemberId' import getAzureWorkItemsConn from '../connections/getAzureWorkItemsConn' const handleAzureCreateIssue = ( diff --git a/packages/client/mutations/handlers/handleGitHubCreateIssue.ts b/packages/client/mutations/handlers/handleGitHubCreateIssue.ts index f8e303d82e7..6b7798b5e98 100644 --- a/packages/client/mutations/handlers/handleGitHubCreateIssue.ts +++ b/packages/client/mutations/handlers/handleGitHubCreateIssue.ts @@ -1,7 +1,7 @@ import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime' +import {CreateTaskMutation} from '../../__generated__/CreateTaskMutation.graphql' import SearchQueryId from '../../shared/gqlIds/SearchQueryId' import toTeamMemberId from '../../utils/relay/toTeamMemberId' -import {CreateTaskMutation} from '../../__generated__/CreateTaskMutation.graphql' import getGitHubIssuesConn from '../connections/getGitHubIssuesConn' const handleGitHubCreateIssue = ( diff --git a/packages/client/mutations/handlers/handleGitLabCreateIssue.ts b/packages/client/mutations/handlers/handleGitLabCreateIssue.ts index de102c4ddb0..52be3940f9f 100644 --- a/packages/client/mutations/handlers/handleGitLabCreateIssue.ts +++ b/packages/client/mutations/handlers/handleGitLabCreateIssue.ts @@ -1,8 +1,8 @@ import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime' import {gitlabIssueArgs} from '~/components/GitLabScopingSearchResultsRoot' import SearchQueryId from '~/shared/gqlIds/SearchQueryId' -import toTeamMemberId from '../../utils/relay/toTeamMemberId' import {CreateTaskMutation} from '../../__generated__/CreateTaskMutation.graphql' +import toTeamMemberId from '../../utils/relay/toTeamMemberId' import getGitLabProjectsIssuesConn from '../connections/getGitLabProjectsIssuesConn' const handleGitLabCreateIssue = ( diff --git a/packages/client/mutations/handlers/handleMovePokerTemplateDimension.ts b/packages/client/mutations/handlers/handleMovePokerTemplateDimension.ts index 540c012f9c8..6cc0d13df0f 100644 --- a/packages/client/mutations/handlers/handleMovePokerTemplateDimension.ts +++ b/packages/client/mutations/handlers/handleMovePokerTemplateDimension.ts @@ -1,8 +1,8 @@ import {RecordSourceProxy} from 'relay-runtime' -import {PokerTemplateDetailsTemplate$data} from '~/__generated__/PokerTemplateDetailsTemplate.graphql' +import {TemplateDetails_activity$data} from '~/__generated__/TemplateDetails_activity.graphql' const handleMovePokerTemplateDimension = (store: RecordSourceProxy, templateId: string) => { - const template = store.get(templateId) + const template = store.get(templateId) if (!template) return const dimensions = template.getLinkedRecords('dimensions') if (!Array.isArray(dimensions)) return diff --git a/packages/client/mutations/handlers/handleRemovePokerTemplate.ts b/packages/client/mutations/handlers/handleRemovePokerTemplate.ts index d35ba7bd540..2036fcb94fa 100644 --- a/packages/client/mutations/handlers/handleRemovePokerTemplate.ts +++ b/packages/client/mutations/handlers/handleRemovePokerTemplate.ts @@ -1,26 +1,8 @@ import {ConnectionHandler, RecordSourceSelectorProxy} from 'relay-runtime' -import {PokerTemplateList_settings$data} from '~/__generated__/PokerTemplateList_settings.graphql' -import safeRemoveNodeFromArray from '../../utils/relay/safeRemoveNodeFromArray' import safeRemoveNodeFromConn from '../../utils/relay/safeRemoveNodeFromConn' -import getPokerTemplateOrgConn from '../connections/getPokerTemplateOrgConn' -import getPokerTemplatePublicConn from '../connections/getPokerTemplatePublicConn' import pluralizeHandler from './pluralizeHandler' -const handleRemovePokerTemplate = ( - templateId: string, - teamId: string, - store: RecordSourceSelectorProxy -) => { - const team = store.get(teamId)! - const settings = team.getLinkedRecord('meetingSettings', { - meetingType: 'poker' - }) - safeRemoveNodeFromArray(templateId, settings, 'teamTemplates') - const orgConn = getPokerTemplateOrgConn(settings) - const publicConn = getPokerTemplatePublicConn(settings) - safeRemoveNodeFromConn(templateId, orgConn) - safeRemoveNodeFromConn(templateId, publicConn) - +const handleRemovePokerTemplate = (templateId: string, store: RecordSourceSelectorProxy) => { const viewer = store.getRoot().getLinkedRecord('viewer') const allAvailableConn = viewer && ConnectionHandler.getConnection(viewer, 'ActivityLibrary_availableTemplates') diff --git a/packages/client/mutations/handlers/handleRemoveTasks.ts b/packages/client/mutations/handlers/handleRemoveTasks.ts index fb8846bc7ee..3c517948455 100644 --- a/packages/client/mutations/handlers/handleRemoveTasks.ts +++ b/packages/client/mutations/handlers/handleRemoveTasks.ts @@ -1,6 +1,6 @@ import {RecordSourceSelectorProxy} from 'relay-runtime' -import getDiscussionThreadConn from '~/mutations/connections/getDiscussionThreadConn' import {handleRemoveReply} from '~/mutations/DeleteCommentMutation' +import getDiscussionThreadConn from '~/mutations/connections/getDiscussionThreadConn' import {parseQueryParams} from '~/utils/useQueryParameterParser' import ITask from '../../../server/database/types/Task' import IUser from '../../../server/database/types/User' diff --git a/packages/client/mutations/toasts/mapDiscussionMentionedToToast.ts b/packages/client/mutations/toasts/mapDiscussionMentionedToToast.ts index c5c34b12f88..2bcb384b748 100644 --- a/packages/client/mutations/toasts/mapDiscussionMentionedToToast.ts +++ b/packages/client/mutations/toasts/mapDiscussionMentionedToToast.ts @@ -1,11 +1,11 @@ import graphql from 'babel-plugin-relay/macro' +import {mapDiscussionMentionedToToast_notification$data} from '../../__generated__/mapDiscussionMentionedToToast_notification.graphql' import {Snack} from '../../components/Snackbar' import {OnNextHistoryContext} from '../../types/relayMutations' +import findStageById from '../../utils/meetings/findStageById' import fromStageIdToUrl from '../../utils/meetings/fromStageIdToUrl' -import {mapDiscussionMentionedToToast_notification$data} from '../../__generated__/mapDiscussionMentionedToToast_notification.graphql' -import makeNotificationToastKey from './makeNotificationToastKey' import getMeetingPathParams from '../../utils/meetings/getMeetingPathParams' -import findStageById from '../../utils/meetings/findStageById' +import makeNotificationToastKey from './makeNotificationToastKey' graphql` fragment mapDiscussionMentionedToToast_notification on NotifyDiscussionMentioned { diff --git a/packages/client/mutations/toasts/mapKudosReceivedToToast.ts b/packages/client/mutations/toasts/mapKudosReceivedToToast.ts index 6a625382649..d8876a5cfe8 100644 --- a/packages/client/mutations/toasts/mapKudosReceivedToToast.ts +++ b/packages/client/mutations/toasts/mapKudosReceivedToToast.ts @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' -import {Snack} from '../../components/Snackbar' import {mapKudosReceivedToToast_notification$data} from '../../__generated__/mapKudosReceivedToToast_notification.graphql' -import makeNotificationToastKey from './makeNotificationToastKey' +import {Snack} from '../../components/Snackbar' import {OnNextHistoryContext} from '../../types/relayMutations' import SendClientSideEvent from '../../utils/SendClientSideEvent' +import makeNotificationToastKey from './makeNotificationToastKey' graphql` fragment mapKudosReceivedToToast_notification on NotifyKudosReceived { diff --git a/packages/client/mutations/toasts/mapMentionedToToast.ts b/packages/client/mutations/toasts/mapMentionedToToast.ts index e748ffda0c8..3962f9adf6d 100644 --- a/packages/client/mutations/toasts/mapMentionedToToast.ts +++ b/packages/client/mutations/toasts/mapMentionedToToast.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' +import {mapMentionedToToast_notification$data} from '../../__generated__/mapMentionedToToast_notification.graphql' import {Snack} from '../../components/Snackbar' import {OnNextHistoryContext} from '../../types/relayMutations' -import {mapMentionedToToast_notification$data} from '../../__generated__/mapMentionedToToast_notification.graphql' import SendClientSideEvent from '../../utils/SendClientSideEvent' import makeNotificationToastKey from './makeNotificationToastKey' diff --git a/packages/client/mutations/toasts/mapPromptToJoinOrgToToast.ts b/packages/client/mutations/toasts/mapPromptToJoinOrgToToast.ts index 30d18d6cf98..a26b19ebd82 100644 --- a/packages/client/mutations/toasts/mapPromptToJoinOrgToToast.ts +++ b/packages/client/mutations/toasts/mapPromptToJoinOrgToToast.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' +import {mapPromptToJoinOrgToToast_notification$data} from '../../__generated__/mapPromptToJoinOrgToToast_notification.graphql' import {Snack} from '../../components/Snackbar' import {OnNextHistoryContext} from '../../types/relayMutations' -import {mapPromptToJoinOrgToToast_notification$data} from '../../__generated__/mapPromptToJoinOrgToToast_notification.graphql' import SendClientSideEvent from '../../utils/SendClientSideEvent' -import makeNotificationToastKey from './makeNotificationToastKey' import RequestToJoinDomainMutation from '../RequestToJoinDomainMutation' +import makeNotificationToastKey from './makeNotificationToastKey' graphql` fragment mapPromptToJoinOrgToToast_notification on NotifyPromptToJoinOrg { diff --git a/packages/client/mutations/toasts/mapRequestToJoinOrgToToast.ts b/packages/client/mutations/toasts/mapRequestToJoinOrgToToast.ts index c0cc0aead4b..8474e4e8af4 100644 --- a/packages/client/mutations/toasts/mapRequestToJoinOrgToToast.ts +++ b/packages/client/mutations/toasts/mapRequestToJoinOrgToToast.ts @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' -import {Snack} from '../../components/Snackbar' import {mapRequestToJoinOrgToToast_notification$data} from '../../__generated__/mapRequestToJoinOrgToToast_notification.graphql' -import makeNotificationToastKey from './makeNotificationToastKey' +import {Snack} from '../../components/Snackbar' import {OnNextHistoryContext} from '../../types/relayMutations' import SendClientSideEvent from '../../utils/SendClientSideEvent' +import makeNotificationToastKey from './makeNotificationToastKey' graphql` fragment mapRequestToJoinOrgToToast_notification on NotifyRequestToJoinOrg { diff --git a/packages/client/mutations/toasts/mapResponseMentionedToToast.ts b/packages/client/mutations/toasts/mapResponseMentionedToToast.ts index b9d2e5cecd1..ccf6199d1ef 100644 --- a/packages/client/mutations/toasts/mapResponseMentionedToToast.ts +++ b/packages/client/mutations/toasts/mapResponseMentionedToToast.ts @@ -1,9 +1,9 @@ import graphql from 'babel-plugin-relay/macro' +import {mapResponseMentionedToToast_notification$data} from '../../__generated__/mapResponseMentionedToToast_notification.graphql' import {Snack} from '../../components/Snackbar' import {OnNextHistoryContext} from '../../types/relayMutations' -import {mapResponseMentionedToToast_notification$data} from '../../__generated__/mapResponseMentionedToToast_notification.graphql' -import makeNotificationToastKey from './makeNotificationToastKey' import SendClientSideEvent from '../../utils/SendClientSideEvent' +import makeNotificationToastKey from './makeNotificationToastKey' graphql` fragment mapResponseMentionedToToast_notification on NotifyResponseMentioned { diff --git a/packages/client/mutations/toasts/mapResponseRepliedToToast.ts b/packages/client/mutations/toasts/mapResponseRepliedToToast.ts index 8eeb5a01cae..c682d08ff5d 100644 --- a/packages/client/mutations/toasts/mapResponseRepliedToToast.ts +++ b/packages/client/mutations/toasts/mapResponseRepliedToToast.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' +import {mapResponseRepliedToToast_notification$data} from '../../__generated__/mapResponseRepliedToToast_notification.graphql' import {Snack} from '../../components/Snackbar' import {OnNextHistoryContext} from '../../types/relayMutations' -import {mapResponseRepliedToToast_notification$data} from '../../__generated__/mapResponseRepliedToToast_notification.graphql' import makeNotificationToastKey from './makeNotificationToastKey' graphql` diff --git a/packages/client/mutations/toasts/mapTeamsLimitExceededToToast.ts b/packages/client/mutations/toasts/mapTeamsLimitExceededToToast.ts index 28aa4d5d319..9166fa9be3e 100644 --- a/packages/client/mutations/toasts/mapTeamsLimitExceededToToast.ts +++ b/packages/client/mutations/toasts/mapTeamsLimitExceededToToast.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' +import {mapTeamsLimitExceededToToast_notification$data} from '../../__generated__/mapTeamsLimitExceededToToast_notification.graphql' import {Snack} from '../../components/Snackbar' +import {Threshold} from '../../types/constEnums' import {OnNextHistoryContext} from '../../types/relayMutations' -import {mapTeamsLimitExceededToToast_notification$data} from '../../__generated__/mapTeamsLimitExceededToToast_notification.graphql' import SendClientSideEvent from '../../utils/SendClientSideEvent' import makeNotificationToastKey from './makeNotificationToastKey' -import {Threshold} from '../../types/constEnums' graphql` fragment mapTeamsLimitExceededToToast_notification on NotifyTeamsLimitExceeded { diff --git a/packages/client/mutations/toasts/mapTeamsLimitReminderToToast.ts b/packages/client/mutations/toasts/mapTeamsLimitReminderToToast.ts index 4413aac1422..38a168518a7 100644 --- a/packages/client/mutations/toasts/mapTeamsLimitReminderToToast.ts +++ b/packages/client/mutations/toasts/mapTeamsLimitReminderToToast.ts @@ -1,10 +1,10 @@ import graphql from 'babel-plugin-relay/macro' +import {mapTeamsLimitReminderToToast_notification$data} from '../../__generated__/mapTeamsLimitReminderToToast_notification.graphql' import {Snack} from '../../components/Snackbar' import {Threshold} from '../../types/constEnums' import {OnNextHistoryContext} from '../../types/relayMutations' -import makeDateString from '../../utils/makeDateString' -import {mapTeamsLimitReminderToToast_notification$data} from '../../__generated__/mapTeamsLimitReminderToToast_notification.graphql' import SendClientSideEvent from '../../utils/SendClientSideEvent' +import makeDateString from '../../utils/makeDateString' import makeNotificationToastKey from './makeNotificationToastKey' graphql` diff --git a/packages/client/mutations/toasts/popInvolvementToast.ts b/packages/client/mutations/toasts/popInvolvementToast.ts index 2fe2547f8fd..afa92e3acf3 100644 --- a/packages/client/mutations/toasts/popInvolvementToast.ts +++ b/packages/client/mutations/toasts/popInvolvementToast.ts @@ -1,7 +1,7 @@ import {matchPath} from 'react-router-dom' +import {TaskInvolves_notification$data} from '../../__generated__/TaskInvolves_notification.graphql' import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations' import {MENTIONEE} from '../../utils/constants' -import {TaskInvolves_notification$data} from '../../__generated__/TaskInvolves_notification.graphql' const popInvolvementToast: OnNextHandler = ( notification, diff --git a/packages/client/mutations/toasts/popNotificationToast.ts b/packages/client/mutations/toasts/popNotificationToast.ts index 8db3441c8e1..9668d92814d 100644 --- a/packages/client/mutations/toasts/popNotificationToast.ts +++ b/packages/client/mutations/toasts/popNotificationToast.ts @@ -1,20 +1,20 @@ import graphql from 'babel-plugin-relay/macro' -import {Snack} from '../../components/Snackbar' -import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations' import { NotificationEnum, popNotificationToast_notification$data } from '../../__generated__/popNotificationToast_notification.graphql' +import {Snack} from '../../components/Snackbar' +import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations' import SetNotificationStatusMutation from '../SetNotificationStatusMutation' import mapDiscussionMentionedToToast from './mapDiscussionMentionedToToast' -import mapResponseMentionedToToast from './mapResponseMentionedToToast' +import mapKudosReceivedToToast from './mapKudosReceivedToToast' import mapMentionedToToast from './mapMentionedToToast' +import mapPromptToJoinOrgToToast from './mapPromptToJoinOrgToToast' +import mapRequestToJoinOrgToToast from './mapRequestToJoinOrgToToast' +import mapResponseMentionedToToast from './mapResponseMentionedToToast' import mapResponseRepliedToToast from './mapResponseRepliedToToast' import mapTeamsLimitExceededToToast from './mapTeamsLimitExceededToToast' import mapTeamsLimitReminderToToast from './mapTeamsLimitReminderToToast' -import mapPromptToJoinOrgToToast from './mapPromptToJoinOrgToToast' -import mapRequestToJoinOrgToToast from './mapRequestToJoinOrgToToast' -import mapKudosReceivedToToast from './mapKudosReceivedToToast' const typePicker: Partial< Record Snack | null> diff --git a/packages/client/mutations/toasts/updateNotificationToast.ts b/packages/client/mutations/toasts/updateNotificationToast.ts index 62b90b6f328..41fca219089 100644 --- a/packages/client/mutations/toasts/updateNotificationToast.ts +++ b/packages/client/mutations/toasts/updateNotificationToast.ts @@ -1,6 +1,6 @@ import graphql from 'babel-plugin-relay/macro' -import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations' import {updateNotificationToast_notification$data} from '../../__generated__/updateNotificationToast_notification.graphql' +import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations' import makeNotificationToastKey from './makeNotificationToastKey' graphql` diff --git a/packages/client/mutations/useAcceptRequestToJoinDomainMutation.ts b/packages/client/mutations/useAcceptRequestToJoinDomainMutation.ts index b44b0dc64cc..f87398a7c34 100644 --- a/packages/client/mutations/useAcceptRequestToJoinDomainMutation.ts +++ b/packages/client/mutations/useAcceptRequestToJoinDomainMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {useMutation, UseMutationConfig} from 'react-relay' -import useAtmosphere from '../hooks/useAtmosphere' import {useAcceptRequestToJoinDomainMutation as TAcceptRequestToJoinDomainMutation} from '../__generated__/useAcceptRequestToJoinDomainMutation.graphql' +import useAtmosphere from '../hooks/useAtmosphere' import SendClientSideEvent from '../utils/SendClientSideEvent' graphql` diff --git a/packages/client/mutations/useShareTopicMutation.ts b/packages/client/mutations/useShareTopicMutation.ts index fd7b36a201a..d41f44ef6f4 100644 --- a/packages/client/mutations/useShareTopicMutation.ts +++ b/packages/client/mutations/useShareTopicMutation.ts @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import {useMutation, UseMutationConfig} from 'react-relay' -import useAtmosphere from '../hooks/useAtmosphere' import {useShareTopicMutation as TAcceptRequestToJoinDomainMutation} from '../__generated__/useShareTopicMutation.graphql' +import useAtmosphere from '../hooks/useAtmosphere' graphql` fragment useShareTopicMutation_meeting on ShareTopicSuccess { diff --git a/packages/client/package.json b/packages/client/package.json index 226c62bc03d..23dee4fe881 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -3,7 +3,7 @@ "description": "An open-source app for building smarter, more agile teams.", "author": "Parabol Inc. (http://github.com/ParabolInc)", "license": "AGPL-3.0", - "version": "7.27.0", + "version": "7.27.2", "repository": { "type": "git", "url": "https://github.com/ParabolInc/parabol" @@ -58,7 +58,7 @@ "react-refresh": "^0.9.0", "strict-event-emitter-types": "^2.0.0", "typescript": "^5.3.3", - "webpack-dev-server": "^4.15.1" + "webpack-dev-server": "^5.0.4" }, "dependencies": { "@amplitude/analytics-browser": "^2.2.3", @@ -136,7 +136,6 @@ "react-textarea-autosize": "^7.1.0", "react-transition-group": "^4.3.0", "react-virtualized": "^9.21.1", - "regenerator-runtime": "^0.13.5", "relay-runtime": "^14.1.0", "resize-observer-polyfill": "^1.5.0", "rrule": "^2.7.2", diff --git a/packages/client/subscriptions/MeetingSubscription.ts b/packages/client/subscriptions/MeetingSubscription.ts index d6f30e0a0f1..5b9ad76bf15 100644 --- a/packages/client/subscriptions/MeetingSubscription.ts +++ b/packages/client/subscriptions/MeetingSubscription.ts @@ -1,14 +1,14 @@ import graphql from 'babel-plugin-relay/macro' import {RouterProps} from 'react-router' import {requestSubscription} from 'relay-runtime' +import { + MeetingSubscription$variables, + MeetingSubscription as TMeetingSubscription +} from '~/__generated__/MeetingSubscription.graphql' import {addCommentMeetingUpdater} from '~/mutations/AddCommentMutation' import {createPollMeetingUpdater} from '~/mutations/CreatePollMutation' import {deleteCommentMeetingUpdater} from '~/mutations/DeleteCommentMutation' import {upsertTeamPromptResponseUpdater} from '~/mutations/UpsertTeamPromptResponseMutation' -import { - MeetingSubscription as TMeetingSubscription, - MeetingSubscription$variables -} from '~/__generated__/MeetingSubscription.graphql' import Atmosphere from '../Atmosphere' import {createReflectionMeetingUpdater} from '../mutations/CreateReflectionMutation' import {dragDiscussionTopicMeetingUpdater} from '../mutations/DragDiscussionTopicMutation' diff --git a/packages/client/subscriptions/OrganizationSubscription.ts b/packages/client/subscriptions/OrganizationSubscription.ts index e2453c22589..5efdb9825b6 100644 --- a/packages/client/subscriptions/OrganizationSubscription.ts +++ b/packages/client/subscriptions/OrganizationSubscription.ts @@ -1,14 +1,14 @@ import graphql from 'babel-plugin-relay/macro' import {RouterProps} from 'react-router' import {requestSubscription} from 'relay-runtime' +import { + OrganizationSubscription$variables, + OrganizationSubscription as TOrganizationSubscription +} from '~/__generated__/OrganizationSubscription.graphql' import { archiveOrganizationOrganizationOnNext, archiveOrganizationOrganizationUpdater } from '~/mutations/ArchiveOrganizationMutation' -import { - OrganizationSubscription as TOrganizationSubscription, - OrganizationSubscription$variables -} from '~/__generated__/OrganizationSubscription.graphql' import Atmosphere from '../Atmosphere' import {addOrgMutationOrganizationUpdater} from '../mutations/AddOrgMutation' import { @@ -20,9 +20,9 @@ import { setOrgUserRoleAddedOrganizationUpdater } from '../mutations/SetOrgUserRoleMutation' import {updateTemplateScopeOrganizationUpdater} from '../mutations/UpdateReflectTemplateScopeMutation' +import upgradeToTeamTierSuccessUpdater from '../mutations/handlers/upgradeToTeamTierSuccessUpdater' import subscriptionOnNext from './subscriptionOnNext' import subscriptionUpdater from './subscriptionUpdater' -import upgradeToTeamTierSuccessUpdater from '../mutations/handlers/upgradeToTeamTierSuccessUpdater' const subscription = graphql` subscription OrganizationSubscription { diff --git a/packages/client/subscriptions/TeamSubscription.ts b/packages/client/subscriptions/TeamSubscription.ts index 10e14740d4c..ec2ff7aa1e6 100644 --- a/packages/client/subscriptions/TeamSubscription.ts +++ b/packages/client/subscriptions/TeamSubscription.ts @@ -17,9 +17,12 @@ import { acceptTeamInvitationTeamUpdater } from '../mutations/AcceptTeamInvitationMutation' import {addAgendaItemUpdater} from '../mutations/AddAgendaItemMutation' +import {addPokerTemplateTeamUpdater} from '../mutations/AddPokerTemplateMutation' +import {addReflectTemplateTeamUpdater} from '../mutations/AddReflectTemplateMutation' import {addReflectTemplatePromptTeamUpdater} from '../mutations/AddReflectTemplatePromptMutation' import {addTeamTeamUpdater} from '../mutations/AddTeamMutation' import {archiveTeamTeamOnNext, archiveTeamTeamUpdater} from '../mutations/ArchiveTeamMutation' +import {batchArchiveTasksTaskUpdater} from '../mutations/BatchArchiveTasksMutation' import {denyPushInvitationTeamOnNext} from '../mutations/DenyPushInvitationMutation' import { endSprintPokerTeamOnNext, @@ -38,9 +41,6 @@ import { import {updateAgendaItemUpdater} from '../mutations/UpdateAgendaItemMutation' import subscriptionOnNext from './subscriptionOnNext' import subscriptionUpdater from './subscriptionUpdater' -import {batchArchiveTasksTaskUpdater} from '../mutations/BatchArchiveTasksMutation' -import {addReflectTemplateTeamUpdater} from '../mutations/AddReflectTemplateMutation' -import {addPokerTemplateTeamUpdater} from '../mutations/AddPokerTemplateMutation' const subscription = graphql` subscription TeamSubscription { diff --git a/packages/client/ui/AlertDialog/AlertDialogAction.tsx b/packages/client/ui/AlertDialog/AlertDialogAction.tsx index 75b93fb02a9..59f4f9d0e76 100644 --- a/packages/client/ui/AlertDialog/AlertDialogAction.tsx +++ b/packages/client/ui/AlertDialog/AlertDialogAction.tsx @@ -1,6 +1,6 @@ -import * as React from 'react' import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog' import clsx from 'clsx' +import * as React from 'react' const AlertDialogAction = React.forwardRef< HTMLButtonElement, diff --git a/packages/client/ui/AlertDialog/AlertDialogCancel.tsx b/packages/client/ui/AlertDialog/AlertDialogCancel.tsx index 201ca648679..e6dad77019d 100644 --- a/packages/client/ui/AlertDialog/AlertDialogCancel.tsx +++ b/packages/client/ui/AlertDialog/AlertDialogCancel.tsx @@ -1,6 +1,6 @@ -import * as React from 'react' import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog' import clsx from 'clsx' +import * as React from 'react' const AlertDialogCancel = React.forwardRef< HTMLButtonElement, diff --git a/packages/client/ui/AlertDialog/AlertDialogDescription.tsx b/packages/client/ui/AlertDialog/AlertDialogDescription.tsx index 7c940b02fec..ea8bfaa59b0 100644 --- a/packages/client/ui/AlertDialog/AlertDialogDescription.tsx +++ b/packages/client/ui/AlertDialog/AlertDialogDescription.tsx @@ -1,6 +1,6 @@ -import * as React from 'react' import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog' import clsx from 'clsx' +import * as React from 'react' const AlertDialogDescription = React.forwardRef< HTMLParagraphElement, diff --git a/packages/client/ui/AlertDialog/AlertDialogFooter.tsx b/packages/client/ui/AlertDialog/AlertDialogFooter.tsx index 0148d9a8c39..86e208f97cb 100644 --- a/packages/client/ui/AlertDialog/AlertDialogFooter.tsx +++ b/packages/client/ui/AlertDialog/AlertDialogFooter.tsx @@ -1,5 +1,5 @@ -import * as React from 'react' import clsx from 'clsx' +import * as React from 'react' const AlertDialogFooter = ({className, ...props}: React.HTMLAttributes) => (
) => (
diff --git a/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx b/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx index e867c7ed363..4d528210517 100644 --- a/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx +++ b/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx @@ -1,6 +1,6 @@ -import * as React from 'react' import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog' import clsx from 'clsx' +import * as React from 'react' export const AlertDialogOverlay = React.forwardRef< HTMLDivElement, diff --git a/packages/client/ui/AlertDialog/AlertDialogTitle.tsx b/packages/client/ui/AlertDialog/AlertDialogTitle.tsx index c7c14e011c5..cd4c9a9b0a8 100644 --- a/packages/client/ui/AlertDialog/AlertDialogTitle.tsx +++ b/packages/client/ui/AlertDialog/AlertDialogTitle.tsx @@ -1,6 +1,6 @@ -import * as React from 'react' import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog' import clsx from 'clsx' +import * as React from 'react' const AlertDialogTitle = React.forwardRef< HTMLHeadingElement, diff --git a/packages/client/ui/Avatar/AvatarFallback.tsx b/packages/client/ui/Avatar/AvatarFallback.tsx index 482648102a8..ac2676858d4 100644 --- a/packages/client/ui/Avatar/AvatarFallback.tsx +++ b/packages/client/ui/Avatar/AvatarFallback.tsx @@ -1,6 +1,6 @@ -import React from 'react' import * as AvatarPrimitive from '@radix-ui/react-avatar' import clsx from 'clsx' +import React from 'react' export const AvatarFallback = React.forwardRef< HTMLSpanElement, diff --git a/packages/client/ui/Avatar/AvatarImage.tsx b/packages/client/ui/Avatar/AvatarImage.tsx index 66f41abad5d..19a90bc1f90 100644 --- a/packages/client/ui/Avatar/AvatarImage.tsx +++ b/packages/client/ui/Avatar/AvatarImage.tsx @@ -1,6 +1,6 @@ -import React from 'react' import * as AvatarPrimitive from '@radix-ui/react-avatar' import clsx from 'clsx' +import React from 'react' export const AvatarImage = React.forwardRef< HTMLImageElement, diff --git a/packages/client/ui/Button/Button.tsx b/packages/client/ui/Button/Button.tsx index 90554dc662e..e214959b5c7 100644 --- a/packages/client/ui/Button/Button.tsx +++ b/packages/client/ui/Button/Button.tsx @@ -1,6 +1,6 @@ -import React from 'react' import {Slot} from '@radix-ui/react-slot' import clsx from 'clsx' +import React from 'react' type Variant = 'primary' | 'secondary' | 'destructive' | 'ghost' | 'link' | 'outline' type Size = 'sm' | 'md' | 'lg' | 'default' diff --git a/packages/client/ui/Chip/Chip.tsx b/packages/client/ui/Chip/Chip.tsx index c24ccad0d69..bfa9da0bc61 100644 --- a/packages/client/ui/Chip/Chip.tsx +++ b/packages/client/ui/Chip/Chip.tsx @@ -1,5 +1,5 @@ -import React from 'react' import {Close} from '@mui/icons-material' +import React from 'react' import {twMerge} from 'tailwind-merge' interface Props { diff --git a/packages/client/ui/Dialog/Dialog.tsx b/packages/client/ui/Dialog/Dialog.tsx index 00bffaab0af..633e5e7c74f 100644 --- a/packages/client/ui/Dialog/Dialog.tsx +++ b/packages/client/ui/Dialog/Dialog.tsx @@ -1,5 +1,5 @@ -import * as React from 'react' import * as RadixDialog from '@radix-ui/react-dialog' +import * as React from 'react' interface DialogProps extends React.ComponentPropsWithoutRef { isOpen: boolean diff --git a/packages/client/ui/Dialog/DialogClose.tsx b/packages/client/ui/Dialog/DialogClose.tsx index 83318e88fa8..8bae02bfc67 100644 --- a/packages/client/ui/Dialog/DialogClose.tsx +++ b/packages/client/ui/Dialog/DialogClose.tsx @@ -1,6 +1,6 @@ -import React from 'react' import {Close} from '@mui/icons-material' import * as RadixDialog from '@radix-ui/react-dialog' +import React from 'react' import {twMerge} from 'tailwind-merge' export const DialogClose = React.forwardRef< diff --git a/packages/client/ui/Dialog/DialogContent.tsx b/packages/client/ui/Dialog/DialogContent.tsx index 16ef6ab553e..5453413e534 100644 --- a/packages/client/ui/Dialog/DialogContent.tsx +++ b/packages/client/ui/Dialog/DialogContent.tsx @@ -1,8 +1,8 @@ -import * as React from 'react' import * as RadixDialog from '@radix-ui/react-dialog' +import * as React from 'react' import {twMerge} from 'tailwind-merge' -import {DialogOverlay} from './DialogOverlay' import {DialogClose} from './DialogClose' +import {DialogOverlay} from './DialogOverlay' export const DialogContent = React.forwardRef< HTMLDivElement, diff --git a/packages/client/ui/Dialog/DialogDescription.tsx b/packages/client/ui/Dialog/DialogDescription.tsx index 1420013ed2f..ce44221669d 100644 --- a/packages/client/ui/Dialog/DialogDescription.tsx +++ b/packages/client/ui/Dialog/DialogDescription.tsx @@ -1,5 +1,5 @@ -import React from 'react' import * as RadixDialog from '@radix-ui/react-dialog' +import React from 'react' import {twMerge} from 'tailwind-merge' export const DialogDescription = React.forwardRef< diff --git a/packages/client/ui/Dialog/DialogOverlay.tsx b/packages/client/ui/Dialog/DialogOverlay.tsx index bfafa2578e9..031db3627d5 100644 --- a/packages/client/ui/Dialog/DialogOverlay.tsx +++ b/packages/client/ui/Dialog/DialogOverlay.tsx @@ -1,5 +1,5 @@ -import * as React from 'react' import * as RadixDialog from '@radix-ui/react-dialog' +import * as React from 'react' import {twMerge} from 'tailwind-merge' export const DialogOverlay = React.forwardRef< diff --git a/packages/client/ui/Dialog/DialogTitle.tsx b/packages/client/ui/Dialog/DialogTitle.tsx index c35a6165cac..ecd9e9ba621 100644 --- a/packages/client/ui/Dialog/DialogTitle.tsx +++ b/packages/client/ui/Dialog/DialogTitle.tsx @@ -1,5 +1,5 @@ -import React from 'react' import * as RadixDialog from '@radix-ui/react-dialog' +import React from 'react' import {twMerge} from 'tailwind-merge' export const DialogTitle = React.forwardRef< diff --git a/packages/client/ui/Select/SelectContent.tsx b/packages/client/ui/Select/SelectContent.tsx index bfe3b247b03..3d58796aa2f 100644 --- a/packages/client/ui/Select/SelectContent.tsx +++ b/packages/client/ui/Select/SelectContent.tsx @@ -1,5 +1,5 @@ -import * as React from 'react' import * as RadixSelect from '@radix-ui/react-select' +import * as React from 'react' import {twMerge} from 'tailwind-merge' export const SelectContent = React.forwardRef< diff --git a/packages/client/ui/Select/SelectItem.tsx b/packages/client/ui/Select/SelectItem.tsx index d36b21a108b..c836364266b 100644 --- a/packages/client/ui/Select/SelectItem.tsx +++ b/packages/client/ui/Select/SelectItem.tsx @@ -1,6 +1,6 @@ -import * as React from 'react' -import * as RadixSelect from '@radix-ui/react-select' import {Check} from '@mui/icons-material' +import * as RadixSelect from '@radix-ui/react-select' +import * as React from 'react' import {twMerge} from 'tailwind-merge' interface SelectItemProps extends React.ComponentPropsWithoutRef { diff --git a/packages/client/ui/Select/SelectTrigger.tsx b/packages/client/ui/Select/SelectTrigger.tsx index 63fd744086e..5f8b32fe013 100644 --- a/packages/client/ui/Select/SelectTrigger.tsx +++ b/packages/client/ui/Select/SelectTrigger.tsx @@ -1,6 +1,6 @@ -import * as React from 'react' -import * as RadixSelect from '@radix-ui/react-select' import {KeyboardArrowDown} from '@mui/icons-material' +import * as RadixSelect from '@radix-ui/react-select' +import * as React from 'react' import {twMerge} from 'tailwind-merge' import {Loader} from '../../utils/relay/renderLoader' diff --git a/packages/client/utils/GcalClientManager.ts b/packages/client/utils/GcalClientManager.ts index f35760b850d..f8588255344 100644 --- a/packages/client/utils/GcalClientManager.ts +++ b/packages/client/utils/GcalClientManager.ts @@ -1,8 +1,8 @@ +import Atmosphere from '../Atmosphere' import {MenuMutationProps} from '../hooks/useMutationProps' import AddTeamMemberIntegrationAuthMutation from '../mutations/AddTeamMemberIntegrationAuthMutation' import getOAuthPopupFeatures from './getOAuthPopupFeatures' import makeHref from './makeHref' -import Atmosphere from '../Atmosphere' class GcalClientManager { static SCOPES = 'https://www.googleapis.com/auth/calendar.events' diff --git a/packages/client/utils/SendClientSideEvent.ts b/packages/client/utils/SendClientSideEvent.ts index 7995473b1fd..d0fc5301c0d 100644 --- a/packages/client/utils/SendClientSideEvent.ts +++ b/packages/client/utils/SendClientSideEvent.ts @@ -1,5 +1,5 @@ -import Atmosphere from '../Atmosphere' import * as amplitude from '@amplitude/analytics-browser' +import Atmosphere from '../Atmosphere' const SendClientSideEvent = ( atmosphere: Atmosphere, diff --git a/packages/client/utils/date/relativeDate.ts b/packages/client/utils/date/relativeDate.ts index 659f0af9380..155c121012c 100644 --- a/packages/client/utils/date/relativeDate.ts +++ b/packages/client/utils/date/relativeDate.ts @@ -3,8 +3,8 @@ // capitalized J in just now // set my own defaults -import plural from '../plural' import humanizeDuration from 'humanize-duration' +import plural from '../plural' const SECOND = 1000 const MIN = SECOND * 60 diff --git a/packages/client/utils/getTeamHealthVoteColor.ts b/packages/client/utils/getTeamHealthVoteColor.ts index ad347969a8d..fd660535aba 100644 --- a/packages/client/utils/getTeamHealthVoteColor.ts +++ b/packages/client/utils/getTeamHealthVoteColor.ts @@ -1,5 +1,5 @@ -import blendColors from './blendColors' import {PALETTE} from '../styles/paletteV3' +import blendColors from './blendColors' function getTeamHealthVoteColor(allVotes: readonly number[], vote: number) { const minVote = Math.min(...allVotes) diff --git a/packages/client/utils/handleSuccessfulLogin.ts b/packages/client/utils/handleSuccessfulLogin.ts index 7fc42f3b26e..1c17d50b719 100644 --- a/packages/client/utils/handleSuccessfulLogin.ts +++ b/packages/client/utils/handleSuccessfulLogin.ts @@ -1,7 +1,7 @@ +import ReactGA from 'react-ga4' import {LocalStorageKey} from '~/types/constEnums' -import safeIdentify from './safeIdentify' import {handleSuccessfulLogin_UserLogInPayload$data} from '../__generated__/handleSuccessfulLogin_UserLogInPayload.graphql' -import ReactGA from 'react-ga4' +import safeIdentify from './safeIdentify' import graphql from 'babel-plugin-relay/macro' graphql` diff --git a/packages/client/utils/relay/setActiveTemplate.ts b/packages/client/utils/relay/setActiveTemplate.ts index 8fd4231d171..45a577a0403 100644 --- a/packages/client/utils/relay/setActiveTemplate.ts +++ b/packages/client/utils/relay/setActiveTemplate.ts @@ -32,4 +32,4 @@ const setActiveTemplate = ( }) } -export {setActiveTemplateInRelayStore, setActiveTemplate} +export {setActiveTemplate, setActiveTemplateInRelayStore} diff --git a/packages/client/utils/useTemplateDescription.ts b/packages/client/utils/useTemplateDescription.ts index 302dfaaabfe..6f17000e918 100644 --- a/packages/client/utils/useTemplateDescription.ts +++ b/packages/client/utils/useTemplateDescription.ts @@ -1,8 +1,8 @@ import graphql from 'babel-plugin-relay/macro' import {readInlineData} from 'react-relay' +import {TierEnum} from '../__generated__/OrganizationSubscription.graphql' import {useTemplateDescription_template$key} from '../__generated__/useTemplateDescription_template.graphql' import {useTemplateDescription_viewer$key} from '../__generated__/useTemplateDescription_viewer.graphql' -import {TierEnum} from '../__generated__/OrganizationSubscription.graphql' import relativeDate from './date/relativeDate' const useTemplateDescription = ( diff --git a/packages/embedder/package.json b/packages/embedder/package.json index 44b40e97562..c379221d450 100644 --- a/packages/embedder/package.json +++ b/packages/embedder/package.json @@ -1,6 +1,6 @@ { "name": "parabol-embedder", - "version": "7.27.0", + "version": "7.27.2", "description": "A service that computes embedding vectors from Parabol objects", "author": "Jordan Husney ", "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme", diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json index 518c0231736..65c777dd7f6 100644 --- a/packages/gql-executor/package.json +++ b/packages/gql-executor/package.json @@ -1,6 +1,6 @@ { "name": "gql-executor", - "version": "7.27.0", + "version": "7.27.2", "description": "A Stateless GraphQL Executor", "author": "Matt Krick ", "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme", @@ -27,8 +27,8 @@ }, "dependencies": { "dd-trace": "^4.2.0", - "parabol-client": "7.27.0", - "parabol-server": "7.27.0", + "parabol-client": "7.27.2", + "parabol-server": "7.27.2", "undici": "^5.26.2" } } diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 4813aec47b6..99191908243 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -2,7 +2,7 @@ "name": "integration-tests", "author": "Parabol Inc. (http://github.com/ParabolInc)", "license": "AGPL-3.0", - "version": "7.27.0", + "version": "7.27.2", "description": "", "main": "index.js", "scripts": { diff --git a/packages/server/__tests__/setup.ts b/packages/server/__tests__/setup.ts index e5f40d8b93b..4a4860682ff 100644 --- a/packages/server/__tests__/setup.ts +++ b/packages/server/__tests__/setup.ts @@ -1,5 +1,5 @@ -import {drainRethink} from './common' import * as matchers from 'jest-extended' +import {drainRethink} from './common' expect.extend(matchers) afterAll(() => { diff --git a/packages/server/billing/helpers/adjustUserCount.ts b/packages/server/billing/helpers/adjustUserCount.ts index 15c440c2834..42618bd4261 100644 --- a/packages/server/billing/helpers/adjustUserCount.ts +++ b/packages/server/billing/helpers/adjustUserCount.ts @@ -3,18 +3,18 @@ import getRethink from '../../database/rethinkDriver' import {RDatum} from '../../database/stricterR' import Organization from '../../database/types/Organization' import OrganizationUser from '../../database/types/OrganizationUser' +import {DataLoaderWorker} from '../../graphql/graphql' import insertOrgUserAudit from '../../postgres/helpers/insertOrgUserAudit' import {OrganizationUserAuditEventTypeEnum} from '../../postgres/queries/generated/insertOrgUserAuditQuery' +import {getUserById} from '../../postgres/queries/getUsersByIds' import updateUser from '../../postgres/queries/updateUser' import IUser from '../../postgres/types/IUser' +import {Logger} from '../../utils/Logger' import {analytics} from '../../utils/analytics/analytics' import getActiveDomainForOrgId from '../../utils/getActiveDomainForOrgId' import getDomainFromEmail from '../../utils/getDomainFromEmail' import handleEnterpriseOrgQuantityChanges from './handleEnterpriseOrgQuantityChanges' import handleTeamOrgQuantityChanges from './handleTeamOrgQuantityChanges' -import {getUserById} from '../../postgres/queries/getUsersByIds' -import {DataLoaderWorker} from '../../graphql/graphql' -import {Logger} from '../../utils/Logger' const maybeUpdateOrganizationActiveDomain = async ( orgId: string, diff --git a/packages/server/billing/helpers/generateInvoice.ts b/packages/server/billing/helpers/generateInvoice.ts index 8a94adaffea..3785a7d6303 100644 --- a/packages/server/billing/helpers/generateInvoice.ts +++ b/packages/server/billing/helpers/generateInvoice.ts @@ -1,6 +1,7 @@ import {InvoiceItemType} from 'parabol-client/types/constEnums' import Stripe from 'stripe' import getRethink from '../../database/rethinkDriver' +import {RDatum} from '../../database/stricterR' import Coupon from '../../database/types/Coupon' import Invoice, {InvoiceStatusEnum} from '../../database/types/Invoice' import {InvoiceLineItemEnum} from '../../database/types/InvoiceLineItem' @@ -15,7 +16,6 @@ import isValid from '../../graphql/isValid' import {fromEpochSeconds} from '../../utils/epochTime' import sendToSentry from '../../utils/sendToSentry' import {getStripeManager} from '../../utils/stripe' -import {RDatum} from '../../database/stricterR' interface InvoicesByStartTime { [start: string]: { diff --git a/packages/server/billing/helpers/removeTeamsLimitObjects.ts b/packages/server/billing/helpers/removeTeamsLimitObjects.ts index 2f112a11077..3b24d5c45c6 100644 --- a/packages/server/billing/helpers/removeTeamsLimitObjects.ts +++ b/packages/server/billing/helpers/removeTeamsLimitObjects.ts @@ -1,8 +1,8 @@ -import getKysely from '../../postgres/getKysely' import {r} from 'rethinkdb-ts' import {RValue} from '../../database/stricterR' import {DataLoaderWorker} from '../../graphql/graphql' import updateNotification from '../../graphql/public/mutations/helpers/updateNotification' +import getKysely from '../../postgres/getKysely' const removeTeamsLimitObjects = async (orgId: string, dataLoader: DataLoaderWorker) => { const removeJobTypes = ['LOCK_ORGANIZATION', 'WARN_ORGANIZATION'] as const diff --git a/packages/server/billing/helpers/updateSubscriptionQuantity.ts b/packages/server/billing/helpers/updateSubscriptionQuantity.ts index ebb43a8d637..25917b13e58 100644 --- a/packages/server/billing/helpers/updateSubscriptionQuantity.ts +++ b/packages/server/billing/helpers/updateSubscriptionQuantity.ts @@ -1,8 +1,8 @@ import getRethink from '../../database/rethinkDriver' -import {getStripeManager} from '../../utils/stripe' import insertStripeQuantityMismatchLogging from '../../postgres/queries/insertStripeQuantityMismatchLogging' -import sendToSentry from '../../utils/sendToSentry' import RedisLockQueue from '../../utils/RedisLockQueue' +import sendToSentry from '../../utils/sendToSentry' +import {getStripeManager} from '../../utils/stripe' /** * Check and update if necessary the subscription quantity diff --git a/packages/server/database/migrations/20220602164119-fixRetroTemplates.ts b/packages/server/database/migrations/20220602164119-fixRetroTemplates.ts index 139a64260a3..730ea2e689d 100644 --- a/packages/server/database/migrations/20220602164119-fixRetroTemplates.ts +++ b/packages/server/database/migrations/20220602164119-fixRetroTemplates.ts @@ -1,8 +1,8 @@ import { down as faultyDown, + up as faultyUp, reflectPrompts, - templates, - up as faultyUp + templates } from './20220124600507-addMoreRetroTemplates' const fixedReflectPrompts = reflectPrompts.map((prompt) => ({ diff --git a/packages/server/database/rethinkDriver.ts b/packages/server/database/rethinkDriver.ts index 370482933b2..e030375d971 100644 --- a/packages/server/database/rethinkDriver.ts +++ b/packages/server/database/rethinkDriver.ts @@ -4,8 +4,8 @@ import SlackAuth from '../database/types/SlackAuth' import SlackNotification from '../database/types/SlackNotification' import TeamInvitation from '../database/types/TeamInvitation' import TeamMember from '../database/types/TeamMember' -import {ScheduledJobUnion} from '../types/custom' import {AnyMeeting, AnyMeetingSettings, AnyMeetingTeamMember} from '../postgres/types/Meeting' +import {ScheduledJobUnion} from '../types/custom' import getRethinkConfig from './getRethinkConfig' import {R} from './stricterR' import AgendaItem from './types/AgendaItem' @@ -18,10 +18,11 @@ import MassInvitation from './types/MassInvitation' import MeetingTemplate from './types/MeetingTemplate' import NotificationKickedOut from './types/NotificationKickedOut' import NotificationMeetingStageTimeLimitEnd from './types/NotificationMeetingStageTimeLimitEnd' +import NotificationMentioned from './types/NotificationMentioned' import NotificationPaymentRejected from './types/NotificationPaymentRejected' import NotificationPromoteToBillingLeader from './types/NotificationPromoteToBillingLeader' import NotificationResponseMentioned from './types/NotificationResponseMentioned' -import NotificationMentioned from './types/NotificationMentioned' +import NotificationResponseReplied from './types/NotificationResponseReplied' import NotificationTaskInvolves from './types/NotificationTaskInvolves' import NotificationTeamArchived from './types/NotificationTeamArchived' import NotificationTeamInvitation from './types/NotificationTeamInvitation' @@ -41,7 +42,6 @@ import TemplateDimension from './types/TemplateDimension' import TemplateScale from './types/TemplateScale' import TimelineEvent from './types/TimelineEvent' import User from './types/User' -import NotificationResponseReplied from './types/NotificationResponseReplied' export type RethinkSchema = { AgendaItem: { diff --git a/packages/server/database/types/TeamHealthPhase.ts b/packages/server/database/types/TeamHealthPhase.ts index 6155cfbf64f..1ba920b0c38 100644 --- a/packages/server/database/types/TeamHealthPhase.ts +++ b/packages/server/database/types/TeamHealthPhase.ts @@ -1,5 +1,5 @@ -import TeamHealthStage from './TeamHealthStage' import GenericMeetingPhase from './GenericMeetingPhase' +import TeamHealthStage from './TeamHealthStage' interface Input { stages: [TeamHealthStage, ...TeamHealthStage[]] diff --git a/packages/server/database/types/scheduleTeamLimitsJobs.ts b/packages/server/database/types/scheduleTeamLimitsJobs.ts index 427d328e608..8c518efd469 100644 --- a/packages/server/database/types/scheduleTeamLimitsJobs.ts +++ b/packages/server/database/types/scheduleTeamLimitsJobs.ts @@ -1,6 +1,6 @@ import ms from 'ms' -import getKysely from '../../postgres/getKysely' import {Threshold} from '../../../client/types/constEnums' +import getKysely from '../../postgres/getKysely' import ScheduledTeamLimitsJob from './ScheduledTeamLimitsJob' const scheduleTeamLimitsJobs = async (scheduledLockAt: Date, orgId: string) => { diff --git a/packages/server/dataloader/RedisCache.ts b/packages/server/dataloader/RedisCache.ts index 2a2d57b82ec..2a2d01f08a3 100644 --- a/packages/server/dataloader/RedisCache.ts +++ b/packages/server/dataloader/RedisCache.ts @@ -3,9 +3,9 @@ import ms from 'ms' import {Unpromise} from 'parabol-client/types/generics' import {DBType} from '../database/rethinkDriver' import RedisInstance from '../utils/RedisInstance' +import RethinkDBCache, {RWrite} from './RethinkDBCache' import customRedisQueries from './customRedisQueries' import hydrateRedisDoc from './hydrateRedisDoc' -import RethinkDBCache, {RWrite} from './RethinkDBCache' export type RedisType = { [P in keyof typeof customRedisQueries]: Unpromise>[0] } diff --git a/packages/server/dataloader/atlassianLoaders.ts b/packages/server/dataloader/atlassianLoaders.ts index de3358bb0e2..c44347a5405 100644 --- a/packages/server/dataloader/atlassianLoaders.ts +++ b/packages/server/dataloader/atlassianLoaders.ts @@ -13,14 +13,14 @@ import getJiraDimensionFieldMap, { } from '../postgres/queries/getJiraDimensionFieldMap' import insertTaskEstimate from '../postgres/queries/insertTaskEstimate' import upsertAtlassianAuths from '../postgres/queries/upsertAtlassianAuths' -import {hasDefaultEstimationField, isValidEstimationField} from '../utils/atlassian/jiraFields' -import {downloadAndCacheImages, updateJiraImageUrls} from '../utils/atlassian/jiraImages' -import {getIssue} from '../utils/atlassian/jiraIssues' import AtlassianServerManager, { - JiraGetIssueRes, JiraGQLFields, + JiraGetIssueRes, JiraProject } from '../utils/AtlassianServerManager' +import {hasDefaultEstimationField, isValidEstimationField} from '../utils/atlassian/jiraFields' +import {downloadAndCacheImages, updateJiraImageUrls} from '../utils/atlassian/jiraImages' +import {getIssue} from '../utils/atlassian/jiraIssues' import publish from '../utils/publish' import sendToSentry from '../utils/sendToSentry' import RootDataLoader from './RootDataLoader' diff --git a/packages/server/dataloader/azureDevOpsLoaders.ts b/packages/server/dataloader/azureDevOpsLoaders.ts index 7892bce6f13..87d3c968903 100644 --- a/packages/server/dataloader/azureDevOpsLoaders.ts +++ b/packages/server/dataloader/azureDevOpsLoaders.ts @@ -6,7 +6,6 @@ import {IntegrationProviderAzureDevOps} from '../postgres/queries/getIntegration import insertTaskEstimate from '../postgres/queries/insertTaskEstimate' import removeTeamMemberIntegrationAuthQuery from '../postgres/queries/removeTeamMemberIntegrationAuth' import upsertTeamMemberIntegrationAuth from '../postgres/queries/upsertTeamMemberIntegrationAuth' -import {getInstanceId} from '../utils/azureDevOps/azureDevOpsFieldTypeToId' import AzureDevOpsServerManager, { ProjectRes, Resource, @@ -14,6 +13,7 @@ import AzureDevOpsServerManager, { WorkItem } from '../utils/AzureDevOpsServerManager' import {Logger} from '../utils/Logger' +import {getInstanceId} from '../utils/azureDevOps/azureDevOpsFieldTypeToId' import sendToSentry from '../utils/sendToSentry' import RootDataLoader from './RootDataLoader' diff --git a/packages/server/dataloader/foreignKeyLoaderMaker.ts b/packages/server/dataloader/foreignKeyLoaderMaker.ts index e21ec3a9f2d..19c91cadfd1 100644 --- a/packages/server/dataloader/foreignKeyLoaderMaker.ts +++ b/packages/server/dataloader/foreignKeyLoaderMaker.ts @@ -1,7 +1,7 @@ import DataLoader from 'dataloader' -import * as primaryKeyLoaderMakers from './primaryKeyLoaderMakers' import RootDataLoader from './RootDataLoader' import UpdatableCacheDataLoader from './UpdatableCacheDataLoader' +import * as primaryKeyLoaderMakers from './primaryKeyLoaderMakers' type LoaderMakers = typeof primaryKeyLoaderMakers type LoaderKeys = keyof LoaderMakers diff --git a/packages/server/dataloader/primaryKeyLoaderMakers.ts b/packages/server/dataloader/primaryKeyLoaderMakers.ts index 06ebe30bd0f..09f2b463024 100644 --- a/packages/server/dataloader/primaryKeyLoaderMakers.ts +++ b/packages/server/dataloader/primaryKeyLoaderMakers.ts @@ -1,15 +1,15 @@ +import getKysely from '../postgres/getKysely' import {getDiscussionsByIds} from '../postgres/queries/getDiscussionsByIds' import {getDomainJoinRequestsByIds} from '../postgres/queries/getDomainJoinRequestsByIds' +import {getKudosesByIds} from '../postgres/queries/getKudosesByIds' import getMeetingSeriesByIds from '../postgres/queries/getMeetingSeriesByIds' +import getMeetingTemplatesByIds from '../postgres/queries/getMeetingTemplatesByIds' import {getTeamPromptResponsesByIds} from '../postgres/queries/getTeamPromptResponsesByIds' import getTeamsByIds from '../postgres/queries/getTeamsByIds' import getTemplateRefsByIds from '../postgres/queries/getTemplateRefsByIds' import getTemplateScaleRefsByIds from '../postgres/queries/getTemplateScaleRefsByIds' import {getUsersByIds} from '../postgres/queries/getUsersByIds' -import {getKudosesByIds} from '../postgres/queries/getKudosesByIds' -import getMeetingTemplatesByIds from '../postgres/queries/getMeetingTemplatesByIds' import {primaryKeyLoaderMaker} from './primaryKeyLoaderMaker' -import getKysely from '../postgres/getKysely' export const users = primaryKeyLoaderMaker(getUsersByIds) export const teams = primaryKeyLoaderMaker(getTeamsByIds) diff --git a/packages/server/dataloader/rethinkPrimaryKeyLoader.ts b/packages/server/dataloader/rethinkPrimaryKeyLoader.ts index fd3320d038c..e6373123a6a 100644 --- a/packages/server/dataloader/rethinkPrimaryKeyLoader.ts +++ b/packages/server/dataloader/rethinkPrimaryKeyLoader.ts @@ -1,7 +1,7 @@ import DataLoader from 'dataloader' import getRethink, {DBType} from '../database/rethinkDriver' -import normalizeResults from './normalizeResults' import UpdatableCacheDataLoader from './UpdatableCacheDataLoader' +import normalizeResults from './normalizeResults' const rethinkPrimaryKeyLoader = ( options: DataLoader.Options, diff --git a/packages/server/email/MailManagerDebug.ts b/packages/server/email/MailManagerDebug.ts index 3ca089c510b..cce05a074c4 100644 --- a/packages/server/email/MailManagerDebug.ts +++ b/packages/server/email/MailManagerDebug.ts @@ -1,5 +1,5 @@ -import MailManager, {MailManagerOptions} from './MailManager' import fs from 'fs' +import MailManager, {MailManagerOptions} from './MailManager' export default class MailManagerDebug extends MailManager { async sendEmail(options: MailManagerOptions) { diff --git a/packages/server/email/newMeetingSummaryEmailCreator.tsx b/packages/server/email/newMeetingSummaryEmailCreator.tsx index 924da4852ba..8387534b811 100644 --- a/packages/server/email/newMeetingSummaryEmailCreator.tsx +++ b/packages/server/email/newMeetingSummaryEmailCreator.tsx @@ -4,9 +4,9 @@ import React from 'react' import appOrigin from '../appOrigin' import AuthToken from '../database/types/AuthToken' import {GQLContext} from '../graphql/graphql' +import ServerEnvironment from './ServerEnvironment' import emailTemplate from './emailTemplate' import renderSSRElement from './renderSSRElement' -import ServerEnvironment from './ServerEnvironment' interface Props { meetingId: string diff --git a/packages/server/email/notificationSummaryCreator.tsx b/packages/server/email/notificationSummaryCreator.tsx index fe225d4b795..07b7d170bda 100644 --- a/packages/server/email/notificationSummaryCreator.tsx +++ b/packages/server/email/notificationSummaryCreator.tsx @@ -4,9 +4,9 @@ import {ContactInfo, ExternalLinks} from 'parabol-client/types/constEnums' import makeAppURL from 'parabol-client/utils/makeAppURL' import plural from 'parabol-client/utils/plural' import React from 'react' +import ServerEnvironment from './ServerEnvironment' import emailTemplate from './emailTemplate' import renderSSRElement from './renderSSRElement' -import ServerEnvironment from './ServerEnvironment' type TextSummaryProps = Omit const textOnlySummary = (props: TextSummaryProps) => { diff --git a/packages/server/fileStorage/getFileStoreManager.ts b/packages/server/fileStorage/getFileStoreManager.ts index 0a641b54bf0..00c92e32f02 100644 --- a/packages/server/fileStorage/getFileStoreManager.ts +++ b/packages/server/fileStorage/getFileStoreManager.ts @@ -1,7 +1,7 @@ import FileStoreManager from './FileStoreManager' +import GCSManager from './GCSManager' import LocalFileSystemManager from './LocalFileStoreManager' import S3Manager from './S3FileStoreManager' -import GCSManager from './GCSManager' let fileStoreManager: FileStoreManager const managers = { diff --git a/packages/server/graphql/ResponseStream.ts b/packages/server/graphql/ResponseStream.ts index 124ae8bf2d7..0f4fa374df7 100644 --- a/packages/server/graphql/ResponseStream.ts +++ b/packages/server/graphql/ResponseStream.ts @@ -1,8 +1,8 @@ import {ExecutionResult} from 'graphql' +import SubscriptionIterator from '../utils/SubscriptionIterator' import {getUserId} from '../utils/authorization' import getGraphQLExecutor from '../utils/getGraphQLExecutor' import sendToSentry from '../utils/sendToSentry' -import SubscriptionIterator from '../utils/SubscriptionIterator' import {SubscribeRequest} from './subscribeGraphQL' export default class ResponseStream implements AsyncIterableIterator { diff --git a/packages/server/graphql/mutations/addAgendaItem.ts b/packages/server/graphql/mutations/addAgendaItem.ts index 57be904cac5..c9200d89215 100644 --- a/packages/server/graphql/mutations/addAgendaItem.ts +++ b/packages/server/graphql/mutations/addAgendaItem.ts @@ -4,6 +4,7 @@ import makeAgendaItemSchema from 'parabol-client/validation/makeAgendaItemSchema import getRethink from '../../database/rethinkDriver' import AgendaItem, {AgendaItemInput} from '../../database/types/AgendaItem' import generateUID from '../../generateUID' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' @@ -11,7 +12,6 @@ import AddAgendaItemPayload from '../types/AddAgendaItemPayload' import CreateAgendaItemInput, {CreateAgendaItemInputType} from '../types/CreateAgendaItemInput' import {GQLContext} from './../graphql' import addAgendaItemToActiveActionMeeting from './helpers/addAgendaItemToActiveActionMeeting' -import {analytics} from '../../utils/analytics/analytics' export default { type: AddAgendaItemPayload, diff --git a/packages/server/graphql/mutations/addAtlassianAuth.ts b/packages/server/graphql/mutations/addAtlassianAuth.ts index 9761d9232a1..99e394c02b7 100644 --- a/packages/server/graphql/mutations/addAtlassianAuth.ts +++ b/packages/server/graphql/mutations/addAtlassianAuth.ts @@ -2,8 +2,8 @@ import {GraphQLID, GraphQLNonNull} from 'graphql' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import getAtlassianAuthsByUserId from '../../postgres/queries/getAtlassianAuthsByUserId' import upsertAtlassianAuths from '../../postgres/queries/upsertAtlassianAuths' -import {analytics} from '../../utils/analytics/analytics' import AtlassianServerManager from '../../utils/AtlassianServerManager' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' diff --git a/packages/server/graphql/mutations/addGitHubAuth.ts b/packages/server/graphql/mutations/addGitHubAuth.ts index 1581610c0db..668a2afed59 100644 --- a/packages/server/graphql/mutations/addGitHubAuth.ts +++ b/packages/server/graphql/mutations/addGitHubAuth.ts @@ -1,11 +1,11 @@ import {GraphQLID, GraphQLNonNull, GraphQLResolveInfo} from 'graphql' import upsertGitHubAuth from '../../postgres/queries/upsertGitHubAuth' import {GetProfileQuery} from '../../types/githubTypes' +import GitHubServerManager from '../../utils/GitHubServerManager' import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import getGitHubRequest from '../../utils/getGitHubRequest' import getProfile from '../../utils/githubQueries/getProfile.graphql' -import GitHubServerManager from '../../utils/GitHubServerManager' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import updateRepoIntegrationsCacheByPerms from '../queries/helpers/updateRepoIntegrationsCacheByPerms' diff --git a/packages/server/graphql/mutations/addOrg.ts b/packages/server/graphql/mutations/addOrg.ts index 1eb69d12f86..d3c9ca3df03 100644 --- a/packages/server/graphql/mutations/addOrg.ts +++ b/packages/server/graphql/mutations/addOrg.ts @@ -4,6 +4,7 @@ import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId' import AuthToken from '../../database/types/AuthToken' import generateUID from '../../generateUID' import removeSuggestedAction from '../../safeMutations/removeSuggestedAction' +import {analytics} from '../../utils/analytics/analytics' import {getUserId} from '../../utils/authorization' import encodeAuthToken from '../../utils/encodeAuthToken' import publish from '../../utils/publish' @@ -16,7 +17,6 @@ import addOrgValidation from './helpers/addOrgValidation' import createNewOrg from './helpers/createNewOrg' import createTeamAndLeader from './helpers/createTeamAndLeader' import inviteToTeamHelper from './helpers/inviteToTeamHelper' -import {analytics} from '../../utils/analytics/analytics' export default { type: new GraphQLNonNull(AddOrgPayload), diff --git a/packages/server/graphql/mutations/addPokerTemplateScale.ts b/packages/server/graphql/mutations/addPokerTemplateScale.ts index 305437f3bbf..fdb38242b46 100644 --- a/packages/server/graphql/mutations/addPokerTemplateScale.ts +++ b/packages/server/graphql/mutations/addPokerTemplateScale.ts @@ -4,12 +4,12 @@ import dndNoise from 'parabol-client/utils/dndNoise' import getRethink from '../../database/rethinkDriver' import {RDatum} from '../../database/stricterR' import TemplateScale from '../../database/types/TemplateScale' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import AddPokerTemplateScalePayload from '../types/AddPokerTemplateScalePayload' -import {analytics} from '../../utils/analytics/analytics' const addPokerTemplateScale = { description: 'Add a new scale for the poker template', diff --git a/packages/server/graphql/mutations/addSlackAuth.ts b/packages/server/graphql/mutations/addSlackAuth.ts index ce97036cba9..5c6110e0840 100644 --- a/packages/server/graphql/mutations/addSlackAuth.ts +++ b/packages/server/graphql/mutations/addSlackAuth.ts @@ -3,10 +3,10 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums' import getRethink from '../../database/rethinkDriver' import SlackAuth from '../../database/types/SlackAuth' import SlackNotification, {SlackNotificationEvent} from '../../database/types/SlackNotification' +import SlackServerManager from '../../utils/SlackServerManager' import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' -import SlackServerManager from '../../utils/SlackServerManager' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import AddSlackAuthPayload from '../types/AddSlackAuthPayload' diff --git a/packages/server/graphql/mutations/addTeam.ts b/packages/server/graphql/mutations/addTeam.ts index c38f5b16227..132926cd46c 100644 --- a/packages/server/graphql/mutations/addTeam.ts +++ b/packages/server/graphql/mutations/addTeam.ts @@ -5,6 +5,7 @@ import AuthToken from '../../database/types/AuthToken' import generateUID from '../../generateUID' import getTeamsByOrgIds from '../../postgres/queries/getTeamsByOrgIds' import removeSuggestedAction from '../../safeMutations/removeSuggestedAction' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isUserInOrg} from '../../utils/authorization' import encodeAuthToken from '../../utils/encodeAuthToken' import publish from '../../utils/publish' @@ -14,11 +15,10 @@ import rateLimit from '../rateLimit' import AddTeamPayload from '../types/AddTeamPayload' import GraphQLEmailType from '../types/GraphQLEmailType' import NewTeamInput, {NewTeamInputType} from '../types/NewTeamInput' +import {getFeatureTier} from '../types/helpers/getFeatureTier' import addTeamValidation from './helpers/addTeamValidation' import createTeamAndLeader from './helpers/createTeamAndLeader' import inviteToTeamHelper from './helpers/inviteToTeamHelper' -import {analytics} from '../../utils/analytics/analytics' -import {getFeatureTier} from '../types/helpers/getFeatureTier' export default { type: new GraphQLNonNull(AddTeamPayload), diff --git a/packages/server/graphql/mutations/addTeamMemberIntegrationAuth.ts b/packages/server/graphql/mutations/addTeamMemberIntegrationAuth.ts index bf997c37b62..52a20bdd1ca 100644 --- a/packages/server/graphql/mutations/addTeamMemberIntegrationAuth.ts +++ b/packages/server/graphql/mutations/addTeamMemberIntegrationAuth.ts @@ -1,15 +1,15 @@ import {GraphQLID, GraphQLNonNull} from 'graphql' import IntegrationProviderId from '~/shared/gqlIds/IntegrationProviderId' -import GitLabOAuth2Manager from '../../integrations/gitlab/GitLabOAuth2Manager' import GcalOAuth2Manager from '../../integrations/gcal/GcalOAuth2Manager' +import GitLabOAuth2Manager from '../../integrations/gitlab/GitLabOAuth2Manager' import JiraServerOAuth1Manager, { OAuth1Auth } from '../../integrations/jiraServer/JiraServerOAuth1Manager' import {IntegrationProviderAzureDevOps} from '../../postgres/queries/getIntegrationProvidersByIds' import upsertTeamMemberIntegrationAuth from '../../postgres/queries/upsertTeamMemberIntegrationAuth' +import AzureDevOpsServerManager from '../../utils/AzureDevOpsServerManager' import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' -import AzureDevOpsServerManager from '../../utils/AzureDevOpsServerManager' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import updateRepoIntegrationsCacheByPerms from '../queries/helpers/updateRepoIntegrationsCacheByPerms' diff --git a/packages/server/graphql/mutations/archiveOrganization.ts b/packages/server/graphql/mutations/archiveOrganization.ts index 2e52d148fc3..474d9d45fc4 100644 --- a/packages/server/graphql/mutations/archiveOrganization.ts +++ b/packages/server/graphql/mutations/archiveOrganization.ts @@ -6,13 +6,13 @@ import Team from '../../database/types/Team' import User from '../../database/types/User' import IUser from '../../postgres/types/IUser' import safeArchiveTeam from '../../safeMutations/safeArchiveTeam' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isSuperUser, isUserBillingLeader} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import isValid from '../isValid' import ArchiveOrganizationPayload from '../types/ArchiveOrganizationPayload' -import {analytics} from '../../utils/analytics/analytics' export default { type: new GraphQLNonNull(ArchiveOrganizationPayload), diff --git a/packages/server/graphql/mutations/archiveTeam.ts b/packages/server/graphql/mutations/archiveTeam.ts index 217195001e8..39970cd9f80 100644 --- a/packages/server/graphql/mutations/archiveTeam.ts +++ b/packages/server/graphql/mutations/archiveTeam.ts @@ -5,11 +5,11 @@ import getRethink from '../../database/rethinkDriver' import NotificationTeamArchived from '../../database/types/NotificationTeamArchived' import removeMeetingTemplatesForTeam from '../../postgres/queries/removeMeetingTemplatesForTeam' import safeArchiveTeam from '../../safeMutations/safeArchiveTeam' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isSuperUser, isTeamLead} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' -import {analytics} from '../../utils/analytics/analytics' export default { type: new GraphQLNonNull( diff --git a/packages/server/graphql/mutations/createPoll.ts b/packages/server/graphql/mutations/createPoll.ts index 16e33f35a6a..ef920a51cfc 100644 --- a/packages/server/graphql/mutations/createPoll.ts +++ b/packages/server/graphql/mutations/createPoll.ts @@ -2,12 +2,12 @@ import {GraphQLNonNull} from 'graphql' import MeetingMemberId from 'parabol-client/shared/gqlIds/MeetingMemberId' import {Polls, SubscriptionChannel} from 'parabol-client/types/constEnums' import insertPollWithOptions from '../../postgres/queries/insertPollWithOptions' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import {GQLContext} from '../graphql' import CreatePollInput from '../types/CreatePollInput' import CreatePollPayload from '../types/CreatePollPayload' -import {analytics} from '../../utils/analytics/analytics' type PollOptionsInputVariables = { title: string diff --git a/packages/server/graphql/mutations/createReflection.ts b/packages/server/graphql/mutations/createReflection.ts index d53e529d6f9..f9a7fd64760 100644 --- a/packages/server/graphql/mutations/createReflection.ts +++ b/packages/server/graphql/mutations/createReflection.ts @@ -1,3 +1,4 @@ +import {RawDraftContentState} from 'draft-js' import {GraphQLNonNull} from 'graphql' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import extractTextFromDraftString from 'parabol-client/utils/draftjs/extractTextFromDraftString' @@ -10,17 +11,16 @@ import Reflection from '../../database/types/Reflection' import ReflectionGroup from '../../database/types/ReflectionGroup' import generateUID from '../../generateUID' import getKysely from '../../postgres/getKysely' +import {analytics} from '../../utils/analytics/analytics' import {getUserId} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import CreateReflectionInput, {CreateReflectionInputType} from '../types/CreateReflectionInput' import CreateReflectionPayload from '../types/CreateReflectionPayload' +import {getFeatureTier} from '../types/helpers/getFeatureTier' import getReflectionEntities from './helpers/getReflectionEntities' import getReflectionSentimentScore from './helpers/getReflectionSentimentScore' -import {analytics} from '../../utils/analytics/analytics' -import {getFeatureTier} from '../types/helpers/getFeatureTier' -import {RawDraftContentState} from 'draft-js' export default { type: CreateReflectionPayload, diff --git a/packages/server/graphql/mutations/downgradeToStarter.ts b/packages/server/graphql/mutations/downgradeToStarter.ts index 1121cddf4e0..90f948e3d0c 100644 --- a/packages/server/graphql/mutations/downgradeToStarter.ts +++ b/packages/server/graphql/mutations/downgradeToStarter.ts @@ -5,9 +5,9 @@ import {getUserId, isSuperUser, isUserBillingLeader} from '../../utils/authoriza import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' +import {ReasonToDowngradeEnum as TReasonToDowngradeEnum} from '../public/resolverTypes' import DowngradeToStarterPayload from '../types/DowngradeToStarterPayload' import ReasonToDowngradeEnum from '../types/ReasonToDowngrade' -import {ReasonToDowngradeEnum as TReasonToDowngradeEnum} from '../public/resolverTypes' import resolveDowngradeToStarter from './helpers/resolveDowngradeToStarter' export default { diff --git a/packages/server/graphql/mutations/endCheckIn.ts b/packages/server/graphql/mutations/endCheckIn.ts index c22425619d9..38b63ef12d0 100644 --- a/packages/server/graphql/mutations/endCheckIn.ts +++ b/packages/server/graphql/mutations/endCheckIn.ts @@ -13,10 +13,10 @@ import TimelineEventCheckinComplete from '../../database/types/TimelineEventChec import generateUID from '../../generateUID' import archiveTasksForDB from '../../safeMutations/archiveTasksForDB' import removeSuggestedAction from '../../safeMutations/removeSuggestedAction' +import {Logger} from '../../utils/Logger' import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import getPhase from '../../utils/getPhase' -import {Logger} from '../../utils/Logger' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {DataLoaderWorker, GQLContext} from '../graphql' diff --git a/packages/server/graphql/mutations/endSprintPoker.ts b/packages/server/graphql/mutations/endSprintPoker.ts index 21d18816b99..14fa0fbb449 100644 --- a/packages/server/graphql/mutations/endSprintPoker.ts +++ b/packages/server/graphql/mutations/endSprintPoker.ts @@ -7,6 +7,7 @@ import getRethink from '../../database/rethinkDriver' import Meeting from '../../database/types/Meeting' import MeetingPoker from '../../database/types/MeetingPoker' import TimelineEventPokerComplete from '../../database/types/TimelineEventPokerComplete' +import {Logger} from '../../utils/Logger' import {analytics} from '../../utils/analytics/analytics' import {getUserId, isSuperUser, isTeamMember} from '../../utils/authorization' import getPhase from '../../utils/getPhase' @@ -15,12 +16,11 @@ import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import EndSprintPokerPayload from '../types/EndSprintPokerPayload' -import gatherInsights from './helpers/gatherInsights' import sendNewMeetingSummary from './helpers/endMeeting/sendNewMeetingSummary' +import gatherInsights from './helpers/gatherInsights' import {IntegrationNotifier} from './helpers/notifications/IntegrationNotifier' import removeEmptyTasks from './helpers/removeEmptyTasks' import updateTeamInsights from './helpers/updateTeamInsights' -import {Logger} from '../../utils/Logger' export default { type: new GraphQLNonNull(EndSprintPokerPayload), diff --git a/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts b/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts index 030d4a30446..dc2a59eaea4 100644 --- a/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts +++ b/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts @@ -1,8 +1,8 @@ import ms from 'ms' import getRethink from '../../../database/rethinkDriver' +import {Logger} from '../../../utils/Logger' import SlackServerManager from '../../../utils/SlackServerManager' import {upsertNotifications} from '../addSlackAuth' -import {Logger} from '../../../utils/Logger' const activatePrevSlackAuth = async (userId: string, teamId: string) => { const r = await getRethink() diff --git a/packages/server/graphql/mutations/helpers/attemptLogin.ts b/packages/server/graphql/mutations/helpers/attemptLogin.ts index 9afe4f20641..99a605ca815 100644 --- a/packages/server/graphql/mutations/helpers/attemptLogin.ts +++ b/packages/server/graphql/mutations/helpers/attemptLogin.ts @@ -4,10 +4,10 @@ import ms from 'ms' import {AuthenticationError, Threshold} from 'parabol-client/types/constEnums' import sleep from 'parabol-client/utils/sleep' import {AuthIdentityTypeEnum} from '../../../../client/types/constEnums' -import getKysely from '../../../postgres/getKysely' import AuthIdentityLocal from '../../../database/types/AuthIdentityLocal' import AuthToken from '../../../database/types/AuthToken' import FailedAuthRequest from '../../../database/types/FailedAuthRequest' +import getKysely from '../../../postgres/getKysely' import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails' const logFailedLogin = async (ip: string, email: string) => { diff --git a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts index 278c71930b7..a631100aa35 100644 --- a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts +++ b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts @@ -6,18 +6,18 @@ import SuggestedActionTryTheDemo from '../../../database/types/SuggestedActionTr import TimelineEventJoinedParabol from '../../../database/types/TimelineEventJoinedParabol' import User from '../../../database/types/User' import generateUID from '../../../generateUID' +import getUsersbyDomain from '../../../postgres/queries/getUsersByDomain' import insertUser from '../../../postgres/queries/insertUser' import IUser from '../../../postgres/types/IUser' +import acceptTeamInvitation from '../../../safeMutations/acceptTeamInvitation' import {analytics} from '../../../utils/analytics/analytics' -import addSeedTasks from './addSeedTasks' -import createNewOrg from './createNewOrg' -import createTeamAndLeader from './createTeamAndLeader' -import getUsersbyDomain from '../../../postgres/queries/getUsersByDomain' +import getSAMLURLFromEmail from '../../../utils/getSAMLURLFromEmail' import sendPromptToJoinOrg from '../../../utils/sendPromptToJoinOrg' import {DataLoaderWorker} from '../../graphql' -import acceptTeamInvitation from '../../../safeMutations/acceptTeamInvitation' import isValid from '../../isValid' -import getSAMLURLFromEmail from '../../../utils/getSAMLURLFromEmail' +import addSeedTasks from './addSeedTasks' +import createNewOrg from './createNewOrg' +import createTeamAndLeader from './createTeamAndLeader' const bootstrapNewUser = async ( newUser: User, diff --git a/packages/server/graphql/mutations/helpers/createGcalEvent.ts b/packages/server/graphql/mutations/helpers/createGcalEvent.ts index 4382ca7dedd..575fc9e4cdd 100644 --- a/packages/server/graphql/mutations/helpers/createGcalEvent.ts +++ b/packages/server/graphql/mutations/helpers/createGcalEvent.ts @@ -1,11 +1,11 @@ import {google} from 'googleapis' +import {pick} from 'lodash' import makeAppURL from 'parabol-client/utils/makeAppURL' +import {RRule} from 'rrule' import appOrigin from '../../../appOrigin' -import {DataLoaderWorker} from '../../graphql' import standardError from '../../../utils/standardError' +import {DataLoaderWorker} from '../../graphql' import {CreateGcalEventInput, StandardMutationError} from '../../public/resolverTypes' -import {RRule} from 'rrule' -import {pick} from 'lodash' const emailRemindMinsBeforeMeeting = 24 * 60 const popupRemindMinsBeforeMeeting = 10 diff --git a/packages/server/graphql/mutations/helpers/createNewMeetingPhases.ts b/packages/server/graphql/mutations/helpers/createNewMeetingPhases.ts index 31567d1a6d2..5ac8998e8a3 100644 --- a/packages/server/graphql/mutations/helpers/createNewMeetingPhases.ts +++ b/packages/server/graphql/mutations/helpers/createNewMeetingPhases.ts @@ -26,8 +26,8 @@ import UpdatesPhase from '../../../database/types/UpdatesPhase' import UpdatesStage from '../../../database/types/UpdatesStage' import insertDiscussions from '../../../postgres/queries/insertDiscussions' import {MeetingTypeEnum} from '../../../postgres/types/Meeting' -import {DataLoaderWorker} from '../../graphql' import isPhaseAvailable from '../../../utils/isPhaseAvailable' +import {DataLoaderWorker} from '../../graphql' import {getFeatureTier} from '../../types/helpers/getFeatureTier' export const primePhases = (phases: GenericMeetingPhase[], startIndex = 0) => { diff --git a/packages/server/graphql/mutations/helpers/gatherInsights.ts b/packages/server/graphql/mutations/helpers/gatherInsights.ts index b0301d0467b..159a7f75533 100644 --- a/packages/server/graphql/mutations/helpers/gatherInsights.ts +++ b/packages/server/graphql/mutations/helpers/gatherInsights.ts @@ -1,7 +1,7 @@ import Meeting from '../../../database/types/Meeting' import {DataLoaderWorker} from '../../graphql' -import collectReactjis from './collectReactjis' import calculateEngagement from './calculateEngagement' +import collectReactjis from './collectReactjis' const gatherInsights = async (meeting: Meeting, dataLoader: DataLoaderWorker) => { const [usedReactjis, engagement] = await Promise.all([ diff --git a/packages/server/graphql/mutations/helpers/generateGroups.ts b/packages/server/graphql/mutations/helpers/generateGroups.ts index adee86de361..77d7ab7e1f4 100644 --- a/packages/server/graphql/mutations/helpers/generateGroups.ts +++ b/packages/server/graphql/mutations/helpers/generateGroups.ts @@ -1,12 +1,12 @@ +import {SubscriptionChannel} from '../../../../client/types/constEnums' import getRethink from '../../../database/rethinkDriver' +import {AutogroupReflectionGroupType} from '../../../database/types/MeetingRetrospective' import Reflection from '../../../database/types/Reflection' +import {Logger} from '../../../utils/Logger' import OpenAIServerManager from '../../../utils/OpenAIServerManager' -import {DataLoaderWorker} from '../../graphql' -import {AutogroupReflectionGroupType} from '../../../database/types/MeetingRetrospective' -import {SubscriptionChannel} from '../../../../client/types/constEnums' -import publish from '../../../utils/publish' import {analytics} from '../../../utils/analytics/analytics' -import {Logger} from '../../../utils/Logger' +import publish from '../../../utils/publish' +import {DataLoaderWorker} from '../../graphql' const generateGroups = async ( reflections: Reflection[], diff --git a/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts b/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts index ac299af4d0a..ac20e9b106c 100644 --- a/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts +++ b/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts @@ -1,8 +1,8 @@ +import MeetingTeamPrompt from '../../../database/types/MeetingTeamPrompt' +import {getTeamPromptResponsesByMeetingId} from '../../../postgres/queries/getTeamPromptResponsesByMeetingIds' import OpenAIServerManager from '../../../utils/OpenAIServerManager' import {DataLoaderWorker} from '../../graphql' import canAccessAISummary from './canAccessAISummary' -import {getTeamPromptResponsesByMeetingId} from '../../../postgres/queries/getTeamPromptResponsesByMeetingIds' -import MeetingTeamPrompt from '../../../database/types/MeetingTeamPrompt' const generateStandupMeetingSummary = async ( meeting: MeetingTeamPrompt, diff --git a/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts b/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts index de2bdf41696..7db3ccbce4e 100644 --- a/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts +++ b/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts @@ -1,7 +1,7 @@ import Stripe from 'stripe' +import {Logger} from '../../../utils/Logger' import {getStripeManager} from '../../../utils/stripe' import {stripeCardToDBCard} from './stripeCardToDBCard' -import {Logger} from '../../../utils/Logger' export default async function getCCFromCustomer( customer: Stripe.Customer | Stripe.DeletedCustomer diff --git a/packages/server/graphql/mutations/helpers/getReflectionEntities.ts b/packages/server/graphql/mutations/helpers/getReflectionEntities.ts index 90163f1c7e6..ab6ab948928 100644 --- a/packages/server/graphql/mutations/helpers/getReflectionEntities.ts +++ b/packages/server/graphql/mutations/helpers/getReflectionEntities.ts @@ -1,7 +1,7 @@ import getGoogleLanguageManager from '../../../getGoogleLanguageManager' -import manageGoogleNLPErrorResponse from './manageGoogleNLPErrorResponse' import addLemmaToEntities from './autoGroup/addLemmaToEntities' import sanitizeAnalyzedEntitiesResponse from './autoGroup/sanitizeAnalyzedEntititesResponse' +import manageGoogleNLPErrorResponse from './manageGoogleNLPErrorResponse' const getReflectionEntities = async (plaintextContent: string) => { if (!plaintextContent) return [] diff --git a/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts b/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts index 053ca0f381f..423e3d980c2 100644 --- a/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts +++ b/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts @@ -1,27 +1,27 @@ -import appOrigin from '../../../appOrigin' +import crypto from 'crypto' +import util from 'util' import {SubscriptionChannel, Threshold} from '../../../../client/types/constEnums' +import {EMAIL_CORS_OPTIONS} from '../../../../client/types/cors' +import makeAppURL from '../../../../client/utils/makeAppURL' import {isNotNull} from '../../../../client/utils/predicates' +import appOrigin from '../../../appOrigin' import getRethink from '../../../database/rethinkDriver' import NotificationTeamInvitation from '../../../database/types/NotificationTeamInvitation' import TeamInvitation from '../../../database/types/TeamInvitation' +import getMailManager from '../../../email/getMailManager' import teamInviteEmailCreator from '../../../email/teamInviteEmailCreator' import {getUsersByEmails} from '../../../postgres/queries/getUsersByEmails' import removeSuggestedAction from '../../../safeMutations/removeSuggestedAction' +import {analytics} from '../../../utils/analytics/analytics' import {getUserId} from '../../../utils/authorization' import getBestInvitationMeeting from '../../../utils/getBestInvitationMeeting' import getDomainFromEmail from '../../../utils/getDomainFromEmail' -import standardError from '../../../utils/standardError' -import {GQLContext} from '../../graphql' -import getIsEmailApprovedByOrg from '../../public/mutations/helpers/getIsEmailApprovedByOrg' -import makeAppURL from '../../../../client/utils/makeAppURL' -import {EMAIL_CORS_OPTIONS} from '../../../../client/types/cors' -import getMailManager from '../../../email/getMailManager' -import {analytics} from '../../../utils/analytics/analytics' -import util from 'util' -import crypto from 'crypto' import publish from '../../../utils/publish' import sendToSentry from '../../../utils/sendToSentry' +import standardError from '../../../utils/standardError' +import {GQLContext} from '../../graphql' import isValid from '../../isValid' +import getIsEmailApprovedByOrg from '../../public/mutations/helpers/getIsEmailApprovedByOrg' const randomBytes = util.promisify(crypto.randomBytes) diff --git a/packages/server/graphql/mutations/helpers/notifications/MSTeamsNotifier.ts b/packages/server/graphql/mutations/helpers/notifications/MSTeamsNotifier.ts index 86d94599a49..452791fb341 100644 --- a/packages/server/graphql/mutations/helpers/notifications/MSTeamsNotifier.ts +++ b/packages/server/graphql/mutations/helpers/notifications/MSTeamsNotifier.ts @@ -7,15 +7,15 @@ import Meeting from '../../../../database/types/Meeting' import {SlackNotificationEventEnum as EventEnum} from '../../../../database/types/SlackNotification' import {IntegrationProviderMSTeams} from '../../../../postgres/queries/getIntegrationProvidersByIds' import {Team} from '../../../../postgres/queries/getTeamsByIds' +import IUser from '../../../../postgres/types/IUser' import {MeetingTypeEnum} from '../../../../postgres/types/Meeting' import MSTeamsServerManager from '../../../../utils/MSTeamsServerManager' +import {analytics} from '../../../../utils/analytics/analytics' import sendToSentry from '../../../../utils/sendToSentry' import {DataLoaderWorker} from '../../../graphql' -import getSummaryText from './getSummaryText' import {NotificationIntegrationHelper} from './NotificationIntegrationHelper' import {createNotifier} from './Notifier' -import {analytics} from '../../../../utils/analytics/analytics' -import IUser from '../../../../postgres/types/IUser' +import getSummaryText from './getSummaryText' const notifyMSTeams = async ( event: EventEnum, diff --git a/packages/server/graphql/mutations/helpers/notifications/MattermostNotifier.ts b/packages/server/graphql/mutations/helpers/notifications/MattermostNotifier.ts index e7d039c3a60..6aac7f2a0c3 100644 --- a/packages/server/graphql/mutations/helpers/notifications/MattermostNotifier.ts +++ b/packages/server/graphql/mutations/helpers/notifications/MattermostNotifier.ts @@ -8,11 +8,15 @@ import Meeting from '../../../../database/types/Meeting' import {SlackNotificationEventEnum as EventEnum} from '../../../../database/types/SlackNotification' import {IntegrationProviderMattermost} from '../../../../postgres/queries/getIntegrationProvidersByIds' import {Team} from '../../../../postgres/queries/getTeamsByIds' +import IUser from '../../../../postgres/types/IUser' import {MeetingTypeEnum} from '../../../../postgres/types/Meeting' -import {toEpochSeconds} from '../../../../utils/epochTime' import MattermostServerManager from '../../../../utils/MattermostServerManager' +import {analytics} from '../../../../utils/analytics/analytics' +import {toEpochSeconds} from '../../../../utils/epochTime' import sendToSentry from '../../../../utils/sendToSentry' import {DataLoaderWorker} from '../../../graphql' +import {NotificationIntegrationHelper} from './NotificationIntegrationHelper' +import {createNotifier} from './Notifier' import getSummaryText from './getSummaryText' import { Field, @@ -20,10 +24,6 @@ import { makeHackedButtonPairFields, makeHackedFieldButtonValue } from './makeMattermostAttachments' -import {NotificationIntegrationHelper} from './NotificationIntegrationHelper' -import {createNotifier} from './Notifier' -import {analytics} from '../../../../utils/analytics/analytics' -import IUser from '../../../../postgres/types/IUser' const notifyMattermost = async ( event: EventEnum, diff --git a/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts b/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts index d2b5bf1688a..089ca295826 100644 --- a/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts +++ b/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts @@ -3,28 +3,28 @@ import formatWeekday from 'parabol-client/utils/date/formatWeekday' import makeAppURL from 'parabol-client/utils/makeAppURL' import findStageById from 'parabol-client/utils/meetings/findStageById' import {phaseLabelLookup} from 'parabol-client/utils/meetings/lookups' +import {ErrorResponse, PostMessageResponse} from '../../../../../client/utils/SlackManager' import appOrigin from '../../../../appOrigin' import getRethink, {RethinkSchema} from '../../../../database/rethinkDriver' import Meeting from '../../../../database/types/Meeting' +import SlackAuth from '../../../../database/types/SlackAuth' import {SlackNotificationEvent} from '../../../../database/types/SlackNotification' import {SlackNotificationAuth} from '../../../../dataloader/integrationAuthLoaders' +import {TeamPromptResponse} from '../../../../postgres/queries/getTeamPromptResponsesByIds' +import {getTeamPromptResponsesByMeetingId} from '../../../../postgres/queries/getTeamPromptResponsesByMeetingIds' import {Team} from '../../../../postgres/queries/getTeamsByIds' +import User from '../../../../postgres/types/IUser' import {AnyMeeting, MeetingTypeEnum} from '../../../../postgres/types/Meeting' +import SlackServerManager from '../../../../utils/SlackServerManager' +import {analytics} from '../../../../utils/analytics/analytics' import {toEpochSeconds} from '../../../../utils/epochTime' import sendToSentry from '../../../../utils/sendToSentry' -import SlackServerManager from '../../../../utils/SlackServerManager' +import {convertToMarkdown} from '../../../../utils/tiptap/convertToMarkdown' import {DataLoaderWorker} from '../../../graphql' -import getSummaryText from './getSummaryText' -import {makeButtons, makeHeader, makeSection, makeSections} from './makeSlackBlocks' import {NotificationIntegrationHelper} from './NotificationIntegrationHelper' import {createNotifier} from './Notifier' -import SlackAuth from '../../../../database/types/SlackAuth' -import {getTeamPromptResponsesByMeetingId} from '../../../../postgres/queries/getTeamPromptResponsesByMeetingIds' -import {ErrorResponse, PostMessageResponse} from '../../../../../client/utils/SlackManager' -import {TeamPromptResponse} from '../../../../postgres/queries/getTeamPromptResponsesByIds' -import User from '../../../../postgres/types/IUser' -import {convertToMarkdown} from '../../../../utils/tiptap/convertToMarkdown' -import {analytics} from '../../../../utils/analytics/analytics' +import getSummaryText from './getSummaryText' +import {makeButtons, makeHeader, makeSection, makeSections} from './makeSlackBlocks' type SlackNotification = { title: string diff --git a/packages/server/graphql/mutations/helpers/notifications/getSummaryText.ts b/packages/server/graphql/mutations/helpers/notifications/getSummaryText.ts index 980388956fa..d3522fce222 100644 --- a/packages/server/graphql/mutations/helpers/notifications/getSummaryText.ts +++ b/packages/server/graphql/mutations/helpers/notifications/getSummaryText.ts @@ -5,8 +5,8 @@ import {isMeetingAction} from '../../../../database/types/MeetingAction' import {isMeetingPoker} from '../../../../database/types/MeetingPoker' import {isMeetingRetrospective} from '../../../../database/types/MeetingRetrospective' import {isMeetingTeamPrompt} from '../../../../database/types/MeetingTeamPrompt' -import sendToSentry from '../../../../utils/sendToSentry' import {getTeamPromptResponsesByMeetingId} from '../../../../postgres/queries/getTeamPromptResponsesByMeetingIds' +import sendToSentry from '../../../../utils/sendToSentry' const getSummaryText = async (meeting: Meeting) => { if (isMeetingRetrospective(meeting)) { diff --git a/packages/server/graphql/mutations/helpers/removeFromOrg.ts b/packages/server/graphql/mutations/helpers/removeFromOrg.ts index 98db329798f..945fc3d4a83 100644 --- a/packages/server/graphql/mutations/helpers/removeFromOrg.ts +++ b/packages/server/graphql/mutations/helpers/removeFromOrg.ts @@ -1,14 +1,14 @@ import {InvoiceItemType} from 'parabol-client/types/constEnums' import adjustUserCount from '../../../billing/helpers/adjustUserCount' import getRethink from '../../../database/rethinkDriver' +import {RDatum} from '../../../database/stricterR' import OrganizationUser from '../../../database/types/OrganizationUser' import getTeamsByOrgIds from '../../../postgres/queries/getTeamsByOrgIds' +import {Logger} from '../../../utils/Logger' import setUserTierForUserIds from '../../../utils/setUserTierForUserIds' import {DataLoaderWorker} from '../../graphql' import removeTeamMember from './removeTeamMember' import resolveDowngradeToStarter from './resolveDowngradeToStarter' -import {RDatum} from '../../../database/stricterR' -import {Logger} from '../../../utils/Logger' const removeFromOrg = async ( userId: string, diff --git a/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts b/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts index b4931f9ca3b..475480467e1 100644 --- a/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts +++ b/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts @@ -1,6 +1,6 @@ import {Updateable} from 'kysely' -import {DB} from '../../../postgres/pg' import getKysely from '../../../postgres/getKysely' +import {DB} from '../../../postgres/pg' type FilterType = Omit, 'runAt'> diff --git a/packages/server/graphql/mutations/helpers/removeTeamMember.ts b/packages/server/graphql/mutations/helpers/removeTeamMember.ts index 48a57e211f1..3be41b574a0 100644 --- a/packages/server/graphql/mutations/helpers/removeTeamMember.ts +++ b/packages/server/graphql/mutations/helpers/removeTeamMember.ts @@ -10,11 +10,11 @@ import UpdatesStage from '../../../database/types/UpdatesStage' import removeUserTms from '../../../postgres/queries/removeUserTms' import updateTeamByTeamId from '../../../postgres/queries/updateTeamByTeamId' import archiveTasksForDB from '../../../safeMutations/archiveTasksForDB' +import errorFilter from '../../errorFilter' import {DataLoaderWorker} from '../../graphql' import removeSlackAuths from './removeSlackAuths' import removeStagesFromMeetings from './removeStagesFromMeetings' import removeUserFromMeetingStages from './removeUserFromMeetingStages' -import errorFilter from '../../errorFilter' interface Options { evictorUserId?: string diff --git a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts index e8e6f1b6cb5..7688a32979f 100644 --- a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts +++ b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts @@ -4,17 +4,17 @@ import getRethink, {ParabolR} from '../../../database/rethinkDriver' import MeetingTeamPrompt from '../../../database/types/MeetingTeamPrompt' import TimelineEventTeamPromptComplete from '../../../database/types/TimelineEventTeamPromptComplete' import {getTeamPromptResponsesByMeetingId} from '../../../postgres/queries/getTeamPromptResponsesByMeetingIds' +import {Logger} from '../../../utils/Logger' import {analytics} from '../../../utils/analytics/analytics' import publish, {SubOptions} from '../../../utils/publish' import standardError from '../../../utils/standardError' import {InternalContext} from '../../graphql' import sendNewMeetingSummary from './endMeeting/sendNewMeetingSummary' -import {IntegrationNotifier} from './notifications/IntegrationNotifier' -import updateTeamInsights from './updateTeamInsights' +import gatherInsights from './gatherInsights' import generateStandupMeetingSummary from './generateStandupMeetingSummary' +import {IntegrationNotifier} from './notifications/IntegrationNotifier' import updateQualAIMeetingsCount from './updateQualAIMeetingsCount' -import gatherInsights from './gatherInsights' -import {Logger} from '../../../utils/Logger' +import updateTeamInsights from './updateTeamInsights' const summarizeTeamPrompt = async (meeting: MeetingTeamPrompt, context: InternalContext) => { const {dataLoader} = context diff --git a/packages/server/graphql/mutations/helpers/validateScaleValue.ts b/packages/server/graphql/mutations/helpers/validateScaleValue.ts index 8fee2d80ad7..908c19fb3d1 100644 --- a/packages/server/graphql/mutations/helpers/validateScaleValue.ts +++ b/packages/server/graphql/mutations/helpers/validateScaleValue.ts @@ -1,7 +1,7 @@ +import toArray from 'lodash.toarray' import palettePickerOptions from '../../../../client/styles/palettePickerOptions' import {Threshold} from '../../../../client/types/constEnums' import TemplateScaleValue from '../../../database/types/TemplateScaleValue' -import toArray from 'lodash.toarray' const validateColorValue = (color: string) => { const validHexes = palettePickerOptions.map(({hex}) => hex) diff --git a/packages/server/graphql/mutations/joinMeeting.ts b/packages/server/graphql/mutations/joinMeeting.ts index 4454425cef3..6528c0e37db 100644 --- a/packages/server/graphql/mutations/joinMeeting.ts +++ b/packages/server/graphql/mutations/joinMeeting.ts @@ -1,8 +1,8 @@ import {GraphQLID, GraphQLNonNull} from 'graphql' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import toTeamMemberId from '../../../client/utils/relay/toTeamMemberId' -import getRethink from '../../database/rethinkDriver' import rMapIf from '../../database/rMapIf' +import getRethink from '../../database/rethinkDriver' import ActionMeetingMember from '../../database/types/ActionMeetingMember' import CheckInStage from '../../database/types/CheckInStage' import {NewMeetingPhaseTypeEnum} from '../../database/types/GenericMeetingPhase' diff --git a/packages/server/graphql/mutations/moveTeamToOrg.ts b/packages/server/graphql/mutations/moveTeamToOrg.ts index 7fa25b2b41d..18196676f41 100644 --- a/packages/server/graphql/mutations/moveTeamToOrg.ts +++ b/packages/server/graphql/mutations/moveTeamToOrg.ts @@ -4,16 +4,16 @@ import adjustUserCount from '../../billing/helpers/adjustUserCount' import getRethink from '../../database/rethinkDriver' import {RDatum} from '../../database/stricterR' import Notification from '../../database/types/Notification' +import getKysely from '../../postgres/getKysely' import getTeamsByIds from '../../postgres/queries/getTeamsByIds' import updateMeetingTemplateOrgId from '../../postgres/queries/updateMeetingTemplateOrgId' import updateTeamByTeamId from '../../postgres/queries/updateTeamByTeamId' import safeArchiveEmptyStarterOrganization from '../../safeMutations/safeArchiveEmptyStarterOrganization' +import {Logger} from '../../utils/Logger' import {getUserId, isSuperUser} from '../../utils/authorization' import standardError from '../../utils/standardError' import {DataLoaderWorker, GQLContext} from '../graphql' import isValid from '../isValid' -import getKysely from '../../postgres/getKysely' -import {Logger} from '../../utils/Logger' const MAX_NUM_TEAMS = 40 diff --git a/packages/server/graphql/mutations/navigateMeeting.ts b/packages/server/graphql/mutations/navigateMeeting.ts index 70340fa2401..be704dedc4a 100644 --- a/packages/server/graphql/mutations/navigateMeeting.ts +++ b/packages/server/graphql/mutations/navigateMeeting.ts @@ -4,6 +4,7 @@ import findStageById from 'parabol-client/utils/meetings/findStageById' import startStage_ from 'parabol-client/utils/startStage_' import unlockNextStages from 'parabol-client/utils/unlockNextStages' import getRethink from '../../database/rethinkDriver' +import {Logger} from '../../utils/Logger' import {getUserId} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' @@ -11,7 +12,6 @@ import {GQLContext} from '../graphql' import NavigateMeetingPayload from '../types/NavigateMeetingPayload' import handleCompletedStage from './helpers/handleCompletedStage' import removeScheduledJobs from './helpers/removeScheduledJobs' -import {Logger} from '../../utils/Logger' export default { type: new GraphQLNonNull(NavigateMeetingPayload), diff --git a/packages/server/graphql/mutations/payLater.ts b/packages/server/graphql/mutations/payLater.ts index c61b9dc4b00..54af091b0d2 100644 --- a/packages/server/graphql/mutations/payLater.ts +++ b/packages/server/graphql/mutations/payLater.ts @@ -4,12 +4,12 @@ import getRethink from '../../database/rethinkDriver' import {RValue} from '../../database/stricterR' import getPg from '../../postgres/getPg' import {incrementUserPayLaterClickCountQuery} from '../../postgres/queries/generated/incrementUserPayLaterClickCountQuery' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import PayLaterPayload from '../types/PayLaterPayload' -import {analytics} from '../../utils/analytics/analytics' export default { type: new GraphQLNonNull(PayLaterPayload), diff --git a/packages/server/graphql/mutations/resetPassword.ts b/packages/server/graphql/mutations/resetPassword.ts index bc221f06279..d90523d3cfc 100644 --- a/packages/server/graphql/mutations/resetPassword.ts +++ b/packages/server/graphql/mutations/resetPassword.ts @@ -2,11 +2,11 @@ import bcrypt from 'bcryptjs' import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql' import {Security, Threshold} from 'parabol-client/types/constEnums' import {AuthIdentityTypeEnum} from '../../../client/types/constEnums' -import getKysely from '../../postgres/getKysely' import getRethink from '../../database/rethinkDriver' import AuthIdentityLocal from '../../database/types/AuthIdentityLocal' import AuthToken from '../../database/types/AuthToken' import PasswordResetRequest from '../../database/types/PasswordResetRequest' +import getKysely from '../../postgres/getKysely' import {getUserByEmail} from '../../postgres/queries/getUsersByEmails' import updateUser from '../../postgres/queries/updateUser' import blacklistJWT from '../../utils/blacklistJWT' diff --git a/packages/server/graphql/mutations/selectTemplate.ts b/packages/server/graphql/mutations/selectTemplate.ts index 4d0ee10f092..abb775409f5 100644 --- a/packages/server/graphql/mutations/selectTemplate.ts +++ b/packages/server/graphql/mutations/selectTemplate.ts @@ -2,13 +2,13 @@ import {GraphQLID, GraphQLNonNull} from 'graphql' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import getRethink from '../../database/rethinkDriver' import MeetingTemplate from '../../database/types/MeetingTemplate' +import {Logger} from '../../utils/Logger' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import SelectTemplatePayload from '../types/SelectTemplatePayload' import {getFeatureTier} from '../types/helpers/getFeatureTier' -import {Logger} from '../../utils/Logger' const selectTemplate = { description: 'Set the selected template for the upcoming retro meeting', diff --git a/packages/server/graphql/mutations/setDefaultSlackChannel.ts b/packages/server/graphql/mutations/setDefaultSlackChannel.ts index 4920730cd68..d33709c3bdc 100644 --- a/packages/server/graphql/mutations/setDefaultSlackChannel.ts +++ b/packages/server/graphql/mutations/setDefaultSlackChannel.ts @@ -1,7 +1,7 @@ import {GraphQLID, GraphQLNonNull} from 'graphql' import getRethink from '../../database/rethinkDriver' -import {getUserId, isTeamMember} from '../../utils/authorization' import SlackServerManager from '../../utils/SlackServerManager' +import {getUserId, isTeamMember} from '../../utils/authorization' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import SetDefaultSlackChannelPayload from '../types/SetDefaultSlackChannelPayload' diff --git a/packages/server/graphql/mutations/setStageTimer.ts b/packages/server/graphql/mutations/setStageTimer.ts index 40901c6baa0..79c8bfc1593 100644 --- a/packages/server/graphql/mutations/setStageTimer.ts +++ b/packages/server/graphql/mutations/setStageTimer.ts @@ -1,9 +1,10 @@ import {GraphQLFloat, GraphQLID, GraphQLNonNull} from 'graphql' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import findStageById from 'parabol-client/utils/meetings/findStageById' -import getKysely from '../../postgres/getKysely' import getRethink from '../../database/rethinkDriver' import ScheduledJobMeetingStageTimeLimit from '../../database/types/ScheduledJobMetingStageTimeLimit' +import getKysely from '../../postgres/getKysely' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' @@ -12,7 +13,6 @@ import GraphQLISO8601Type from '../types/GraphQLISO8601Type' import SetStageTimerPayload from '../types/SetStageTimerPayload' import {IntegrationNotifier} from './helpers/notifications/IntegrationNotifier' import removeScheduledJobs from './helpers/removeScheduledJobs' -import {analytics} from '../../utils/analytics/analytics' const BAD_CLOCK_THRESH = 2000 const AVG_PING = 150 diff --git a/packages/server/graphql/mutations/setTaskEstimate.ts b/packages/server/graphql/mutations/setTaskEstimate.ts index 06cdae4586a..08c2fa49895 100644 --- a/packages/server/graphql/mutations/setTaskEstimate.ts +++ b/packages/server/graphql/mutations/setTaskEstimate.ts @@ -10,11 +10,11 @@ import {IntegrationProviderJiraServer} from '../../postgres/queries/getIntegrati import insertTaskEstimate from '../../postgres/queries/insertTaskEstimate' import updateJiraDimensionFieldMap from '../../postgres/queries/updateJiraDimensionFieldMap' import upsertJiraDimensionFieldMap from '../../postgres/queries/upsertJiraDimensionFieldMap' -import {analytics} from '../../utils/analytics/analytics' import AtlassianServerManager from '../../utils/AtlassianServerManager' +import AzureDevOpsServerManager from '../../utils/AzureDevOpsServerManager' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import {fieldTypeToId} from '../../utils/azureDevOps/azureDevOpsFieldTypeToId' -import AzureDevOpsServerManager from '../../utils/AzureDevOpsServerManager' import getPhase from '../../utils/getPhase' import makeScoreJiraComment from '../../utils/makeScoreJiraComment' import publish from '../../utils/publish' diff --git a/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts b/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts index 7e27ad66e14..b8a5fd2245c 100644 --- a/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts +++ b/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts @@ -4,8 +4,8 @@ import MeetingPoker from '../../database/types/MeetingPoker' import upsertAzureDevOpsDimensionFieldMap, { AzureDevOpsFieldMapProps } from '../../postgres/queries/upsertAzureDevOpsDimensionFieldMap' -import {isTeamMember} from '../../utils/authorization' import {Logger} from '../../utils/Logger' +import {isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import {GQLContext} from '../graphql' import UpdateAzureDevOpsDimensionFieldPayload from '../types/UpdateAzureDevOpsDimensionFieldPayload' diff --git a/packages/server/graphql/mutations/updateGitHubDimensionField.ts b/packages/server/graphql/mutations/updateGitHubDimensionField.ts index 703f9e601e9..ded249edf3f 100644 --- a/packages/server/graphql/mutations/updateGitHubDimensionField.ts +++ b/packages/server/graphql/mutations/updateGitHubDimensionField.ts @@ -2,8 +2,8 @@ import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import MeetingPoker from '../../database/types/MeetingPoker' import upsertGitHubDimensionFieldMap from '../../postgres/queries/upsertGitHubDimensionFieldMap' -import {isTeamMember} from '../../utils/authorization' import {Logger} from '../../utils/Logger' +import {isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import {GQLContext} from '../graphql' import UpdateGitHubDimensionFieldPayload from '../types/UpdateGitHubDimensionFieldPayload' diff --git a/packages/server/graphql/mutations/updateIntegrationProvider.ts b/packages/server/graphql/mutations/updateIntegrationProvider.ts index 85220aa8fc3..10e5981cda9 100644 --- a/packages/server/graphql/mutations/updateIntegrationProvider.ts +++ b/packages/server/graphql/mutations/updateIntegrationProvider.ts @@ -9,8 +9,8 @@ import UpdateIntegrationProviderInput, { IUpdateIntegrationProviderInput } from '../types/UpdateIntegrationProviderInput' import UpdateIntegrationProviderPayload from '../types/UpdateIntegrationProviderPayload' -import {MattermostNotifier} from './helpers/notifications/MattermostNotifier' import {MSTeamsNotifier} from './helpers/notifications/MSTeamsNotifier' +import {MattermostNotifier} from './helpers/notifications/MattermostNotifier' const updateIntegrationProvider = { name: 'UpdateIntegrationProvider', diff --git a/packages/server/graphql/mutations/updatePokerScope.ts b/packages/server/graphql/mutations/updatePokerScope.ts index 2e2df35844d..0300d2f9832 100644 --- a/packages/server/graphql/mutations/updatePokerScope.ts +++ b/packages/server/graphql/mutations/updatePokerScope.ts @@ -7,11 +7,11 @@ import EstimateStage from '../../database/types/EstimateStage' import MeetingPoker from '../../database/types/MeetingPoker' import {TaskServiceEnum} from '../../database/types/Task' import insertDiscussions, {InputDiscussions} from '../../postgres/queries/insertDiscussions' +import RedisLockQueue from '../../utils/RedisLockQueue' import {getUserId, isTeamMember} from '../../utils/authorization' import getPhase from '../../utils/getPhase' import getRedis from '../../utils/getRedis' import publish from '../../utils/publish' -import RedisLockQueue from '../../utils/RedisLockQueue' import {GQLContext} from '../graphql' import UpdatePokerScopeItemInput from '../types/UpdatePokerScopeItemInput' import UpdatePokerScopePayload from '../types/UpdatePokerScopePayload' diff --git a/packages/server/graphql/mutations/updateReflectionContent.ts b/packages/server/graphql/mutations/updateReflectionContent.ts index 7d4d35ef948..349bf654dba 100644 --- a/packages/server/graphql/mutations/updateReflectionContent.ts +++ b/packages/server/graphql/mutations/updateReflectionContent.ts @@ -12,10 +12,10 @@ import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import UpdateReflectionContentPayload from '../types/UpdateReflectionContentPayload' +import {getFeatureTier} from '../types/helpers/getFeatureTier' import getReflectionEntities from './helpers/getReflectionEntities' import getReflectionSentimentScore from './helpers/getReflectionSentimentScore' import updateSmartGroupTitle from './helpers/updateReflectionLocation/updateSmartGroupTitle' -import {getFeatureTier} from '../types/helpers/getFeatureTier' export default { type: UpdateReflectionContentPayload, diff --git a/packages/server/graphql/mutations/updateReflectionGroupTitle.ts b/packages/server/graphql/mutations/updateReflectionGroupTitle.ts index 244b997ee8b..24e612d8615 100644 --- a/packages/server/graphql/mutations/updateReflectionGroupTitle.ts +++ b/packages/server/graphql/mutations/updateReflectionGroupTitle.ts @@ -4,12 +4,12 @@ import isPhaseComplete from 'parabol-client/utils/meetings/isPhaseComplete' import stringSimilarity from 'string-similarity' import getRethink from '../../database/rethinkDriver' import getKysely from '../../postgres/getKysely' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' import UpdateReflectionGroupTitlePayload from '../types/UpdateReflectionGroupTitlePayload' -import {analytics} from '../../utils/analytics/analytics' type UpdateReflectionGroupTitleMutationVariables = { title: string diff --git a/packages/server/graphql/mutations/updateTaskDueDate.ts b/packages/server/graphql/mutations/updateTaskDueDate.ts index 1eea50b817b..40b3a2e85c0 100644 --- a/packages/server/graphql/mutations/updateTaskDueDate.ts +++ b/packages/server/graphql/mutations/updateTaskDueDate.ts @@ -2,13 +2,13 @@ import {GraphQLID, GraphQLNonNull} from 'graphql' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import isValidDate from 'parabol-client/utils/isValidDate' import getRethink from '../../database/rethinkDriver' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import GraphQLISO8601Type from '../types/GraphQLISO8601Type' import UpdateTaskDueDatePayload from '../types/UpdateTaskDueDatePayload' import {GQLContext} from './../graphql' -import {analytics} from '../../utils/analytics/analytics' export default { type: UpdateTaskDueDatePayload, diff --git a/packages/server/graphql/mutations/updateTeamName.ts b/packages/server/graphql/mutations/updateTeamName.ts index 834c7d59318..708ae917889 100644 --- a/packages/server/graphql/mutations/updateTeamName.ts +++ b/packages/server/graphql/mutations/updateTeamName.ts @@ -8,8 +8,8 @@ import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import standardError from '../../utils/standardError' import {GQLContext} from '../graphql' -import UpdatedTeamInput, {UpdatedTeamInputType} from '../types/UpdatedTeamInput' import UpdateTeamNamePayload from '../types/UpdateTeamNamePayload' +import UpdatedTeamInput, {UpdatedTeamInputType} from '../types/UpdatedTeamInput' export default { type: UpdateTeamNamePayload, diff --git a/packages/server/graphql/mutations/updateTemplateScope.ts b/packages/server/graphql/mutations/updateTemplateScope.ts index ab9b8c3e229..65eae40746b 100644 --- a/packages/server/graphql/mutations/updateTemplateScope.ts +++ b/packages/server/graphql/mutations/updateTemplateScope.ts @@ -10,12 +10,12 @@ import TemplateDimension from '../../database/types/TemplateDimension' import insertMeetingTemplate from '../../postgres/queries/insertMeetingTemplate' import removeMeetingTemplate from '../../postgres/queries/removeMeetingTemplate' import updateMeetingTemplateScope from '../../postgres/queries/updateMeetingTemplateScope' +import {analytics} from '../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../utils/authorization' import publish from '../../utils/publish' import {GQLContext} from '../graphql' import SharingScopeEnum, {SharingScopeEnumType} from '../types/SharingScopeEnum' import UpdateTemplateScopePayload from '../types/UpdateTemplateScopePayload' -import {analytics} from '../../utils/analytics/analytics' const updateTemplateScope = { type: new GraphQLNonNull(UpdateTemplateScopePayload), diff --git a/packages/server/graphql/nestedSchema/nestGitLabEndpoint.ts b/packages/server/graphql/nestedSchema/nestGitLabEndpoint.ts index 81abbf3294d..b96280c075a 100644 --- a/packages/server/graphql/nestedSchema/nestGitLabEndpoint.ts +++ b/packages/server/graphql/nestedSchema/nestGitLabEndpoint.ts @@ -3,8 +3,8 @@ import nestGraphQLEndpoint from 'nest-graphql-endpoint/lib/nestGraphQLEndpoint' import { EndpointExecutionResult, Executor, - NestedSource, - NestGraphQLEndpointParams + NestGraphQLEndpointParams, + NestedSource } from 'nest-graphql-endpoint/lib/types' const defaultExecutor: Executor<{ diff --git a/packages/server/graphql/private/mutations/autopauseUsers.ts b/packages/server/graphql/private/mutations/autopauseUsers.ts index ba8e3439b0b..3dbbc4742f4 100644 --- a/packages/server/graphql/private/mutations/autopauseUsers.ts +++ b/packages/server/graphql/private/mutations/autopauseUsers.ts @@ -2,8 +2,8 @@ import {InvoiceItemType, Threshold} from 'parabol-client/types/constEnums' import adjustUserCount from '../../../billing/helpers/adjustUserCount' import getRethink from '../../../database/rethinkDriver' import getUserIdsToPause from '../../../postgres/queries/getUserIdsToPause' -import {MutationResolvers} from '../resolverTypes' import {Logger} from '../../../utils/Logger' +import {MutationResolvers} from '../resolverTypes' const autopauseUsers: MutationResolvers['autopauseUsers'] = async ( _source, diff --git a/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts b/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts index 137316624e8..818af10d9e6 100644 --- a/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts +++ b/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts @@ -1,12 +1,11 @@ import fs from 'fs' import path from 'path' import getRethink from '../../../database/rethinkDriver' -import getMeetingTemplatesByIds from '../../../postgres/queries/getMeetingTemplatesByIds' +import getKysely from '../../../postgres/getKysely' import {checkRowCount, checkTableEq} from '../../../postgres/utils/checkEqBase' import { compareDateAlmostEqual, - compareRValUndefinedAsFalse, - compareRValUndefinedAsNull, + compareRValUndefinedAsNullAndTruncateRVal, defaultEqFn } from '../../../postgres/utils/rethinkEqualityFns' import {MutationResolvers} from '../resolverTypes' @@ -35,22 +34,38 @@ const checkRethinkPgEquality: MutationResolvers['checkRethinkPgEquality'] = asyn ) => { const r = await getRethink() - if (tableName === 'MeetingTemplate') { + if (tableName === 'RetroReflectionGroup') { const rowCountResult = await checkRowCount(tableName) - const rethinkQuery = r.table('MeetingTemplate').orderBy('updatedAt', {index: 'updatedAt'}) - const errors = await checkTableEq(rethinkQuery, getMeetingTemplatesByIds, { + const rethinkQuery = (updatedAt: Date, id: string | number) => { + return r + .table('RetroReflectionGroup') + .between([updatedAt, id], [r.maxval, r.maxval], { + index: 'updatedAtId', + leftBound: 'open', + rightBound: 'closed' + }) + .orderBy({index: 'updatedAtId'}) as any + } + const pgQuery = (ids: string[]) => { + return getKysely() + .selectFrom('RetroReflectionGroup') + .selectAll() + .where('id', 'in', ids) + .execute() + } + const errors = await checkTableEq(rethinkQuery, pgQuery, { + id: defaultEqFn, createdAt: defaultEqFn, - isActive: defaultEqFn, - name: defaultEqFn, - teamId: defaultEqFn, updatedAt: compareDateAlmostEqual, - scope: defaultEqFn, - orgId: defaultEqFn, - parentTemplateId: compareRValUndefinedAsNull, - lastUsedAt: compareRValUndefinedAsNull, - type: defaultEqFn, - isStarter: compareRValUndefinedAsFalse, - isFree: compareRValUndefinedAsFalse + isActive: defaultEqFn, + meetingId: defaultEqFn, + promptId: defaultEqFn, + sortOrder: defaultEqFn, + voterIds: defaultEqFn, + smartTitle: compareRValUndefinedAsNullAndTruncateRVal(255), + title: compareRValUndefinedAsNullAndTruncateRVal(255), + summary: compareRValUndefinedAsNullAndTruncateRVal(2000), + discussionPromptQuestion: compareRValUndefinedAsNullAndTruncateRVal(2000) }) return handleResult(tableName, rowCountResult, errors, writeToFile) } diff --git a/packages/server/graphql/private/mutations/connectSocket.ts b/packages/server/graphql/private/mutations/connectSocket.ts index 4461a506f27..002b6d67001 100644 --- a/packages/server/graphql/private/mutations/connectSocket.ts +++ b/packages/server/graphql/private/mutations/connectSocket.ts @@ -2,11 +2,11 @@ import {InvoiceItemType, SubscriptionChannel} from 'parabol-client/types/constEn import adjustUserCount from '../../../billing/helpers/adjustUserCount' import getRethink from '../../../database/rethinkDriver' import updateUser from '../../../postgres/queries/updateUser' +import {Logger} from '../../../utils/Logger' import {analytics} from '../../../utils/analytics/analytics' import {getUserId} from '../../../utils/authorization' import getListeningUserIds, {RedisCommand} from '../../../utils/getListeningUserIds' import getRedis from '../../../utils/getRedis' -import {Logger} from '../../../utils/Logger' import publish from '../../../utils/publish' import {MutationResolvers} from '../resolverTypes' diff --git a/packages/server/graphql/private/mutations/draftEnterpriseInvoice.ts b/packages/server/graphql/private/mutations/draftEnterpriseInvoice.ts index 96d3958a624..aa0ea60f306 100644 --- a/packages/server/graphql/private/mutations/draftEnterpriseInvoice.ts +++ b/packages/server/graphql/private/mutations/draftEnterpriseInvoice.ts @@ -1,4 +1,6 @@ +import removeTeamsLimitObjects from '../../../billing/helpers/removeTeamsLimitObjects' import getRethink from '../../../database/rethinkDriver' +import getKysely from '../../../postgres/getKysely' import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails' import IUser from '../../../postgres/types/IUser' import {analytics} from '../../../utils/analytics/analytics' @@ -10,8 +12,6 @@ import {DataLoaderWorker} from '../../graphql' import isValid from '../../isValid' import hideConversionModal from '../../mutations/helpers/hideConversionModal' import {MutationResolvers} from '../resolverTypes' -import removeTeamsLimitObjects from '../../../billing/helpers/removeTeamsLimitObjects' -import getKysely from '../../../postgres/getKysely' const getBillingLeaderUser = async ( email: string | null | undefined, diff --git a/packages/server/graphql/private/mutations/processRecurrence.ts b/packages/server/graphql/private/mutations/processRecurrence.ts index 5a010f81f80..3ad56318f20 100644 --- a/packages/server/graphql/private/mutations/processRecurrence.ts +++ b/packages/server/graphql/private/mutations/processRecurrence.ts @@ -1,8 +1,12 @@ import ms from 'ms' +import {getJSDateFromRRuleDate, getRRuleDateFromJSDate} from 'parabol-client/shared/rruleUtil' import {SubscriptionChannel} from 'parabol-client/types/constEnums' -import {getRRuleDateFromJSDate, getJSDateFromRRuleDate} from 'parabol-client/shared/rruleUtil' import {RRule} from 'rrule' import getRethink from '../../../database/rethinkDriver' +import MeetingRetrospective, { + isMeetingRetrospective +} from '../../../database/types/MeetingRetrospective' +import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective' import MeetingTeamPrompt, {isMeetingTeamPrompt} from '../../../database/types/MeetingTeamPrompt' import {getActiveMeetingSeries} from '../../../postgres/queries/getActiveMeetingSeries' import {MeetingSeries} from '../../../postgres/types/MeetingSeries' @@ -10,18 +14,14 @@ import {analytics} from '../../../utils/analytics/analytics' import publish, {SubOptions} from '../../../utils/publish' import standardError from '../../../utils/standardError' import {DataLoaderWorker} from '../../graphql' +import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle' import isStartMeetingLocked from '../../mutations/helpers/isStartMeetingLocked' import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier' +import safeCreateRetrospective from '../../mutations/helpers/safeCreateRetrospective' import safeCreateTeamPrompt, {DEFAULT_PROMPT} from '../../mutations/helpers/safeCreateTeamPrompt' +import safeEndRetrospective from '../../mutations/helpers/safeEndRetrospective' import safeEndTeamPrompt from '../../mutations/helpers/safeEndTeamPrompt' import {MutationResolvers} from '../resolverTypes' -import MeetingRetrospective, { - isMeetingRetrospective -} from '../../../database/types/MeetingRetrospective' -import safeEndRetrospective from '../../mutations/helpers/safeEndRetrospective' -import safeCreateRetrospective from '../../mutations/helpers/safeCreateRetrospective' -import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective' -import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle' const startRecurringMeeting = async ( meetingSeries: MeetingSeries, diff --git a/packages/server/graphql/private/mutations/runScheduledJobs.ts b/packages/server/graphql/private/mutations/runScheduledJobs.ts index 5317aff0147..2b1c3b70575 100644 --- a/packages/server/graphql/private/mutations/runScheduledJobs.ts +++ b/packages/server/graphql/private/mutations/runScheduledJobs.ts @@ -1,17 +1,17 @@ import {Selectable} from 'kysely' import {SubscriptionChannel} from 'parabol-client/types/constEnums' -import getKysely from '../../../postgres/getKysely' -import {DB} from '../../../postgres/pg' import getRethink from '../../../database/rethinkDriver' import NotificationMeetingStageTimeLimitEnd from '../../../database/types/NotificationMeetingStageTimeLimitEnd' -import processTeamsLimitsJob from '../../../database/types/processTeamsLimitsJob' import ScheduledJobMeetingStageTimeLimit from '../../../database/types/ScheduledJobMetingStageTimeLimit' import ScheduledTeamLimitsJob from '../../../database/types/ScheduledTeamLimitsJob' +import processTeamsLimitsJob from '../../../database/types/processTeamsLimitsJob' +import getKysely from '../../../postgres/getKysely' +import {DB} from '../../../postgres/pg' +import {Logger} from '../../../utils/Logger' import publish from '../../../utils/publish' import {DataLoaderWorker} from '../../graphql' import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier' import {MutationResolvers} from '../resolverTypes' -import {Logger} from '../../../utils/Logger' const processMeetingStageTimeLimits = async ( job: ScheduledJobMeetingStageTimeLimit, diff --git a/packages/server/graphql/private/mutations/sendBatchNotificationEmails.ts b/packages/server/graphql/private/mutations/sendBatchNotificationEmails.ts index aa1dbe161b4..d320cd90028 100644 --- a/packages/server/graphql/private/mutations/sendBatchNotificationEmails.ts +++ b/packages/server/graphql/private/mutations/sendBatchNotificationEmails.ts @@ -3,9 +3,9 @@ import appOrigin from '../../../appOrigin' import getRethink from '../../../database/rethinkDriver' import {RValue} from '../../../database/stricterR' import AuthToken from '../../../database/types/AuthToken' +import ServerEnvironment from '../../../email/ServerEnvironment' import getMailManager from '../../../email/getMailManager' import notificationSummaryCreator from '../../../email/notificationSummaryCreator' -import ServerEnvironment from '../../../email/ServerEnvironment' import isValid from '../../isValid' import {MutationResolvers} from '../resolverTypes' diff --git a/packages/server/graphql/private/mutations/sendUpcomingInvoiceEmails.ts b/packages/server/graphql/private/mutations/sendUpcomingInvoiceEmails.ts index 4b4008eec0a..01642c464df 100644 --- a/packages/server/graphql/private/mutations/sendUpcomingInvoiceEmails.ts +++ b/packages/server/graphql/private/mutations/sendUpcomingInvoiceEmails.ts @@ -6,8 +6,8 @@ import {Threshold} from '../../../../client/types/constEnums' import appOrigin from '../../../appOrigin' import getRethink from '../../../database/rethinkDriver' import {RDatum, RValue} from '../../../database/stricterR' -import getMailManager from '../../../email/getMailManager' import UpcomingInvoiceEmailTemplate from '../../../email/UpcomingInvoiceEmailTemplate' +import getMailManager from '../../../email/getMailManager' import IUser from '../../../postgres/types/IUser' import {MutationResolvers} from '../resolverTypes' diff --git a/packages/server/graphql/private/mutations/stripeFailPayment.ts b/packages/server/graphql/private/mutations/stripeFailPayment.ts index d954385b8f9..64495a4b3b9 100644 --- a/packages/server/graphql/private/mutations/stripeFailPayment.ts +++ b/packages/server/graphql/private/mutations/stripeFailPayment.ts @@ -2,12 +2,12 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums' import Stripe from 'stripe' import terminateSubscription from '../../../billing/helpers/terminateSubscription' import getRethink from '../../../database/rethinkDriver' +import {RDatum} from '../../../database/stricterR' import NotificationPaymentRejected from '../../../database/types/NotificationPaymentRejected' import {isSuperUser} from '../../../utils/authorization' import publish from '../../../utils/publish' import {getStripeManager} from '../../../utils/stripe' import {MutationResolvers} from '../resolverTypes' -import {RDatum} from '../../../database/stricterR' export type StripeFailPaymentPayloadSource = | { diff --git a/packages/server/graphql/private/mutations/upgradeToTeamTier.ts b/packages/server/graphql/private/mutations/upgradeToTeamTier.ts index 704bd434896..d1abdb80e42 100644 --- a/packages/server/graphql/private/mutations/upgradeToTeamTier.ts +++ b/packages/server/graphql/private/mutations/upgradeToTeamTier.ts @@ -1,6 +1,7 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums' import removeTeamsLimitObjects from '../../../billing/helpers/removeTeamsLimitObjects' import getRethink from '../../../database/rethinkDriver' +import getKysely from '../../../postgres/getKysely' import {analytics} from '../../../utils/analytics/analytics' import {getUserId} from '../../../utils/authorization' import publish from '../../../utils/publish' @@ -11,7 +12,6 @@ import {getStripeManager} from '../../../utils/stripe' import getCCFromCustomer from '../../mutations/helpers/getCCFromCustomer' import hideConversionModal from '../../mutations/helpers/hideConversionModal' import {MutationResolvers} from '../resolverTypes' -import getKysely from '../../../postgres/getKysely' // included here to codegen has access to it export type UpgradeToTeamTierSuccessSource = { diff --git a/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts b/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts index ea12206cdd5..db1ea25044e 100644 --- a/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts +++ b/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts @@ -1,20 +1,20 @@ -import {getUserId} from '../../../utils/authorization' -import {MutationResolvers} from '../resolverTypes' -import getKysely from '../../../postgres/getKysely' -import standardError from '../../../utils/standardError' -import getRethink from '../../../database/rethinkDriver' -import getTeamsByIds from '../../../postgres/queries/getTeamsByIds' -import RedisLock from '../../../utils/RedisLock' -import insertNewTeamMember from '../../../safeMutations/insertNewTeamMember' -import addTeamIdToTMS from '../../../safeMutations/addTeamIdToTMS' -import adjustUserCount from '../../../billing/helpers/adjustUserCount' +import DomainJoinRequestId from 'parabol-client/shared/gqlIds/DomainJoinRequestId' import {InvoiceItemType, SubscriptionChannel} from 'parabol-client/types/constEnums' -import setUserTierForUserIds from '../../../utils/setUserTierForUserIds' -import publish from '../../../utils/publish' import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId' -import DomainJoinRequestId from 'parabol-client/shared/gqlIds/DomainJoinRequestId' +import adjustUserCount from '../../../billing/helpers/adjustUserCount' +import getRethink from '../../../database/rethinkDriver' +import getKysely from '../../../postgres/getKysely' +import getTeamsByIds from '../../../postgres/queries/getTeamsByIds' import {getUserById} from '../../../postgres/queries/getUsersByIds' +import addTeamIdToTMS from '../../../safeMutations/addTeamIdToTMS' +import insertNewTeamMember from '../../../safeMutations/insertNewTeamMember' import {Logger} from '../../../utils/Logger' +import RedisLock from '../../../utils/RedisLock' +import {getUserId} from '../../../utils/authorization' +import publish from '../../../utils/publish' +import setUserTierForUserIds from '../../../utils/setUserTierForUserIds' +import standardError from '../../../utils/standardError' +import {MutationResolvers} from '../resolverTypes' // TODO (EXPERIMENT: prompt-to-join-org): some parts are borrowed from acceptTeamInvitation, create generic functions const acceptRequestToJoinDomain: MutationResolvers['acceptRequestToJoinDomain'] = async ( diff --git a/packages/server/graphql/public/mutations/acceptTeamInvitation.ts b/packages/server/graphql/public/mutations/acceptTeamInvitation.ts index e80c7d63de5..34f06d3943d 100644 --- a/packages/server/graphql/public/mutations/acceptTeamInvitation.ts +++ b/packages/server/graphql/public/mutations/acceptTeamInvitation.ts @@ -6,11 +6,11 @@ import { } from '../../../../client/types/constEnums' import AuthToken from '../../../database/types/AuthToken' import acceptTeamInvitationSafe from '../../../safeMutations/acceptTeamInvitation' +import RedisLock from '../../../utils/RedisLock' import {analytics} from '../../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../../utils/authorization' import encodeAuthToken from '../../../utils/encodeAuthToken' import publish from '../../../utils/publish' -import RedisLock from '../../../utils/RedisLock' import activatePrevSlackAuth from '../../mutations/helpers/activatePrevSlackAuth' import handleInvitationToken from '../../mutations/helpers/handleInvitationToken' import {MutationResolvers} from '../resolverTypes' diff --git a/packages/server/graphql/public/mutations/addPokerTemplate.ts b/packages/server/graphql/public/mutations/addPokerTemplate.ts index 2141a7e5833..1da1a915a99 100644 --- a/packages/server/graphql/public/mutations/addPokerTemplate.ts +++ b/packages/server/graphql/public/mutations/addPokerTemplate.ts @@ -2,14 +2,14 @@ import {SprintPokerDefaults, SubscriptionChannel} from 'parabol-client/types/con import getRethink from '../../../database/rethinkDriver' import PokerTemplate from '../../../database/types/PokerTemplate' import TemplateDimension from '../../../database/types/TemplateDimension' +import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining' import insertMeetingTemplate from '../../../postgres/queries/insertMeetingTemplate' +import {analytics} from '../../../utils/analytics/analytics' import {getUserId, isTeamMember, isUserInOrg} from '../../../utils/authorization' import publish from '../../../utils/publish' import standardError from '../../../utils/standardError' import getTemplateIllustrationUrl from '../../mutations/helpers/getTemplateIllustrationUrl' -import {analytics} from '../../../utils/analytics/analytics' import {getFeatureTier} from '../../types/helpers/getFeatureTier' -import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining' import {MutationResolvers} from '../resolverTypes' const addPokerTemplate: MutationResolvers['addPokerTemplate'] = async ( diff --git a/packages/server/graphql/public/mutations/addReflectTemplate.ts b/packages/server/graphql/public/mutations/addReflectTemplate.ts index b2c5c7479a4..586a6e57f05 100644 --- a/packages/server/graphql/public/mutations/addReflectTemplate.ts +++ b/packages/server/graphql/public/mutations/addReflectTemplate.ts @@ -1,17 +1,17 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums' +import {PALETTE} from '../../../../client/styles/paletteV3' import getRethink from '../../../database/rethinkDriver' +import ReflectTemplate from '../../../database/types/ReflectTemplate' +import RetrospectivePrompt from '../../../database/types/RetrospectivePrompt' +import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining' import insertMeetingTemplate from '../../../postgres/queries/insertMeetingTemplate' +import {analytics} from '../../../utils/analytics/analytics' import {getUserId, isTeamMember, isUserInOrg} from '../../../utils/authorization' import publish from '../../../utils/publish' import standardError from '../../../utils/standardError' -import {analytics} from '../../../utils/analytics/analytics' +import makeRetroTemplates from '../../mutations/helpers/makeRetroTemplates' import {getFeatureTier} from '../../types/helpers/getFeatureTier' -import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining' import {MutationResolvers} from '../resolverTypes' -import ReflectTemplate from '../../../database/types/ReflectTemplate' -import {PALETTE} from '../../../../client/styles/paletteV3' -import makeRetroTemplates from '../../mutations/helpers/makeRetroTemplates' -import RetrospectivePrompt from '../../../database/types/RetrospectivePrompt' const addPokerTemplate: MutationResolvers['addPokerTemplate'] = async ( _source, diff --git a/packages/server/graphql/public/mutations/batchArchiveTasks.ts b/packages/server/graphql/public/mutations/batchArchiveTasks.ts index 26c622d1646..66345e4f2fc 100644 --- a/packages/server/graphql/public/mutations/batchArchiveTasks.ts +++ b/packages/server/graphql/public/mutations/batchArchiveTasks.ts @@ -3,10 +3,10 @@ import {getUserId} from '../../../utils/authorization' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import publish from '../../../utils/publish' -import {MutationResolvers} from '../resolverTypes' -import isValid from '../../isValid' -import archiveTasksForDB from '../../../safeMutations/archiveTasksForDB' import Task from '../../../database/types/Task' +import archiveTasksForDB from '../../../safeMutations/archiveTasksForDB' +import isValid from '../../isValid' +import {MutationResolvers} from '../resolverTypes' const batchArchiveTasks: MutationResolvers['batchArchiveTasks'] = async ( _source, diff --git a/packages/server/graphql/public/mutations/helpers/__tests__/getKudosUserIdsFromJson.test.ts b/packages/server/graphql/public/mutations/helpers/__tests__/getKudosUserIdsFromJson.test.ts index b7d0cb9bede..9bdff492939 100644 --- a/packages/server/graphql/public/mutations/helpers/__tests__/getKudosUserIdsFromJson.test.ts +++ b/packages/server/graphql/public/mutations/helpers/__tests__/getKudosUserIdsFromJson.test.ts @@ -1,5 +1,5 @@ -import {getKudosUserIdsFromJson} from '../getKudosUserIdsFromJson' import {JSONContent} from '@tiptap/core' +import {getKudosUserIdsFromJson} from '../getKudosUserIdsFromJson' describe('findMentionsByEmoji', () => { let doc: JSONContent diff --git a/packages/server/graphql/public/mutations/loginWithPassword.ts b/packages/server/graphql/public/mutations/loginWithPassword.ts index ad5096c868d..32fbd0e0332 100644 --- a/packages/server/graphql/public/mutations/loginWithPassword.ts +++ b/packages/server/graphql/public/mutations/loginWithPassword.ts @@ -1,7 +1,7 @@ import {AuthenticationError} from 'parabol-client/types/constEnums' import encodeAuthToken from '../../../utils/encodeAuthToken' -import {MutationResolvers} from '../resolverTypes' import attemptLogin from '../../mutations/helpers/attemptLogin' +import {MutationResolvers} from '../resolverTypes' const loginWithPassword: MutationResolvers['loginWithPassword'] = async ( _source, diff --git a/packages/server/graphql/public/mutations/modifyCheckInQuestion.ts b/packages/server/graphql/public/mutations/modifyCheckInQuestion.ts index 03072962dd2..18149f77431 100644 --- a/packages/server/graphql/public/mutations/modifyCheckInQuestion.ts +++ b/packages/server/graphql/public/mutations/modifyCheckInQuestion.ts @@ -3,11 +3,11 @@ import {getUserId, isTeamMember} from '../../../utils/authorization' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import publish from '../../../utils/publish' -import {MutationResolvers} from '../resolverTypes' import getRethink from '../../../database/rethinkDriver' -import standardError from '../../../utils/standardError' import OpenAIServerManager from '../../../utils/OpenAIServerManager' import {analytics} from '../../../utils/analytics/analytics' +import standardError from '../../../utils/standardError' +import {MutationResolvers} from '../resolverTypes' const modifyCheckInQuestion: MutationResolvers['modifyCheckInQuestion'] = async ( _source, diff --git a/packages/server/graphql/public/mutations/requestToJoinDomain.ts b/packages/server/graphql/public/mutations/requestToJoinDomain.ts index 0dcd6150fe8..cbcfd9cd095 100644 --- a/packages/server/graphql/public/mutations/requestToJoinDomain.ts +++ b/packages/server/graphql/public/mutations/requestToJoinDomain.ts @@ -1,14 +1,14 @@ import ms from 'ms' -import {getUserId} from '../../../utils/authorization' -import {MutationResolvers} from '../resolverTypes' -import getKysely from '../../../postgres/getKysely' -import {getEligibleOrgIdsByDomain} from '../../../utils/isRequestToJoinDomainAllowed' -import getTeamIdsByOrgIds from '../../../postgres/queries/getTeamIdsByOrgIds' import getRethink from '../../../database/rethinkDriver' import NotificationRequestToJoinOrg from '../../../database/types/NotificationRequestToJoinOrg' -import publishNotification from './helpers/publishNotification' +import getKysely from '../../../postgres/getKysely' +import getTeamIdsByOrgIds from '../../../postgres/queries/getTeamIdsByOrgIds' +import {getUserId} from '../../../utils/authorization' import getDomainFromEmail from '../../../utils/getDomainFromEmail' +import {getEligibleOrgIdsByDomain} from '../../../utils/isRequestToJoinDomainAllowed' import standardError from '../../../utils/standardError' +import {MutationResolvers} from '../resolverTypes' +import publishNotification from './helpers/publishNotification' const REQUEST_EXPIRATION_DAYS = 30 diff --git a/packages/server/graphql/public/mutations/revealTeamHealthVotes.ts b/packages/server/graphql/public/mutations/revealTeamHealthVotes.ts index d444d4cdf4d..f87cb915ba3 100644 --- a/packages/server/graphql/public/mutations/revealTeamHealthVotes.ts +++ b/packages/server/graphql/public/mutations/revealTeamHealthVotes.ts @@ -1,9 +1,9 @@ -import {MutationResolvers} from '../resolverTypes' +import {SubscriptionChannel} from 'parabol-client/types/constEnums' +import updateStage from '../../../database/updateStage' import {getUserId, isTeamMember} from '../../../utils/authorization' import getPhase from '../../../utils/getPhase' import publish from '../../../utils/publish' -import {SubscriptionChannel} from 'parabol-client/types/constEnums' -import updateStage from '../../../database/updateStage' +import {MutationResolvers} from '../resolverTypes' const revealTeamHealthVotes: MutationResolvers['revealTeamHealthVotes'] = async ( _source, diff --git a/packages/server/graphql/public/mutations/setOrgUserRole.ts b/packages/server/graphql/public/mutations/setOrgUserRole.ts index 61f605cb442..404eafc82e9 100644 --- a/packages/server/graphql/public/mutations/setOrgUserRole.ts +++ b/packages/server/graphql/public/mutations/setOrgUserRole.ts @@ -1,12 +1,12 @@ -import {MutationResolvers} from '../resolverTypes' import {SubscriptionChannel} from 'parabol-client/types/constEnums' import getRethink from '../../../database/rethinkDriver' +import {RDatum} from '../../../database/stricterR' import NotificationPromoteToBillingLeader from '../../../database/types/NotificationPromoteToBillingLeader' import {analytics} from '../../../utils/analytics/analytics' import {getUserId, isSuperUser, isUserBillingLeader} from '../../../utils/authorization' import publish from '../../../utils/publish' import standardError from '../../../utils/standardError' -import {RDatum} from '../../../database/stricterR' +import {MutationResolvers} from '../resolverTypes' const addNotifications = async (orgId: string, userId: string) => { const r = await getRethink() diff --git a/packages/server/graphql/public/mutations/setTeamHealthVote.ts b/packages/server/graphql/public/mutations/setTeamHealthVote.ts index 896ed0b45e1..bdd323875e9 100644 --- a/packages/server/graphql/public/mutations/setTeamHealthVote.ts +++ b/packages/server/graphql/public/mutations/setTeamHealthVote.ts @@ -1,12 +1,12 @@ -import {MutationResolvers} from '../resolverTypes' -import {getUserId, isTeamMember} from '../../../utils/authorization' +import {SubscriptionChannel} from 'parabol-client/types/constEnums' import getRethink from '../../../database/rethinkDriver' +import {RValue} from '../../../database/stricterR' +import TeamHealthVote from '../../../database/types/TeamHealthVote' +import updateStage from '../../../database/updateStage' +import {getUserId, isTeamMember} from '../../../utils/authorization' import getPhase from '../../../utils/getPhase' import publish from '../../../utils/publish' -import {SubscriptionChannel} from 'parabol-client/types/constEnums' -import updateStage from '../../../database/updateStage' -import TeamHealthVote from '../../../database/types/TeamHealthVote' -import {RValue} from '../../../database/stricterR' +import {MutationResolvers} from '../resolverTypes' const upsertVote = async (meetingId: string, stageId: string, newVote: TeamHealthVote) => { const r = await getRethink() diff --git a/packages/server/graphql/public/mutations/shareTopic.ts b/packages/server/graphql/public/mutations/shareTopic.ts index ce7929ff67a..f8ab1e3f4c5 100644 --- a/packages/server/graphql/public/mutations/shareTopic.ts +++ b/packages/server/graphql/public/mutations/shareTopic.ts @@ -1,9 +1,9 @@ +import DiscussStage from '../../../database/types/DiscussStage' import {getUserId, isTeamMember} from '../../../utils/authorization' +import getPhase from '../../../utils/getPhase' import standardError from '../../../utils/standardError' import {SlackNotifier} from '../../mutations/helpers/notifications/SlackNotifier' import {MutationResolvers} from '../resolverTypes' -import DiscussStage from '../../../database/types/DiscussStage' -import getPhase from '../../../utils/getPhase' const shareTopic: MutationResolvers['shareTopic'] = async ( _source, diff --git a/packages/server/graphql/public/mutations/signUpWithPassword.ts b/packages/server/graphql/public/mutations/signUpWithPassword.ts index 0bb1ae2ddd6..fa7486a05f0 100644 --- a/packages/server/graphql/public/mutations/signUpWithPassword.ts +++ b/packages/server/graphql/public/mutations/signUpWithPassword.ts @@ -1,5 +1,6 @@ import bcrypt from 'bcryptjs' import {AuthenticationError, Security} from 'parabol-client/types/constEnums' +import {URLSearchParams} from 'url' import getRethink from '../../../database/rethinkDriver' import {RValue} from '../../../database/stricterR' import createEmailVerification from '../../../email/createEmailVerification' @@ -10,7 +11,6 @@ import isEmailVerificationRequired from '../../../utils/isEmailVerificationRequi import attemptLogin from '../../mutations/helpers/attemptLogin' import bootstrapNewUser from '../../mutations/helpers/bootstrapNewUser' import {MutationResolvers} from '../resolverTypes' -import {URLSearchParams} from 'url' const signUpWithPassword: MutationResolvers['signUpWithPassword'] = async ( _source, diff --git a/packages/server/graphql/public/mutations/startRetrospective.ts b/packages/server/graphql/public/mutations/startRetrospective.ts index 266664368c1..cc240ec1fb4 100644 --- a/packages/server/graphql/public/mutations/startRetrospective.ts +++ b/packages/server/graphql/public/mutations/startRetrospective.ts @@ -2,6 +2,7 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums' import getRethink from '../../../database/rethinkDriver' import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective' import RetroMeetingMember from '../../../database/types/RetroMeetingMember' +import getKysely from '../../../postgres/getKysely' import updateMeetingTemplateLastUsedAt from '../../../postgres/queries/updateMeetingTemplateLastUsedAt' import updateTeamByTeamId from '../../../postgres/queries/updateTeamByTeamId' import {MeetingTypeEnum} from '../../../postgres/types/Meeting' @@ -9,14 +10,13 @@ import {analytics} from '../../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../../utils/authorization' import publish from '../../../utils/publish' import standardError from '../../../utils/standardError' -import {MutationResolvers} from '../resolverTypes' import createGcalEvent from '../../mutations/helpers/createGcalEvent' +import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle' import isStartMeetingLocked from '../../mutations/helpers/isStartMeetingLocked' import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier' -import {startNewMeetingSeries} from './updateRecurrenceSettings' import safeCreateRetrospective from '../../mutations/helpers/safeCreateRetrospective' -import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle' -import getKysely from '../../../postgres/getKysely' +import {MutationResolvers} from '../resolverTypes' +import {startNewMeetingSeries} from './updateRecurrenceSettings' const startRetrospective: MutationResolvers['startRetrospective'] = async ( _source, diff --git a/packages/server/graphql/public/mutations/startTeamPrompt.ts b/packages/server/graphql/public/mutations/startTeamPrompt.ts index d1c657ac421..75dcd21b975 100644 --- a/packages/server/graphql/public/mutations/startTeamPrompt.ts +++ b/packages/server/graphql/public/mutations/startTeamPrompt.ts @@ -1,18 +1,18 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums' import getRethink from '../../../database/rethinkDriver' import updateTeamByTeamId from '../../../postgres/queries/updateTeamByTeamId' +import RedisLockQueue from '../../../utils/RedisLockQueue' import {analytics} from '../../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../../utils/authorization' import publish from '../../../utils/publish' -import RedisLockQueue from '../../../utils/RedisLockQueue' import standardError from '../../../utils/standardError' +import createGcalEvent from '../../mutations/helpers/createGcalEvent' +import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle' import isStartMeetingLocked from '../../mutations/helpers/isStartMeetingLocked' import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier' import safeCreateTeamPrompt from '../../mutations/helpers/safeCreateTeamPrompt' import {MutationResolvers} from '../resolverTypes' import {startNewMeetingSeries} from './updateRecurrenceSettings' -import createGcalEvent from '../../mutations/helpers/createGcalEvent' -import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle' const MEETING_START_DELAY_MS = 3000 diff --git a/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts b/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts index 88ca97eb167..63540c4507b 100644 --- a/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts +++ b/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts @@ -1,8 +1,8 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums' import MeetingPoker from '../../../database/types/MeetingPoker' import upsertGitLabDimensionFieldMap from '../../../postgres/queries/upsertGitLabDimensionFieldMap' -import {isTeamMember} from '../../../utils/authorization' import {Logger} from '../../../utils/Logger' +import {isTeamMember} from '../../../utils/authorization' import publish from '../../../utils/publish' import {MutationResolvers} from '../resolverTypes' import {getUserId} from './../../../utils/authorization' diff --git a/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts b/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts index daee90b7d61..bbcc52b08ad 100644 --- a/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts +++ b/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts @@ -1,18 +1,18 @@ +import {getJSDateFromRRuleDate, getRRuleDateFromJSDate} from 'parabol-client/shared/rruleUtil' import {SubscriptionChannel} from 'parabol-client/types/constEnums' -import {getRRuleDateFromJSDate, getJSDateFromRRuleDate} from 'parabol-client/shared/rruleUtil' import {RRule} from 'rrule' import getRethink from '../../../database/rethinkDriver' import {insertMeetingSeries as insertMeetingSeriesQuery} from '../../../postgres/queries/insertMeetingSeries' import restartMeetingSeries from '../../../postgres/queries/restartMeetingSeries' import updateMeetingSeriesQuery from '../../../postgres/queries/updateMeetingSeries' +import {MeetingTypeEnum} from '../../../postgres/types/Meeting' import {MeetingSeries} from '../../../postgres/types/MeetingSeries' import {analytics} from '../../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../../utils/authorization' import publish from '../../../utils/publish' import standardError from '../../../utils/standardError' -import {MutationResolvers} from '../resolverTypes' -import {MeetingTypeEnum} from '../../../postgres/types/Meeting' import {updateGcalSeries} from '../../mutations/helpers/createGcalEvent' +import {MutationResolvers} from '../resolverTypes' export const startNewMeetingSeries = async ( meeting: { diff --git a/packages/server/graphql/public/mutations/updateTemplateCategory.ts b/packages/server/graphql/public/mutations/updateTemplateCategory.ts index 384a88d0b64..1601d0d7d67 100644 --- a/packages/server/graphql/public/mutations/updateTemplateCategory.ts +++ b/packages/server/graphql/public/mutations/updateTemplateCategory.ts @@ -1,8 +1,8 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums' +import {CategoryID, MAIN_CATEGORIES} from '../../../../client/components/ActivityLibrary/Categories' import getKysely from '../../../postgres/getKysely' import publish from '../../../utils/publish' import {MutationResolvers} from '../resolverTypes' -import {CategoryID, MAIN_CATEGORIES} from '../../../../client/components/ActivityLibrary/Categories' const updateTemplateCategory: MutationResolvers['updateTemplateCategory'] = async ( _source, diff --git a/packages/server/graphql/public/mutations/upsertTeamPromptResponse.ts b/packages/server/graphql/public/mutations/upsertTeamPromptResponse.ts index 2a242bc8b1e..131fe934498 100644 --- a/packages/server/graphql/public/mutations/upsertTeamPromptResponse.ts +++ b/packages/server/graphql/public/mutations/upsertTeamPromptResponse.ts @@ -2,18 +2,18 @@ import {generateText, JSONContent} from '@tiptap/core' import {createEditorExtensions} from 'parabol-client/components/promptResponse/tiptapConfig' import TeamPromptResponseId from 'parabol-client/shared/gqlIds/TeamPromptResponseId' import {SubscriptionChannel} from 'parabol-client/types/constEnums' +import getKysely from '../../../postgres/getKysely' import {TeamPromptResponse} from '../../../postgres/queries/getTeamPromptResponsesByIds' import {upsertTeamPromptResponse as upsertTeamPromptResponseQuery} from '../../../postgres/queries/upsertTeamPromptResponses' import {analytics} from '../../../utils/analytics/analytics' import {getUserId, isTeamMember} from '../../../utils/authorization' import publish from '../../../utils/publish' import standardError from '../../../utils/standardError' +import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier' import {MutationResolvers} from '../resolverTypes' +import {getKudosUserIdsFromJson} from './helpers/getKudosUserIdsFromJson' import publishNotification from './helpers/publishNotification' import createTeamPromptMentionNotifications from './helpers/publishTeamPromptMentions' -import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier' -import {getKudosUserIdsFromJson} from './helpers/getKudosUserIdsFromJson' -import getKysely from '../../../postgres/getKysely' const upsertTeamPromptResponse: MutationResolvers['upsertTeamPromptResponse'] = async ( _source, diff --git a/packages/server/graphql/public/types/AddReactjiToReactableSuccess.ts b/packages/server/graphql/public/types/AddReactjiToReactableSuccess.ts index 3b9b61ac5a6..92627987433 100644 --- a/packages/server/graphql/public/types/AddReactjiToReactableSuccess.ts +++ b/packages/server/graphql/public/types/AddReactjiToReactableSuccess.ts @@ -1,5 +1,5 @@ -import {ReactableEnumType} from '../../types/ReactableEnum' import {AddReactjiToReactableSuccessResolvers} from '../../public/resolverTypes' +import {ReactableEnumType} from '../../types/ReactableEnum' export type AddReactjiToReactableSuccessSource = { reactableId: string diff --git a/packages/server/graphql/public/types/CreateGcalEventInput.ts b/packages/server/graphql/public/types/CreateGcalEventInput.ts index 2c94760f20b..49172372bd2 100644 --- a/packages/server/graphql/public/types/CreateGcalEventInput.ts +++ b/packages/server/graphql/public/types/CreateGcalEventInput.ts @@ -1,9 +1,9 @@ import { GraphQLInputObjectType, - GraphQLNonNull, - GraphQLString, GraphQLInt, - GraphQLList + GraphQLList, + GraphQLNonNull, + GraphQLString } from 'graphql' import GcalVideoTypeEnum from '../../types/GcalVideoTypeEnum' import GraphQLEmailType from '../../types/GraphQLEmailType' diff --git a/packages/server/graphql/public/types/DomainJoinRequest.ts b/packages/server/graphql/public/types/DomainJoinRequest.ts index ff1747017cc..ffe93556170 100644 --- a/packages/server/graphql/public/types/DomainJoinRequest.ts +++ b/packages/server/graphql/public/types/DomainJoinRequest.ts @@ -1,9 +1,9 @@ -import {DomainJoinRequestResolvers} from '../resolverTypes' -import {getUserId} from '../../../utils/authorization' import DomainJoinRequestId from 'parabol-client/shared/gqlIds/DomainJoinRequestId' -import {GQLContext} from '../../graphql' import getRethink from '../../../database/rethinkDriver' +import {getUserId} from '../../../utils/authorization' +import {GQLContext} from '../../graphql' import isValid from '../../isValid' +import {DomainJoinRequestResolvers} from '../resolverTypes' const DomainJoinRequest: DomainJoinRequestResolvers = { id: ({id}) => { diff --git a/packages/server/graphql/public/types/GcalIntegration.ts b/packages/server/graphql/public/types/GcalIntegration.ts index 767554460de..1b97feff85c 100644 --- a/packages/server/graphql/public/types/GcalIntegration.ts +++ b/packages/server/graphql/public/types/GcalIntegration.ts @@ -1,6 +1,6 @@ import {google} from 'googleapis' -import {GcalIntegrationResolvers} from '../resolverTypes' import appOrigin from '../../../appOrigin' +import {GcalIntegrationResolvers} from '../resolverTypes' export type GcalIntegrationSource = { teamId: string diff --git a/packages/server/graphql/public/types/NotifyRequestToJoinOrg.ts b/packages/server/graphql/public/types/NotifyRequestToJoinOrg.ts index 8df3020ace9..935795650b7 100644 --- a/packages/server/graphql/public/types/NotifyRequestToJoinOrg.ts +++ b/packages/server/graphql/public/types/NotifyRequestToJoinOrg.ts @@ -1,5 +1,5 @@ -import {NotifyRequestToJoinOrgResolvers} from '../resolverTypes' import DomainJoinRequestId from 'parabol-client/shared/gqlIds/DomainJoinRequestId' +import {NotifyRequestToJoinOrgResolvers} from '../resolverTypes' const NotifyRequestToJoinOrg: NotifyRequestToJoinOrgResolvers = { __isTypeOf: ({type}) => type === 'REQUEST_TO_JOIN_ORG', diff --git a/packages/server/graphql/public/types/Organization.ts b/packages/server/graphql/public/types/Organization.ts index b1164b14f7e..5089fd86dd5 100644 --- a/packages/server/graphql/public/types/Organization.ts +++ b/packages/server/graphql/public/types/Organization.ts @@ -1,6 +1,6 @@ import {isSuperUser} from '../../../utils/authorization' -import {OrganizationResolvers} from '../resolverTypes' import {getFeatureTier} from '../../types/helpers/getFeatureTier' +import {OrganizationResolvers} from '../resolverTypes' const Organization: OrganizationResolvers = { approvedDomains: async ({id: orgId}, _args, {dataLoader}) => { diff --git a/packages/server/graphql/public/types/ResetReflectionGroupsSuccess.ts b/packages/server/graphql/public/types/ResetReflectionGroupsSuccess.ts index 2679a89ecd9..e15430efc9d 100644 --- a/packages/server/graphql/public/types/ResetReflectionGroupsSuccess.ts +++ b/packages/server/graphql/public/types/ResetReflectionGroupsSuccess.ts @@ -1,5 +1,5 @@ -import {ResetReflectionGroupsSuccessResolvers} from '../resolverTypes' import MeetingRetrospective from '../../../database/types/MeetingRetrospective' +import {ResetReflectionGroupsSuccessResolvers} from '../resolverTypes' export type ResetReflectionGroupsSuccessSource = { meetingId: string diff --git a/packages/server/graphql/public/types/RetrospectiveMeeting.ts b/packages/server/graphql/public/types/RetrospectiveMeeting.ts index b259c84409d..a4ad2df6f03 100644 --- a/packages/server/graphql/public/types/RetrospectiveMeeting.ts +++ b/packages/server/graphql/public/types/RetrospectiveMeeting.ts @@ -1,4 +1,5 @@ import toTeamMemberId from '../../../../client/utils/relay/toTeamMemberId' +import ReflectionGroupType from '../../../database/types/ReflectionGroup' import RetroMeetingMember from '../../../database/types/RetroMeetingMember' import {getUserId} from '../../../utils/authorization' import filterTasksByMeeting from '../../../utils/filterTasksByMeeting' @@ -6,7 +7,6 @@ import getPhase from '../../../utils/getPhase' import {GQLContext} from '../../graphql' import {resolveForSU} from '../../resolvers' import {RetrospectiveMeetingResolvers} from '../resolverTypes' -import ReflectionGroupType from '../../../database/types/ReflectionGroup' const RetrospectiveMeeting: RetrospectiveMeetingResolvers = { autoGroupThreshold: resolveForSU('autoGroupThreshold'), diff --git a/packages/server/graphql/public/types/SetOrgUserRoleSuccess.ts b/packages/server/graphql/public/types/SetOrgUserRoleSuccess.ts index a85a29d033d..53169f52620 100644 --- a/packages/server/graphql/public/types/SetOrgUserRoleSuccess.ts +++ b/packages/server/graphql/public/types/SetOrgUserRoleSuccess.ts @@ -1,6 +1,6 @@ -import {SetOrgUserRoleSuccessResolvers} from '../resolverTypes' import {getUserId} from '../../../utils/authorization' import errorFilter from '../../errorFilter' +import {SetOrgUserRoleSuccessResolvers} from '../resolverTypes' export type SetOrgUserRoleSuccessSource = { orgId: string diff --git a/packages/server/graphql/public/types/Team.ts b/packages/server/graphql/public/types/Team.ts index dc48f0d36d6..1e27132dda9 100644 --- a/packages/server/graphql/public/types/Team.ts +++ b/packages/server/graphql/public/types/Team.ts @@ -1,8 +1,8 @@ -import {TeamResolvers} from '../resolverTypes' import TeamInsightsId from 'parabol-client/shared/gqlIds/TeamInsightsId' import toTeamMemberId from '../../../../client/utils/relay/toTeamMemberId' import {getUserId, isTeamMember} from '../../../utils/authorization' import {getFeatureTier} from '../../types/helpers/getFeatureTier' +import {TeamResolvers} from '../resolverTypes' const Team: TeamResolvers = { insights: async ( diff --git a/packages/server/graphql/public/types/TeamHealthPhase.ts b/packages/server/graphql/public/types/TeamHealthPhase.ts index 88b98e00852..f0592eefc29 100644 --- a/packages/server/graphql/public/types/TeamHealthPhase.ts +++ b/packages/server/graphql/public/types/TeamHealthPhase.ts @@ -1,5 +1,5 @@ -import {TeamHealthPhaseResolvers} from '../resolverTypes' import TeamHealthPhaseDB from '../../../database/types/TeamHealthPhase' +import {TeamHealthPhaseResolvers} from '../resolverTypes' export type TeamHealthPhaseSource = TeamHealthPhaseDB & { meetingId: string diff --git a/packages/server/graphql/public/types/TeamHealthStage.ts b/packages/server/graphql/public/types/TeamHealthStage.ts index f98202ae131..87ec98c008f 100644 --- a/packages/server/graphql/public/types/TeamHealthStage.ts +++ b/packages/server/graphql/public/types/TeamHealthStage.ts @@ -1,8 +1,8 @@ -import {TeamHealthStageResolvers} from '../resolverTypes' -import {getUserId} from '../../../utils/authorization' import TeamHealthStageDB from '../../../database/types/TeamHealthStage' -import isValid from '../../isValid' import {Logger} from '../../../utils/Logger' +import {getUserId} from '../../../utils/authorization' +import isValid from '../../isValid' +import {TeamHealthStageResolvers} from '../resolverTypes' export type TeamHealthStageSource = TeamHealthStageDB & { meetingId: string diff --git a/packages/server/graphql/public/types/TeamPromptMeeting.ts b/packages/server/graphql/public/types/TeamPromptMeeting.ts index 4b25a52749f..7ed7800f420 100644 --- a/packages/server/graphql/public/types/TeamPromptMeeting.ts +++ b/packages/server/graphql/public/types/TeamPromptMeeting.ts @@ -1,9 +1,9 @@ -import {TeamPromptMeetingResolvers} from '../resolverTypes' import getRethink from '../../../database/rethinkDriver' +import {RValue} from '../../../database/stricterR' import MeetingTeamPrompt from '../../../database/types/MeetingTeamPrompt' import {getUserId} from '../../../utils/authorization' import filterTasksByMeeting from '../../../utils/filterTasksByMeeting' -import {RValue} from '../../../database/stricterR' +import {TeamPromptMeetingResolvers} from '../resolverTypes' const TeamPromptMeeting: TeamPromptMeetingResolvers = { prevMeeting: async ({meetingSeriesId, createdAt}, _args, {dataLoader}) => { diff --git a/packages/server/graphql/public/types/TopRetroTemplate.ts b/packages/server/graphql/public/types/TopRetroTemplate.ts index d799679b4f8..4892a09bde5 100644 --- a/packages/server/graphql/public/types/TopRetroTemplate.ts +++ b/packages/server/graphql/public/types/TopRetroTemplate.ts @@ -1,6 +1,6 @@ -import {TopRetroTemplateResolvers} from '../resolverTypes' import TopRetroTemplateId from 'parabol-client/shared/gqlIds/TopRetroTemplateId' import ReflectTemplate from '../../../database/types/ReflectTemplate' +import {TopRetroTemplateResolvers} from '../resolverTypes' export type TopRetroTemplateSource = { teamId: string diff --git a/packages/server/graphql/public/types/UpsertTeamPromptResponseSuccess.ts b/packages/server/graphql/public/types/UpsertTeamPromptResponseSuccess.ts index 283b97c5e18..425879111b9 100644 --- a/packages/server/graphql/public/types/UpsertTeamPromptResponseSuccess.ts +++ b/packages/server/graphql/public/types/UpsertTeamPromptResponseSuccess.ts @@ -1,5 +1,5 @@ -import {UpsertTeamPromptResponseSuccessResolvers} from '../resolverTypes' import isValid from '../../../graphql/isValid' +import {UpsertTeamPromptResponseSuccessResolvers} from '../resolverTypes' export type UpsertTeamPromptResponseSuccessSource = { teamPromptResponseId: string diff --git a/packages/server/graphql/public/types/User.ts b/packages/server/graphql/public/types/User.ts index f46afe30511..7570e7b9f8c 100644 --- a/packages/server/graphql/public/types/User.ts +++ b/packages/server/graphql/public/types/User.ts @@ -15,14 +15,14 @@ import { isUserBillingLeader } from '../../../utils/authorization' import getDomainFromEmail from '../../../utils/getDomainFromEmail' +import {getSSOMetadataFromURL} from '../../../utils/getSSOMetadataFromURL' import sendToSentry from '../../../utils/sendToSentry' import standardError from '../../../utils/standardError' import {getStripeManager} from '../../../utils/stripe' import connectionFromTemplateArray from '../../queries/helpers/connectionFromTemplateArray' +import {getFeatureTier} from '../../types/helpers/getFeatureTier' import getSignOnURL from '../mutations/helpers/SAMLHelpers/getSignOnURL' import {UserResolvers} from '../resolverTypes' -import {getSSOMetadataFromURL} from '../../../utils/getSSOMetadataFromURL' -import {getFeatureTier} from '../../types/helpers/getFeatureTier' declare const __PRODUCTION__: string diff --git a/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts b/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts index efd0cf91dca..0108e303221 100644 --- a/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts +++ b/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts @@ -1,6 +1,6 @@ +import {Threshold} from '~/types/constEnums' import getRethink from '../../../../database/rethinkDriver' import {RDatum, RValue} from '../../../../database/stricterR' -import {Threshold} from '~/types/constEnums' // Uncomment for easier testing //import { ThresholdTest as Threshold } from "~/types/constEnums"; diff --git a/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts b/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts index 14b951248c0..573608d7b1b 100644 --- a/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts +++ b/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts @@ -1,10 +1,10 @@ import {GraphQLResolveInfo} from 'graphql' import {GetRepositoriesQuery} from '../../../types/githubTypes' +import {Logger} from '../../../utils/Logger' import getGitHubRequest from '../../../utils/getGitHubRequest' import getRepositories from '../../../utils/githubQueries/getRepositories.graphql' import {DataLoaderWorker} from '../../graphql' import {GQLContext} from './../../graphql' -import {Logger} from '../../../utils/Logger' export interface GitHubRepo { id: string diff --git a/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts b/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts index 72da38eddb3..fe5e17d5a0d 100644 --- a/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts +++ b/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts @@ -1,8 +1,8 @@ import {GraphQLResolveInfo} from 'graphql' import {isNotNull} from 'parabol-client/utils/predicates' import GitLabServerManager from '../../../integrations/gitlab/GitLabServerManager' -import {GQLContext} from '../../graphql' import {Logger} from '../../../utils/Logger' +import {GQLContext} from '../../graphql' const fetchGitLabProjects = async ( teamId: string, diff --git a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts index 55c0051c6f1..84bff7ba4a3 100644 --- a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts +++ b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts @@ -1,11 +1,11 @@ import dayjs from 'dayjs' import Stripe from 'stripe' +import Invoice from '../../../database/types/Invoice' +import Organization from '../../../database/types/Organization' import {fromEpochSeconds} from '../../../utils/epochTime' import getUpcomingInvoiceId from '../../../utils/getUpcomingInvoiceId' import {getStripeManager} from '../../../utils/stripe' import StripeManager from '../../../utils/stripe/StripeManager' -import Invoice from '../../../database/types/Invoice' -import Organization from '../../../database/types/Organization' export default async function makeUpcomingInvoice( org: Organization, diff --git a/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts b/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts index 4924d2459ce..a1abb0db8f9 100644 --- a/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts +++ b/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts @@ -1,8 +1,8 @@ import getRethink from '../../../database/rethinkDriver' import MeetingSettingsPoker from '../../../database/types/MeetingSettingsPoker' import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective' -import {GQLContext} from '../../graphql' import {getUserId} from '../../../utils/authorization' +import {GQLContext} from '../../graphql' import isValid from '../../isValid' import {getFeatureTier} from '../../types/helpers/getFeatureTier' diff --git a/packages/server/graphql/rootMutation.ts b/packages/server/graphql/rootMutation.ts index fe3ff00f0cf..608dad1c1ec 100644 --- a/packages/server/graphql/rootMutation.ts +++ b/packages/server/graphql/rootMutation.ts @@ -74,9 +74,9 @@ import removePokerTemplate from './mutations/removePokerTemplate' import removePokerTemplateDimension from './mutations/removePokerTemplateDimension' import removePokerTemplateScale from './mutations/removePokerTemplateScale' import removePokerTemplateScaleValue from './mutations/removePokerTemplateScaleValue' -import removeReflection from './mutations/removeReflection' import removeReflectTemplate from './mutations/removeReflectTemplate' import removeReflectTemplatePrompt from './mutations/removeReflectTemplatePrompt' +import removeReflection from './mutations/removeReflection' import removeSlackAuth from './mutations/removeSlackAuth' import removeTeamMember from './mutations/removeTeamMember' import removeTeamMemberIntegrationAuth from './mutations/removeTeamMemberIntegrationAuth' diff --git a/packages/server/graphql/rootTypes.ts b/packages/server/graphql/rootTypes.ts index 823f80ef4a6..b676deb4ce1 100644 --- a/packages/server/graphql/rootTypes.ts +++ b/packages/server/graphql/rootTypes.ts @@ -2,8 +2,8 @@ import ActionMeetingMember from './types/ActionMeetingMember' import ActionMeetingSettings from './types/ActionMeetingSettings' import AgendaItemsPhase from './types/AgendaItemsPhase' import AuthIdentityGoogle from './types/AuthIdentityGoogle' -import AuthIdentityMicrosoft from './types/AuthIdentityMicrosoft' import AuthIdentityLocal from './types/AuthIdentityLocal' +import AuthIdentityMicrosoft from './types/AuthIdentityMicrosoft' import AzureDevOpsWorkItem from './types/AzureDevOpsWorkItem' import CheckInPhase from './types/CheckInPhase' import Comment from './types/Comment' diff --git a/packages/server/graphql/traceGraphQL.ts b/packages/server/graphql/traceGraphQL.ts index c59a4b80d51..01eb2a4a138 100644 --- a/packages/server/graphql/traceGraphQL.ts +++ b/packages/server/graphql/traceGraphQL.ts @@ -11,10 +11,10 @@ import { GraphQLNamedType, GraphQLResolveInfo, GraphQLSchema, - isObjectType, - OperationDefinitionNode + OperationDefinitionNode, + isObjectType } from 'graphql' -import {CompiledQuery, compileQuery, CompilerOptions, isCompiledQuery} from 'graphql-jit' +import {CompiledQuery, CompilerOptions, compileQuery, isCompiledQuery} from 'graphql-jit' import {Path} from 'graphql/jsutils/Path' interface ExecutionArgs { diff --git a/packages/server/graphql/types/AddIntegrationProviderPayload.ts b/packages/server/graphql/types/AddIntegrationProviderPayload.ts index ea7bfe15246..76112c4a678 100644 --- a/packages/server/graphql/types/AddIntegrationProviderPayload.ts +++ b/packages/server/graphql/types/AddIntegrationProviderPayload.ts @@ -1,8 +1,8 @@ import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' import IntegrationProvider from './IntegrationProvider' -import makeMutationPayload from './makeMutationPayload' import Team from './Team' +import makeMutationPayload from './makeMutationPayload' export const AddIntegrationProviderSuccess = new GraphQLObjectType({ name: 'AddIntegrationProviderSuccess', diff --git a/packages/server/graphql/types/AddReactjiToReflectionPayload.ts b/packages/server/graphql/types/AddReactjiToReflectionPayload.ts index a25e801ea09..b80d82f2b28 100644 --- a/packages/server/graphql/types/AddReactjiToReflectionPayload.ts +++ b/packages/server/graphql/types/AddReactjiToReflectionPayload.ts @@ -1,7 +1,7 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import RetroReflection from './RetroReflection' +import makeMutationPayload from './makeMutationPayload' export const AddReactjiToReflectionSuccess = new GraphQLObjectType({ name: 'AddReactjiToReflectionSuccess', diff --git a/packages/server/graphql/types/AddTeamMemberIntegrationAuthPayload.ts b/packages/server/graphql/types/AddTeamMemberIntegrationAuthPayload.ts index 3632cc2f228..49055213f36 100644 --- a/packages/server/graphql/types/AddTeamMemberIntegrationAuthPayload.ts +++ b/packages/server/graphql/types/AddTeamMemberIntegrationAuthPayload.ts @@ -2,10 +2,10 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import toTeamMemberId from '../../../client/utils/relay/toTeamMemberId' import {GQLContext} from '../graphql' import IntegrationProviderServiceEnum from './IntegrationProviderServiceEnum' -import makeMutationPayload from './makeMutationPayload' import TeamMember from './TeamMember' import TeamMemberIntegrationAuth from './TeamMemberIntegrationAuth' import User from './User' +import makeMutationPayload from './makeMutationPayload' export const AddTeamMemberIntegrationAuthSuccess = new GraphQLObjectType({ name: 'AddTeamMemberIntegrationAuthSuccess', diff --git a/packages/server/graphql/types/ArchiveTimelineEventPayload.ts b/packages/server/graphql/types/ArchiveTimelineEventPayload.ts index 72e547dcfcb..ba1d1714e54 100644 --- a/packages/server/graphql/types/ArchiveTimelineEventPayload.ts +++ b/packages/server/graphql/types/ArchiveTimelineEventPayload.ts @@ -1,7 +1,7 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import TimelineEvent from './TimelineEvent' +import makeMutationPayload from './makeMutationPayload' export const ArchiveTimelineEventSuccess = new GraphQLObjectType({ name: 'ArchiveTimelineEventSuccess', diff --git a/packages/server/graphql/types/AuthIdentity.ts b/packages/server/graphql/types/AuthIdentity.ts index 632915d32aa..c8bc5515de1 100644 --- a/packages/server/graphql/types/AuthIdentity.ts +++ b/packages/server/graphql/types/AuthIdentity.ts @@ -1,8 +1,8 @@ import {GraphQLBoolean, GraphQLInterfaceType, GraphQLNonNull} from 'graphql' import {AuthIdentityTypeEnum as EAuthIdentityTypeEnum} from '../../../client/types/constEnums' -import AuthIdentityMicrosoft from './AuthIdentityMicrosoft' import AuthIdentityGoogle from './AuthIdentityGoogle' import AuthIdentityLocal from './AuthIdentityLocal' +import AuthIdentityMicrosoft from './AuthIdentityMicrosoft' import AuthIdentityTypeEnum from './AuthIdentityTypeEnum' export const authStrategyFields = () => ({ diff --git a/packages/server/graphql/types/CreateMassInvitationPayload.ts b/packages/server/graphql/types/CreateMassInvitationPayload.ts index ac6c2aab8e4..5bbf5a49119 100644 --- a/packages/server/graphql/types/CreateMassInvitationPayload.ts +++ b/packages/server/graphql/types/CreateMassInvitationPayload.ts @@ -1,7 +1,7 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import Team from './Team' +import makeMutationPayload from './makeMutationPayload' const CreateMassInvitationSuccess = new GraphQLObjectType({ name: 'CreateMassInvitationSuccess', diff --git a/packages/server/graphql/types/Discussion.ts b/packages/server/graphql/types/Discussion.ts index 51812036548..556401ba1cc 100644 --- a/packages/server/graphql/types/Discussion.ts +++ b/packages/server/graphql/types/Discussion.ts @@ -21,9 +21,9 @@ import resolveThreadableConnection from '../resolvers/resolveThreadableConnectio import DiscussionTopicTypeEnum from './DiscussionTopicTypeEnum' import GraphQLISO8601Type from './GraphQLISO8601Type' import NewMeetingStage from './NewMeetingStage' +import Team from './Team' import {ThreadableConnection} from './Threadable' import User from './User' -import Team from './Team' const Discussion = new GraphQLObjectType({ name: 'Discussion', diff --git a/packages/server/graphql/types/DragEstimatingTaskPayload.ts b/packages/server/graphql/types/DragEstimatingTaskPayload.ts index effd453e464..c09556af20a 100644 --- a/packages/server/graphql/types/DragEstimatingTaskPayload.ts +++ b/packages/server/graphql/types/DragEstimatingTaskPayload.ts @@ -4,8 +4,8 @@ import getPhase from '../../utils/getPhase' import {GQLContext} from '../graphql' import {augmentDBStage} from '../resolvers' import EstimateStage from './EstimateStage' -import makeMutationPayload from './makeMutationPayload' import PokerMeeting from './PokerMeeting' +import makeMutationPayload from './makeMutationPayload' export const DragEstimatingTaskSuccess = new GraphQLObjectType({ name: 'DragEstimatingTaskSuccess', diff --git a/packages/server/graphql/types/EndCheckInPayload.ts b/packages/server/graphql/types/EndCheckInPayload.ts index 52e22061575..82a922729aa 100644 --- a/packages/server/graphql/types/EndCheckInPayload.ts +++ b/packages/server/graphql/types/EndCheckInPayload.ts @@ -5,10 +5,10 @@ import errorFilter from '../errorFilter' import {GQLContext} from '../graphql' import {resolveNewMeeting} from '../resolvers' import ActionMeeting from './ActionMeeting' -import makeMutationPayload from './makeMutationPayload' import Task from './Task' import Team from './Team' import TimelineEvent from './TimelineEvent' +import makeMutationPayload from './makeMutationPayload' export const EndCheckInSuccess = new GraphQLObjectType({ name: 'EndCheckInSuccess', diff --git a/packages/server/graphql/types/EndRetrospectivePayload.ts b/packages/server/graphql/types/EndRetrospectivePayload.ts index f211368b675..a53fd7527e2 100644 --- a/packages/server/graphql/types/EndRetrospectivePayload.ts +++ b/packages/server/graphql/types/EndRetrospectivePayload.ts @@ -1,10 +1,10 @@ import {GraphQLBoolean, GraphQLID, GraphQLList, GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' import {resolveNewMeeting} from '../resolvers' -import makeMutationPayload from './makeMutationPayload' import RetrospectiveMeeting from './RetrospectiveMeeting' import Team from './Team' import TimelineEvent from './TimelineEvent' +import makeMutationPayload from './makeMutationPayload' export const EndRetrospectiveSuccess = new GraphQLObjectType({ name: 'EndRetrospectiveSuccess', diff --git a/packages/server/graphql/types/EndSprintPokerPayload.ts b/packages/server/graphql/types/EndSprintPokerPayload.ts index 1775053eb3b..09affd88b37 100644 --- a/packages/server/graphql/types/EndSprintPokerPayload.ts +++ b/packages/server/graphql/types/EndSprintPokerPayload.ts @@ -1,8 +1,8 @@ import {GraphQLBoolean, GraphQLID, GraphQLList, GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import PokerMeeting from './PokerMeeting' import Team from './Team' +import makeMutationPayload from './makeMutationPayload' export const EndSprintPokerSuccess = new GraphQLObjectType({ name: 'EndSprintPokerSuccess', diff --git a/packages/server/graphql/types/EndTeamPromptPayload.ts b/packages/server/graphql/types/EndTeamPromptPayload.ts index 5a354b506b2..4f1abefa0d6 100644 --- a/packages/server/graphql/types/EndTeamPromptPayload.ts +++ b/packages/server/graphql/types/EndTeamPromptPayload.ts @@ -1,10 +1,10 @@ import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' import {resolveNewMeeting, resolveTeam} from '../resolvers' -import makeMutationPayload from './makeMutationPayload' import Team from './Team' import TeamPromptMeeting from './TeamPromptMeeting' import TimelineEvent from './TimelineEvent' +import makeMutationPayload from './makeMutationPayload' export const EndTeamPromptSuccess = new GraphQLObjectType({ name: 'EndTeamPromptSuccess', diff --git a/packages/server/graphql/types/FlagReadyToAdvancePayload.ts b/packages/server/graphql/types/FlagReadyToAdvancePayload.ts index 03685b59536..fbb129308e6 100644 --- a/packages/server/graphql/types/FlagReadyToAdvancePayload.ts +++ b/packages/server/graphql/types/FlagReadyToAdvancePayload.ts @@ -1,9 +1,9 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' import {resolveGQLStageFromId} from '../resolvers' -import makeMutationPayload from './makeMutationPayload' import NewMeeting from './NewMeeting' import NewMeetingStage from './NewMeetingStage' +import makeMutationPayload from './makeMutationPayload' export const FlagReadyToAdvanceSuccess = new GraphQLObjectType({ name: 'FlagReadyToAdvanceSuccess', diff --git a/packages/server/graphql/types/JiraRemoteProject.ts b/packages/server/graphql/types/JiraRemoteProject.ts index f7c55c7a021..5bd90a6a384 100644 --- a/packages/server/graphql/types/JiraRemoteProject.ts +++ b/packages/server/graphql/types/JiraRemoteProject.ts @@ -1,11 +1,11 @@ import {GraphQLBoolean, GraphQLID, GraphQLNonNull, GraphQLObjectType, GraphQLString} from 'graphql' import JiraProjectId from 'parabol-client/shared/gqlIds/JiraProjectId' +import AtlassianServerManager, {JiraProject} from '../../utils/AtlassianServerManager' import { createImageUrlHash, createParabolImageUrl, downloadAndCacheImage } from '../../utils/atlassian/jiraImages' -import AtlassianServerManager, {JiraProject} from '../../utils/AtlassianServerManager' import {GQLContext} from '../graphql' import IntegrationProviderServiceEnum from './IntegrationProviderServiceEnum' import JiraRemoteAvatarUrls from './JiraRemoteAvatarUrls' diff --git a/packages/server/graphql/types/JoinMeetingPayload.ts b/packages/server/graphql/types/JoinMeetingPayload.ts index cc0642faf63..31a21ad9348 100644 --- a/packages/server/graphql/types/JoinMeetingPayload.ts +++ b/packages/server/graphql/types/JoinMeetingPayload.ts @@ -1,7 +1,7 @@ import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import NewMeeting from './NewMeeting' +import makeMutationPayload from './makeMutationPayload' export const JoinMeetingSuccess = new GraphQLObjectType({ name: 'JoinMeetingSuccess', diff --git a/packages/server/graphql/types/MovePokerTemplateScaleValuePayload.ts b/packages/server/graphql/types/MovePokerTemplateScaleValuePayload.ts index db40f5c9a98..0bda1d6646d 100644 --- a/packages/server/graphql/types/MovePokerTemplateScaleValuePayload.ts +++ b/packages/server/graphql/types/MovePokerTemplateScaleValuePayload.ts @@ -1,7 +1,7 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import TemplateScale from './TemplateScale' +import makeMutationPayload from './makeMutationPayload' export const MovePokerTemplateScaleValueSuccess = new GraphQLObjectType({ name: 'MovePokerTemplateScaleValueSuccess', diff --git a/packages/server/graphql/types/NewMeetingStage.ts b/packages/server/graphql/types/NewMeetingStage.ts index 0247e4ebbf2..b7095aca79d 100644 --- a/packages/server/graphql/types/NewMeetingStage.ts +++ b/packages/server/graphql/types/NewMeetingStage.ts @@ -10,8 +10,8 @@ import AuthToken from '../../database/types/AuthToken' import GenericMeetingPhase, { NewMeetingPhaseTypeEnum as NewMeetingPhaseTypeEnumType } from '../../database/types/GenericMeetingPhase' -import {getUserId} from '../../utils/authorization' import {Logger} from '../../utils/Logger' +import {getUserId} from '../../utils/authorization' import {GQLContext} from '../graphql' import GraphQLISO8601Type from './GraphQLISO8601Type' import NewMeeting from './NewMeeting' diff --git a/packages/server/graphql/types/Organization.ts b/packages/server/graphql/types/Organization.ts index 2e51054649d..fcb1f77fb40 100644 --- a/packages/server/graphql/types/Organization.ts +++ b/packages/server/graphql/types/Organization.ts @@ -19,8 +19,8 @@ import {resolveForBillingLeaders} from '../resolvers' import CreditCard from './CreditCard' import GraphQLISO8601Type from './GraphQLISO8601Type' import GraphQLURLType from './GraphQLURLType' -import OrganizationUser, {OrganizationUserConnection} from './OrganizationUser' import OrgUserCount from './OrgUserCount' +import OrganizationUser, {OrganizationUserConnection} from './OrganizationUser' import Team from './Team' const Organization: GraphQLObjectType = new GraphQLObjectType({ diff --git a/packages/server/graphql/types/OrganizationUser.ts b/packages/server/graphql/types/OrganizationUser.ts index 3940c23fc9f..942a57530a3 100644 --- a/packages/server/graphql/types/OrganizationUser.ts +++ b/packages/server/graphql/types/OrganizationUser.ts @@ -3,8 +3,8 @@ import connectionDefinitions from '../connectionDefinitions' import {GQLContext} from '../graphql' import {resolveOrganization} from '../resolvers' import GraphQLISO8601Type from './GraphQLISO8601Type' -import Organization from './Organization' import OrgUserRole from './OrgUserRole' +import Organization from './Organization' import User from './User' const OrganizationUser = new GraphQLObjectType({ diff --git a/packages/server/graphql/types/PokerAnnounceDeckHoverPayload.ts b/packages/server/graphql/types/PokerAnnounceDeckHoverPayload.ts index 89abcd96667..cc39fa4c017 100644 --- a/packages/server/graphql/types/PokerAnnounceDeckHoverPayload.ts +++ b/packages/server/graphql/types/PokerAnnounceDeckHoverPayload.ts @@ -2,8 +2,8 @@ import {GraphQLBoolean, GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'grap import {GQLContext} from '../graphql' import resolveStage from '../resolvers/resolveStage' import EstimateStage from './EstimateStage' -import makeMutationPayload from './makeMutationPayload' import User from './User' +import makeMutationPayload from './makeMutationPayload' export const PokerAnnounceDeckHoverSuccess = new GraphQLObjectType({ name: 'PokerAnnounceDeckHoverSuccess', diff --git a/packages/server/graphql/types/PokerMeeting.ts b/packages/server/graphql/types/PokerMeeting.ts index fd0116d26f2..bbea73c760f 100644 --- a/packages/server/graphql/types/PokerMeeting.ts +++ b/packages/server/graphql/types/PokerMeeting.ts @@ -1,7 +1,7 @@ import {GraphQLID, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType} from 'graphql' import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId' -import {getUserId} from '../../utils/authorization' import {Logger} from '../../utils/Logger' +import {getUserId} from '../../utils/authorization' import {GQLContext} from '../graphql' import NewMeeting from './NewMeeting' import PokerMeetingMember from './PokerMeetingMember' diff --git a/packages/server/graphql/types/PokerMeetingSettings.ts b/packages/server/graphql/types/PokerMeetingSettings.ts index 5f7b576fdab..00e0d260ceb 100644 --- a/packages/server/graphql/types/PokerMeetingSettings.ts +++ b/packages/server/graphql/types/PokerMeetingSettings.ts @@ -1,13 +1,13 @@ import {GraphQLID, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType} from 'graphql' import MeetingTemplate from '../../database/types/MeetingTemplate' import db from '../../db' +import {ORG_HOTNESS_FACTOR, TEAM_HOTNESS_FACTOR} from '../../utils/getTemplateScore' import {GQLContext} from '../graphql' import connectionFromTemplateArray from '../queries/helpers/connectionFromTemplateArray' import getScoredTemplates from '../queries/helpers/getScoredTemplates' import resolveSelectedTemplate from '../queries/helpers/resolveSelectedTemplate' import PokerTemplate, {PokerTemplateConnection} from './PokerTemplate' import TeamMeetingSettings, {teamMeetingSettingsFields} from './TeamMeetingSettings' -import {ORG_HOTNESS_FACTOR, TEAM_HOTNESS_FACTOR} from '../../utils/getTemplateScore' const PokerMeetingSettings = new GraphQLObjectType({ name: 'PokerMeetingSettings', diff --git a/packages/server/graphql/types/Reactable.ts b/packages/server/graphql/types/Reactable.ts index 812f5e40aec..fd0e4d1254c 100644 --- a/packages/server/graphql/types/Reactable.ts +++ b/packages/server/graphql/types/Reactable.ts @@ -1,7 +1,7 @@ import {GraphQLID, GraphQLInterfaceType, GraphQLList, GraphQLNonNull} from 'graphql' import resolveReactjis from '../resolvers/resolveReactjis' -import getReactableType from './getReactableType' import Reactji from './Reactji' +import getReactableType from './getReactableType' export const reactableFields = () => ({ id: { diff --git a/packages/server/graphql/types/RemoveIntegrationProviderPayload.ts b/packages/server/graphql/types/RemoveIntegrationProviderPayload.ts index e637f793fa3..2d2ec6f67e8 100644 --- a/packages/server/graphql/types/RemoveIntegrationProviderPayload.ts +++ b/packages/server/graphql/types/RemoveIntegrationProviderPayload.ts @@ -1,9 +1,9 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import toTeamMemberId from '../../../client/utils/relay/toTeamMemberId' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import TeamMember from './TeamMember' import User from './User' +import makeMutationPayload from './makeMutationPayload' export const RemoveIntegrationProviderSuccess = new GraphQLObjectType({ name: 'RemoveIntegrationProviderSuccess', diff --git a/packages/server/graphql/types/RemoveTeamMemberIntegrationAuthPayload.ts b/packages/server/graphql/types/RemoveTeamMemberIntegrationAuthPayload.ts index b505072fe74..ec145084377 100644 --- a/packages/server/graphql/types/RemoveTeamMemberIntegrationAuthPayload.ts +++ b/packages/server/graphql/types/RemoveTeamMemberIntegrationAuthPayload.ts @@ -1,9 +1,9 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import TeamMemberId from '../../../client/shared/gqlIds/TeamMemberId' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import TeamMember from './TeamMember' import User from './User' +import makeMutationPayload from './makeMutationPayload' export const RemoveTeamMemberIntegrationAuthSuccess = new GraphQLObjectType({ name: 'RemoveTeamMemberIntegrationAuthSuccess', diff --git a/packages/server/graphql/types/RenameMeetingPayload.ts b/packages/server/graphql/types/RenameMeetingPayload.ts index 7026d600f0b..929a267d005 100644 --- a/packages/server/graphql/types/RenameMeetingPayload.ts +++ b/packages/server/graphql/types/RenameMeetingPayload.ts @@ -1,7 +1,7 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import NewMeeting from './NewMeeting' +import makeMutationPayload from './makeMutationPayload' export const RenameMeetingSuccess = new GraphQLObjectType({ name: 'RenameMeetingSuccess', diff --git a/packages/server/graphql/types/RetrospectiveMeetingSettings.ts b/packages/server/graphql/types/RetrospectiveMeetingSettings.ts index ca7dedb27e0..7bd54c7b3b0 100644 --- a/packages/server/graphql/types/RetrospectiveMeetingSettings.ts +++ b/packages/server/graphql/types/RetrospectiveMeetingSettings.ts @@ -9,13 +9,13 @@ import { } from 'graphql' import db from '../../db' import {MeetingTypeEnum} from '../../postgres/types/Meeting' +import {ORG_HOTNESS_FACTOR, TEAM_HOTNESS_FACTOR} from '../../utils/getTemplateScore' import {GQLContext} from '../graphql' import connectionFromTemplateArray from '../queries/helpers/connectionFromTemplateArray' import getScoredTemplates from '../queries/helpers/getScoredTemplates' import resolveSelectedTemplate from '../queries/helpers/resolveSelectedTemplate' import ReflectTemplate, {ReflectTemplateConnection} from './ReflectTemplate' import TeamMeetingSettings, {teamMeetingSettingsFields} from './TeamMeetingSettings' -import {ORG_HOTNESS_FACTOR, TEAM_HOTNESS_FACTOR} from '../../utils/getTemplateScore' const RetrospectiveMeetingSettings: GraphQLObjectType = new GraphQLObjectType< any, diff --git a/packages/server/graphql/types/SetAppLocationPayload.ts b/packages/server/graphql/types/SetAppLocationPayload.ts index 2cbfcd96f78..c6edafa58fd 100644 --- a/packages/server/graphql/types/SetAppLocationPayload.ts +++ b/packages/server/graphql/types/SetAppLocationPayload.ts @@ -1,7 +1,7 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import User from './User' +import makeMutationPayload from './makeMutationPayload' export const SetAppLocationSuccess = new GraphQLObjectType({ name: 'SetAppLocationSuccess', diff --git a/packages/server/graphql/types/SetDefaultSlackChannelPayload.ts b/packages/server/graphql/types/SetDefaultSlackChannelPayload.ts index afe20dc6050..81381afe1bf 100644 --- a/packages/server/graphql/types/SetDefaultSlackChannelPayload.ts +++ b/packages/server/graphql/types/SetDefaultSlackChannelPayload.ts @@ -1,8 +1,8 @@ import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql' import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import TeamMember from './TeamMember' +import makeMutationPayload from './makeMutationPayload' export const SetDefaultSlackChannelSuccess = new GraphQLObjectType({ name: 'SetDefaultSlackChannelSuccess', diff --git a/packages/server/graphql/types/SetPokerSpectatePayload.ts b/packages/server/graphql/types/SetPokerSpectatePayload.ts index a296393e194..6041b4f59ba 100644 --- a/packages/server/graphql/types/SetPokerSpectatePayload.ts +++ b/packages/server/graphql/types/SetPokerSpectatePayload.ts @@ -4,8 +4,8 @@ import EstimateStageDB from '../../database/types/EstimateStage' import {GQLContext} from '../graphql' import {augmentDBStage} from '../resolvers' import EstimateStage from './EstimateStage' -import makeMutationPayload from './makeMutationPayload' import PokerMeetingMember from './PokerMeetingMember' +import makeMutationPayload from './makeMutationPayload' export const SetPokerSpectateSuccess = new GraphQLObjectType({ name: 'SetPokerSpectateSuccess', diff --git a/packages/server/graphql/types/SetTaskEstimatePayload.ts b/packages/server/graphql/types/SetTaskEstimatePayload.ts index 50bd2ca67a2..e185bb865ff 100644 --- a/packages/server/graphql/types/SetTaskEstimatePayload.ts +++ b/packages/server/graphql/types/SetTaskEstimatePayload.ts @@ -2,8 +2,8 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' import resolveStage from '../resolvers/resolveStage' import EstimateStage from './EstimateStage' -import makeMutationPayload from './makeMutationPayload' import Task from './Task' +import makeMutationPayload from './makeMutationPayload' export const SetTaskEstimateSuccess = new GraphQLObjectType({ name: 'SetTaskEstimateSuccess', diff --git a/packages/server/graphql/types/SetTaskHighlightPayload.ts b/packages/server/graphql/types/SetTaskHighlightPayload.ts index 73f657141ef..27e1ed7f8b3 100644 --- a/packages/server/graphql/types/SetTaskHighlightPayload.ts +++ b/packages/server/graphql/types/SetTaskHighlightPayload.ts @@ -1,8 +1,8 @@ import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' import {resolveTask} from '../resolvers' -import makeMutationPayload from './makeMutationPayload' import Task from './Task' +import makeMutationPayload from './makeMutationPayload' export const SetTaskHighlightSuccess = new GraphQLObjectType< {taskId: string; meetingId: string}, diff --git a/packages/server/graphql/types/StartSprintPokerPayload.ts b/packages/server/graphql/types/StartSprintPokerPayload.ts index 0c19e1aa4eb..9a8cd9911ab 100644 --- a/packages/server/graphql/types/StartSprintPokerPayload.ts +++ b/packages/server/graphql/types/StartSprintPokerPayload.ts @@ -1,8 +1,8 @@ import {GraphQLBoolean, GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import PokerMeeting from './PokerMeeting' import Team from './Team' +import makeMutationPayload from './makeMutationPayload' export const StartSprintPokerSuccess = new GraphQLObjectType({ name: 'StartSprintPokerSuccess', diff --git a/packages/server/graphql/types/TeamMeetingSettings.ts b/packages/server/graphql/types/TeamMeetingSettings.ts index 326e43b1f37..963babf8df2 100644 --- a/packages/server/graphql/types/TeamMeetingSettings.ts +++ b/packages/server/graphql/types/TeamMeetingSettings.ts @@ -1,6 +1,8 @@ import {GraphQLID, GraphQLInterfaceType, GraphQLList, GraphQLNonNull} from 'graphql' -import {MeetingTypeEnum as TMeetingTypeEnum} from '../../postgres/types/Meeting' import {NewMeetingPhaseTypeEnum as TNewMeetingPhaseTypeEnum} from '../../database/types/GenericMeetingPhase' +import {MeetingTypeEnum as TMeetingTypeEnum} from '../../postgres/types/Meeting' +import isPhaseAvailable from '../../utils/isPhaseAvailable' +import {GQLContext} from '../graphql' import {resolveTeam} from '../resolvers' import ActionMeetingSettings from './ActionMeetingSettings' import MeetingTypeEnum from './MeetingTypeEnum' @@ -9,8 +11,6 @@ import PokerMeetingSettings from './PokerMeetingSettings' import RetrospectiveMeetingSettings from './RetrospectiveMeetingSettings' import Team from './Team' import TeamPromptMeetingSettings from './TeamPromptMeetingSettings' -import isPhaseAvailable from '../../utils/isPhaseAvailable' -import {GQLContext} from '../graphql' import {getFeatureTier} from './helpers/getFeatureTier' export const teamMeetingSettingsFields = () => ({ diff --git a/packages/server/graphql/types/TeamMemberIntegrations.ts b/packages/server/graphql/types/TeamMemberIntegrations.ts index ed712fe3983..a6ed6a58348 100644 --- a/packages/server/graphql/types/TeamMemberIntegrations.ts +++ b/packages/server/graphql/types/TeamMemberIntegrations.ts @@ -7,8 +7,8 @@ import AzureDevOpsIntegration from './AzureDevOpsIntegration' import GitHubIntegration from './GitHubIntegration' import GitLabIntegration from './GitLabIntegration' import JiraServerIntegration from './JiraServerIntegration' -import MattermostIntegration from './MattermostIntegration' import MSTeamsIntegration from './MSTeamsIntegration' +import MattermostIntegration from './MattermostIntegration' import SlackIntegration from './SlackIntegration' const TeamMemberIntegrations = new GraphQLObjectType<{teamId: string; userId: string}, GQLContext>({ diff --git a/packages/server/graphql/types/ToggleTeamDrawerPayload.ts b/packages/server/graphql/types/ToggleTeamDrawerPayload.ts index b048ff54829..5ce7e4940c9 100644 --- a/packages/server/graphql/types/ToggleTeamDrawerPayload.ts +++ b/packages/server/graphql/types/ToggleTeamDrawerPayload.ts @@ -1,7 +1,7 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import TeamMember from './TeamMember' +import makeMutationPayload from './makeMutationPayload' export const ToggleTeamDrawerSuccess = new GraphQLObjectType({ name: 'ToggleTeamDrawerSuccess', diff --git a/packages/server/graphql/types/UpdateAzureDevOpsDimensionFieldPayload.ts b/packages/server/graphql/types/UpdateAzureDevOpsDimensionFieldPayload.ts index 5f639625d4a..76631ea867a 100644 --- a/packages/server/graphql/types/UpdateAzureDevOpsDimensionFieldPayload.ts +++ b/packages/server/graphql/types/UpdateAzureDevOpsDimensionFieldPayload.ts @@ -1,8 +1,8 @@ import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import PokerMeeting from './PokerMeeting' import Team from './Team' +import makeMutationPayload from './makeMutationPayload' export const UpdateAzureDevOpsDimensionFieldSuccess = new GraphQLObjectType({ name: 'UpdateAzureDevOpsDimensionFieldSuccess', diff --git a/packages/server/graphql/types/UpdateGitHubDimensionFieldPayload.ts b/packages/server/graphql/types/UpdateGitHubDimensionFieldPayload.ts index 6d878db5465..3026990f945 100644 --- a/packages/server/graphql/types/UpdateGitHubDimensionFieldPayload.ts +++ b/packages/server/graphql/types/UpdateGitHubDimensionFieldPayload.ts @@ -1,8 +1,8 @@ import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import PokerMeeting from './PokerMeeting' import Team from './Team' +import makeMutationPayload from './makeMutationPayload' export const UpdateGitHubDimensionFieldSuccess = new GraphQLObjectType({ name: 'UpdateGitHubDimensionFieldSuccess', fields: () => ({ diff --git a/packages/server/graphql/types/UpdateIntegrationProviderPayload.ts b/packages/server/graphql/types/UpdateIntegrationProviderPayload.ts index a09b6f05f6d..e64dd289b7b 100644 --- a/packages/server/graphql/types/UpdateIntegrationProviderPayload.ts +++ b/packages/server/graphql/types/UpdateIntegrationProviderPayload.ts @@ -2,9 +2,9 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import TeamMemberId from '../../../client/shared/gqlIds/TeamMemberId' import {GQLContext} from '../graphql' import IntegrationProvider from './IntegrationProvider' -import makeMutationPayload from './makeMutationPayload' import TeamMember from './TeamMember' import User from './User' +import makeMutationPayload from './makeMutationPayload' export const UpdateIntegrationProviderSuccess = new GraphQLObjectType({ name: 'UpdateIntegrationProviderSuccess', diff --git a/packages/server/graphql/types/UpdatePokerScopePayload.ts b/packages/server/graphql/types/UpdatePokerScopePayload.ts index e4cebcc9f35..9c438469d94 100644 --- a/packages/server/graphql/types/UpdatePokerScopePayload.ts +++ b/packages/server/graphql/types/UpdatePokerScopePayload.ts @@ -3,8 +3,8 @@ import getPhase from '../../utils/getPhase' import {GQLContext} from '../graphql' import {resolveGQLStagesFromPhase} from '../resolvers' import EstimateStage from './EstimateStage' -import makeMutationPayload from './makeMutationPayload' import PokerMeeting from './PokerMeeting' +import makeMutationPayload from './makeMutationPayload' export const UpdatePokerScopeSuccess = new GraphQLObjectType({ name: 'UpdatePokerScopeSuccess', diff --git a/packages/server/graphql/types/UpdateRetroMaxVotesPayload.ts b/packages/server/graphql/types/UpdateRetroMaxVotesPayload.ts index b5a55d27b1b..28b4c01bcf7 100644 --- a/packages/server/graphql/types/UpdateRetroMaxVotesPayload.ts +++ b/packages/server/graphql/types/UpdateRetroMaxVotesPayload.ts @@ -1,7 +1,7 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import RetrospectiveMeeting from './RetrospectiveMeeting' +import makeMutationPayload from './makeMutationPayload' export const UpdateRetroMaxVotesSuccess = new GraphQLObjectType({ name: 'UpdateRetroMaxVotesSuccess', diff --git a/packages/server/graphql/types/UpdateTemplateScopePayload.ts b/packages/server/graphql/types/UpdateTemplateScopePayload.ts index 7ce8af9808d..3ecee75c24f 100644 --- a/packages/server/graphql/types/UpdateTemplateScopePayload.ts +++ b/packages/server/graphql/types/UpdateTemplateScopePayload.ts @@ -1,9 +1,9 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql' import {MeetingTypeEnum} from '../../postgres/types/Meeting' import {GQLContext} from '../graphql' -import makeMutationPayload from './makeMutationPayload' import MeetingTemplate from './MeetingTemplate' import TeamMeetingSettings from './TeamMeetingSettings' +import makeMutationPayload from './makeMutationPayload' export const UpdateTemplateScopeSuccess = new GraphQLObjectType({ name: 'UpdateTemplateScopeSuccess', diff --git a/packages/server/graphql/types/User.ts b/packages/server/graphql/types/User.ts index 2a3a679dc85..623d77917d8 100644 --- a/packages/server/graphql/types/User.ts +++ b/packages/server/graphql/types/User.ts @@ -16,11 +16,13 @@ import { } from '../../../client/utils/constants' import groupReflections from '../../../client/utils/smartGroup/groupReflections' import getRethink from '../../database/rethinkDriver' +import {RDatum} from '../../database/stricterR' import MeetingMemberType from '../../database/types/MeetingMember' import OrganizationType from '../../database/types/Organization' import OrganizationUserType from '../../database/types/OrganizationUser' import Reflection from '../../database/types/Reflection' import SuggestedActionType from '../../database/types/SuggestedAction' +import TimelineEvent from '../../database/types/TimelineEvent' import {getUserId, isSuperUser, isTeamMember} from '../../utils/authorization' import getMonthlyStreak from '../../utils/getMonthlyStreak' import getRedis from '../../utils/getRedis' @@ -46,8 +48,6 @@ import TeamInvitationPayload from './TeamInvitationPayload' import TeamMember from './TeamMember' import {TimelineEventConnection} from './TimelineEvent' import TimelineEventTypeEnum from './TimelineEventTypeEnum' -import TimelineEvent from '../../database/types/TimelineEvent' -import {RDatum} from '../../database/stricterR' const User: GraphQLObjectType = new GraphQLObjectType({ name: 'User', diff --git a/packages/server/package.json b/packages/server/package.json index 381576fe390..c72517529ed 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -3,7 +3,7 @@ "description": "An open-source app for building smarter, more agile teams.", "author": "Parabol Inc. (http://github.com/ParabolInc)", "license": "AGPL-3.0", - "version": "7.27.0", + "version": "7.27.2", "repository": { "type": "git", "url": "https://github.com/ParabolInc/parabol" @@ -120,7 +120,7 @@ "oauth-1.0a": "^2.2.6", "openai": "^4.24.1", "oy-vey": "^0.12.1", - "parabol-client": "7.27.0", + "parabol-client": "7.27.2", "pg": "^8.5.1", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -133,6 +133,6 @@ "stripe": "^9.13.0", "tslib": "^2.4.0", "uWebSockets.js": "uNetworking/uWebSockets.js#v20.34.0", - "undici": "^5.28.3" + "undici": "^5.28.4" } } diff --git a/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts b/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts index 479bc9304f6..152c5c99793 100644 --- a/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts +++ b/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts @@ -4,7 +4,7 @@ import * as crypto from 'crypto' import * as _stringify from 'fast-json-stable-stringify' import {ColumnDefinitions, MigrationBuilder} from 'node-pg-migrate' import {Client} from 'pg' -import {r, RValue} from 'rethinkdb-ts' +import {RValue, r} from 'rethinkdb-ts' import {parse} from 'url' import MeetingPoker from '../../database/types/MeetingPoker' import TemplateDimension from '../../database/types/TemplateDimension' diff --git a/packages/server/postgres/migrations/1614361628531_github-auth.ts b/packages/server/postgres/migrations/1614361628531_github-auth.ts index 96a109cdcbe..fb3a8d92bf8 100644 --- a/packages/server/postgres/migrations/1614361628531_github-auth.ts +++ b/packages/server/postgres/migrations/1614361628531_github-auth.ts @@ -1,6 +1,6 @@ import {ColumnDefinitions, MigrationBuilder} from 'node-pg-migrate' import {Client} from 'pg' -import {r, RValue} from 'rethinkdb-ts' +import {RValue, r} from 'rethinkdb-ts' import {parse} from 'url' import {insertGitHubAuthsQuery} from '../generatedMigrationHelpers' import getPgConfig from '../getPgConfig' diff --git a/packages/server/postgres/migrations/1623102903842_discuss.ts b/packages/server/postgres/migrations/1623102903842_discuss.ts index 2cb0f8a59a9..2e663ce7050 100644 --- a/packages/server/postgres/migrations/1623102903842_discuss.ts +++ b/packages/server/postgres/migrations/1623102903842_discuss.ts @@ -1,6 +1,6 @@ import {ColumnDefinitions, MigrationBuilder} from 'node-pg-migrate' import {Client} from 'pg' -import {r, RValue} from 'rethinkdb-ts' +import {RValue, r} from 'rethinkdb-ts' import AgendaItemsPhase from '../../database/types/AgendaItemsPhase' import DiscussPhase from '../../database/types/DiscussPhase' import EstimatePhase from '../../database/types/EstimatePhase' diff --git a/packages/server/postgres/migrations/1625576993065_addAtlassianAuthTable.ts b/packages/server/postgres/migrations/1625576993065_addAtlassianAuthTable.ts index 2d70065fadf..d4e12dfbbbd 100644 --- a/packages/server/postgres/migrations/1625576993065_addAtlassianAuthTable.ts +++ b/packages/server/postgres/migrations/1625576993065_addAtlassianAuthTable.ts @@ -2,11 +2,11 @@ import {ColumnDefinitions, MigrationBuilder} from 'node-pg-migrate' import AtlassianManager from 'parabol-client/utils/AtlassianManager' import {Client} from 'pg' import {r} from 'rethinkdb-ts' +import connectRethinkDB from '../../database/connectRethinkDB' import {RDatum} from '../../database/stricterR' import {insertAtlassianAuthsQuery} from '../generatedMigrationHelpers' import getPgConfig from '../getPgConfig' export const shorthands: ColumnDefinitions | undefined = undefined -import connectRethinkDB from '../../database/connectRethinkDB' export async function up(): Promise { await connectRethinkDB() diff --git a/packages/server/postgres/migrations/1631553388387_add-template-teams-users.ts b/packages/server/postgres/migrations/1631553388387_add-template-teams-users.ts index 41ad65cff1d..d78210e62d2 100644 --- a/packages/server/postgres/migrations/1631553388387_add-template-teams-users.ts +++ b/packages/server/postgres/migrations/1631553388387_add-template-teams-users.ts @@ -1,8 +1,8 @@ import {Client} from 'pg' import {r} from 'rethinkdb-ts' +import connectRethinkDB from '../../database/connectRethinkDB' import {backupTeamQuery, backupUserQuery} from '../generatedMigrationHelpers' import getPgConfig from '../getPgConfig' -import connectRethinkDB from '../../database/connectRethinkDB' export async function up() { const client = new Client(getPgConfig()) diff --git a/packages/server/postgres/migrations/1640229261909_mattermostToIntegrationsTables.ts b/packages/server/postgres/migrations/1640229261909_mattermostToIntegrationsTables.ts index d6828a919e4..8d743e126e2 100644 --- a/packages/server/postgres/migrations/1640229261909_mattermostToIntegrationsTables.ts +++ b/packages/server/postgres/migrations/1640229261909_mattermostToIntegrationsTables.ts @@ -1,7 +1,7 @@ import {Client} from 'pg' import {r} from 'rethinkdb-ts' -import getPgConfig from '../getPgConfig' import connectRethinkDB from '../../database/connectRethinkDB' +import getPgConfig from '../getPgConfig' interface MattermostAuth { createdAt: Date diff --git a/packages/server/postgres/migrations/1654861495450_migrateSecureDomain.ts b/packages/server/postgres/migrations/1654861495450_migrateSecureDomain.ts index b39b2f71638..a22e396cd5e 100644 --- a/packages/server/postgres/migrations/1654861495450_migrateSecureDomain.ts +++ b/packages/server/postgres/migrations/1654861495450_migrateSecureDomain.ts @@ -1,7 +1,7 @@ import {Client} from 'pg' import {r} from 'rethinkdb-ts' -import getPgConfig from '../getPgConfig' import connectRethinkDB from '../../database/connectRethinkDB' +import getPgConfig from '../getPgConfig' export async function up() { await connectRethinkDB() diff --git a/packages/server/postgres/migrations/1677272969994_meetingTemplatesMove.ts b/packages/server/postgres/migrations/1677272969994_meetingTemplatesMove.ts index cb7d4f6ea98..c6d6b709fff 100644 --- a/packages/server/postgres/migrations/1677272969994_meetingTemplatesMove.ts +++ b/packages/server/postgres/migrations/1677272969994_meetingTemplatesMove.ts @@ -1,8 +1,8 @@ import {FirstParam} from 'parabol-client/types/generics' import {Client} from 'pg' import {r} from 'rethinkdb-ts' -import getPgConfig from '../getPgConfig' import connectRethinkDB from '../../database/connectRethinkDB' +import getPgConfig from '../getPgConfig' import getPgp from '../getPgp' export async function up() { diff --git a/packages/server/postgres/migrations/1694191002164_migrateSAML.ts b/packages/server/postgres/migrations/1694191002164_migrateSAML.ts index 1b2a41bfbc1..1bf2899fc13 100644 --- a/packages/server/postgres/migrations/1694191002164_migrateSAML.ts +++ b/packages/server/postgres/migrations/1694191002164_migrateSAML.ts @@ -1,6 +1,6 @@ import {Kysely, PostgresDialect, sql} from 'kysely' import {Client} from 'pg' -import {r, RDatum} from 'rethinkdb-ts' +import {RDatum, r} from 'rethinkdb-ts' import getPg from '../getPg' import getPgConfig from '../getPgConfig' diff --git a/packages/server/postgres/migrations/1695293482618_addFreemailDomain.ts b/packages/server/postgres/migrations/1695293482618_addFreemailDomain.ts index 8fda8802b09..cb46398628f 100644 --- a/packages/server/postgres/migrations/1695293482618_addFreemailDomain.ts +++ b/packages/server/postgres/migrations/1695293482618_addFreemailDomain.ts @@ -1,5 +1,5 @@ -import {Client} from 'pg' import {Kysely, PostgresDialect, sql} from 'kysely' +import {Client} from 'pg' import getPg from '../getPg' import getPgConfig from '../getPgConfig' diff --git a/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts b/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts index 3c93617c0b1..279dd6f90b7 100644 --- a/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts +++ b/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts @@ -4,9 +4,13 @@ import getPgConfig from '../getPgConfig' export async function up() { const client = new Client(getPgConfig()) await client.connect() - await client.query(` + try { + await client.query(` ALTER TABLE "EmbeddingsMetadata" RENAME COLUMN "embedText" TO "fullText"; `) + } catch { + // noop + } await client.end() } diff --git a/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts b/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts index 1a1c6950d64..c46bc4b045a 100644 --- a/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts +++ b/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts @@ -1,8 +1,8 @@ import {FirstParam} from 'parabol-client/types/generics' import {Client} from 'pg' import {r} from 'rethinkdb-ts' -import getPgConfig from '../getPgConfig' import connectRethinkDB from '../../database/connectRethinkDB' +import getPgConfig from '../getPgConfig' import getPgp from '../getPgp' export async function up() { diff --git a/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts b/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts new file mode 100644 index 00000000000..6887169ac6e --- /dev/null +++ b/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts @@ -0,0 +1,107 @@ +import {Kysely, PostgresDialect, sql} from 'kysely' +import {r} from 'rethinkdb-ts' +import connectRethinkDB from '../../database/connectRethinkDB' +import getPg from '../getPg' + +export async function up() { + await connectRethinkDB() + const pg = new Kysely({ + dialect: new PostgresDialect({ + pool: getPg() + }) + }) + try { + await r + .table('RetroReflectionGroup') + .indexCreate('updatedAtId', (row: any) => [row('updatedAt'), row('id')]) + .run() + await r.table('RetroReflectionGroup').indexWait().run() + } catch { + // index already exists + } + + await pg.schema + .alterTable('RetroReflectionGroup') + .alterColumn('voterIds', (ac) => ac.setDataType(sql`text[]`)) + .alterColumn('promptId', (ac) => ac.setDataType('varchar(111)')) + .execute() + + const MAX_PG_PARAMS = 65545 + const PG_COLS = [ + 'id', + 'createdAt', + 'updatedAt', + 'isActive', + 'meetingId', + 'promptId', + 'sortOrder', + 'voterIds', + 'smartTitle', + 'title', + 'summary', + 'discussionPromptQuestion' + ] as const + type RetroReflectionGroup = { + [K in (typeof PG_COLS)[number]]: any + } + const BATCH_SIZE = Math.trunc(MAX_PG_PARAMS / PG_COLS.length) + + let curUpdatedAt = r.minval + let curId = r.minval + for (let i = 0; i < 1e6; i++) { + const rawRowsToInsert = (await r + .table('RetroReflectionGroup') + .between([curUpdatedAt, curId], [r.maxval, r.maxval], { + index: 'updatedAtId', + leftBound: 'open', + rightBound: 'closed' + }) + .orderBy({index: 'updatedAtId'}) + .limit(BATCH_SIZE) + .pluck(...PG_COLS) + .run()) as RetroReflectionGroup[] + + const rowsToInsert = rawRowsToInsert.map((row) => ({ + ...row, + title: row.title?.slice(0, 255), + smartTitle: row.smartTitle?.slice(0, 255), + summary: row.summary?.slice(0, 2000) + })) + if (rowsToInsert.length === 0) break + const lastRow = rowsToInsert[rowsToInsert.length - 1] + curUpdatedAt = lastRow.updatedAt + curId = lastRow.id + try { + await pg + .insertInto('RetroReflectionGroup') + .values(rowsToInsert) + .onConflict((oc) => oc.doNothing()) + .execute() + } catch (e) { + console.log({lastRow}, rowsToInsert.length) + await Promise.all( + rowsToInsert.map(async (row) => { + try { + const res = await pg + .insertInto('RetroReflectionGroup') + .values(row) + .onConflict((oc) => oc.doNothing()) + .execute() + } catch (e) { + console.log(e, row) + } + }) + ) + throw e + } + } +} + +export async function down() { + await connectRethinkDB() + try { + await r.table('RetroReflectionGroup').indexDrop('updatedAtId').run() + } catch { + // index already dropped + } +} diff --git a/packages/server/postgres/queries/updateUserTiers.ts b/packages/server/postgres/queries/updateUserTiers.ts index 24569381868..ec9961dad57 100644 --- a/packages/server/postgres/queries/updateUserTiers.ts +++ b/packages/server/postgres/queries/updateUserTiers.ts @@ -1,5 +1,5 @@ -import catchAndLog from '../utils/catchAndLog' import getPg from '../getPg' +import catchAndLog from '../utils/catchAndLog' import {IUpdateUserTiersQueryParams, updateUserTiersQuery} from './generated/updateUserTiersQuery' const updateUserTiers = async ({users}: IUpdateUserTiersQueryParams) => { diff --git a/packages/server/postgres/utils/checkEqBase.ts b/packages/server/postgres/utils/checkEqBase.ts index c56da959aa3..20bc9914f43 100644 --- a/packages/server/postgres/utils/checkEqBase.ts +++ b/packages/server/postgres/utils/checkEqBase.ts @@ -1,5 +1,5 @@ +import {RSelection} from 'rethinkdb-ts' import getRethink from '../../database/rethinkDriver' -import {RTable, TableSchema} from '../../database/stricterR' import getPg from '../getPg' interface DBDoc { @@ -33,7 +33,7 @@ export const checkRowCount = async (tableName: string) => { } export async function checkTableEq( - rethinkQuery: RTable, + rethinkQuery: (updatedAt: Date, id: string | number) => RSelection, pgQuery: (ids: string[]) => Promise, equalityMap: Record boolean>, maxErrors = 10 @@ -41,11 +41,17 @@ export async function checkTableEq( const batchSize = 3000 const errors = [] as Diff[] const propsToCheck = Object.keys(equalityMap) - + const r = await getRethink() + let curUpdatedDate = r.minval + let curId = r.minval for (let i = 0; i < 1e6; i++) { - const offset = batchSize * i - const rethinkRows = (await rethinkQuery.skip(offset).limit(batchSize).run()) as RethinkDoc[] - if (!rethinkRows.length) break + const rethinkRows = (await rethinkQuery(curUpdatedDate, curId) + .limit(batchSize) + .run()) as RethinkDoc[] + if (rethinkRows.length === 0) break + const lastRow = rethinkRows[rethinkRows.length - 1]! + curUpdatedDate = lastRow.updatedAt + curId = lastRow.id const ids = rethinkRows.map((t) => t.id) const pgRows = (await pgQuery(ids)) ?? [] const pgRowsById = {} as {[key: string]: PGDoc} diff --git a/packages/server/postgres/utils/rethinkEqualityFns.ts b/packages/server/postgres/utils/rethinkEqualityFns.ts index 8cecaf562c1..69f0ec2bb20 100644 --- a/packages/server/postgres/utils/rethinkEqualityFns.ts +++ b/packages/server/postgres/utils/rethinkEqualityFns.ts @@ -2,6 +2,7 @@ import isValidDate from 'parabol-client/utils/isValidDate' export const defaultEqFn = (a: unknown, b: unknown) => { if (a instanceof Date && b instanceof Date) return a.getTime() === b.getTime() + if (Array.isArray(a) && Array.isArray(b)) return JSON.stringify(a) === JSON.stringify(b) return a === b } export const compareDateAlmostEqual = (rVal: unknown, pgVal: unknown) => { @@ -19,3 +20,10 @@ export const compareRValUndefinedAsFalse = (rVal: unknown, pgVal: unknown) => { const normalizedRVal = rVal === undefined ? false : rVal return normalizedRVal === pgVal } + +export const compareRValUndefinedAsNullAndTruncateRVal = + (length: number) => (rVal: unknown, pgVal: unknown) => { + const truncatedRVal = typeof rVal === 'string' ? rVal.slice(0, length) : rVal + const normalizedRVal = truncatedRVal === undefined ? null : truncatedRVal + return defaultEqFn(normalizedRVal, pgVal) + } diff --git a/packages/server/socketHelpers/sendEncodedMessage.ts b/packages/server/socketHelpers/sendEncodedMessage.ts index 3b86b24e1a0..559b44eceea 100644 --- a/packages/server/socketHelpers/sendEncodedMessage.ts +++ b/packages/server/socketHelpers/sendEncodedMessage.ts @@ -36,4 +36,4 @@ const sendEncodedMessage = (context: ConnectionContext, object: any, syn = false } } -export {sendEncodedMessage, sendAndPushToReliableQueue} +export {sendAndPushToReliableQueue, sendEncodedMessage} diff --git a/packages/server/utils/AtlassianServerManager.ts b/packages/server/utils/AtlassianServerManager.ts index 2cd82d3e8e4..d9d1e8e9708 100644 --- a/packages/server/utils/AtlassianServerManager.ts +++ b/packages/server/utils/AtlassianServerManager.ts @@ -1,16 +1,16 @@ +import JiraIssueId from 'parabol-client/shared/gqlIds/JiraIssueId' +import JiraProjectKeyId from 'parabol-client/shared/gqlIds/JiraProjectKeyId' +import {SprintPokerDefaults} from 'parabol-client/types/constEnums' import AtlassianManager, { AtlassianError, RateLimitError } from 'parabol-client/utils/AtlassianManager' -import JiraIssueId from 'parabol-client/shared/gqlIds/JiraIssueId' import composeJQL from 'parabol-client/utils/composeJQL' -import JiraProjectKeyId from 'parabol-client/shared/gqlIds/JiraProjectKeyId' -import {SprintPokerDefaults} from 'parabol-client/types/constEnums' -import {authorizeOAuth2} from '../integrations/helpers/authorizeOAuth2' import { OAuth2AuthorizationParams, OAuth2RefreshAuthorizationParams } from '../integrations/OAuth2Manager' +import {authorizeOAuth2} from '../integrations/helpers/authorizeOAuth2' import {Logger} from './Logger' export interface JiraUser { diff --git a/packages/server/utils/AzureDevOpsServerManager.ts b/packages/server/utils/AzureDevOpsServerManager.ts index ba3cf7f04f3..419b19df360 100644 --- a/packages/server/utils/AzureDevOpsServerManager.ts +++ b/packages/server/utils/AzureDevOpsServerManager.ts @@ -6,7 +6,6 @@ import {isError} from 'util' import {ExternalLinks} from '~/types/constEnums' import AzureDevOpsProjectId from '../../client/shared/gqlIds/AzureDevOpsProjectId' import appOrigin from '../appOrigin' -import {authorizeOAuth2} from '../integrations/helpers/authorizeOAuth2' import { OAuth2PkceAuthorizationParams, OAuth2PkceRefreshAuthorizationParams @@ -15,6 +14,7 @@ import { CreateTaskResponse, TaskIntegrationManager } from '../integrations/TaskIntegrationManagerFactory' +import {authorizeOAuth2} from '../integrations/helpers/authorizeOAuth2' import {IGetTeamMemberIntegrationAuthQueryResult} from '../postgres/queries/generated/getTeamMemberIntegrationAuthQuery' import {IntegrationProviderAzureDevOps} from '../postgres/queries/getIntegrationProvidersByIds' import makeCreateAzureTaskComment from './makeCreateAzureTaskComment' diff --git a/packages/server/utils/OpenAIServerManager.ts b/packages/server/utils/OpenAIServerManager.ts index 251528770e2..6356c486e6f 100644 --- a/packages/server/utils/OpenAIServerManager.ts +++ b/packages/server/utils/OpenAIServerManager.ts @@ -1,9 +1,9 @@ -import OpenAI from 'openai' import JSON5 from 'json5' -import sendToSentry from './sendToSentry' +import OpenAI from 'openai' import Reflection from '../database/types/Reflection' import {ModifyType} from '../graphql/public/resolverTypes' import {Logger} from './Logger' +import sendToSentry from './sendToSentry' type Prompt = { question: string diff --git a/packages/server/utils/PubSubPromise.ts b/packages/server/utils/PubSubPromise.ts index 912b882fbb2..cd95cbaf325 100644 --- a/packages/server/utils/PubSubPromise.ts +++ b/packages/server/utils/PubSubPromise.ts @@ -1,11 +1,11 @@ import ms from 'ms' import GQLExecutorChannelId from '../../client/shared/gqlIds/GQLExecutorChannelId' -import numToBase64 from './numToBase64' import RedisInstance from './RedisInstance' +import numToBase64 from './numToBase64' import sendToSentry from './sendToSentry' const STANDARD_TIMEOUT = ms('10s') -const ADHOC_TIMEOUT = ms('1m') +const ADHOC_TIMEOUT = ms('10m') interface Job { resolve: (payload: any) => void diff --git a/packages/server/utils/RecallAIServerManager.ts b/packages/server/utils/RecallAIServerManager.ts index c5dc8e7f781..920337d662e 100644 --- a/packages/server/utils/RecallAIServerManager.ts +++ b/packages/server/utils/RecallAIServerManager.ts @@ -3,8 +3,8 @@ import axios from 'axios' import {ExternalLinks} from '../../client/types/constEnums' import appOrigin from '../appOrigin' import {TranscriptBlock} from '../database/types/MeetingRetrospective' -import sendToSentry from './sendToSentry' import {Logger} from './Logger' +import sendToSentry from './sendToSentry' const sdk = api('@recallai/v1.6#536jnqlf7d6blh') diff --git a/packages/server/utils/StaticServer.ts b/packages/server/utils/StaticServer.ts index 2ba0fd3b3b6..9061cf63477 100644 --- a/packages/server/utils/StaticServer.ts +++ b/packages/server/utils/StaticServer.ts @@ -2,8 +2,8 @@ import fs from 'fs' import mime from 'mime-types' import path from 'path' import {brotliCompressSync} from 'zlib' -import isCompressible from './isCompressible' import {Logger} from './Logger' +import isCompressible from './isCompressible' class StaticFileMeta { mtime: string size: number diff --git a/packages/server/utils/__tests__/RedisLockQueue.test.ts b/packages/server/utils/__tests__/RedisLockQueue.test.ts index 2783e1b207d..bde386f290c 100644 --- a/packages/server/utils/__tests__/RedisLockQueue.test.ts +++ b/packages/server/utils/__tests__/RedisLockQueue.test.ts @@ -1,7 +1,7 @@ /* eslint-env jest */ -import getRedis from '../getRedis' -import RedisLockQueue from '../RedisLockQueue' import sleep from 'parabol-client/utils/sleep' +import RedisLockQueue from '../RedisLockQueue' +import getRedis from '../getRedis' afterAll(async () => { getRedis().quit() diff --git a/packages/server/utils/authorization.ts b/packages/server/utils/authorization.ts index dd873e6c885..bcfb150ce19 100644 --- a/packages/server/utils/authorization.ts +++ b/packages/server/utils/authorization.ts @@ -1,10 +1,9 @@ import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId' import getRethink from '../database/rethinkDriver' +import {RDatum} from '../database/stricterR' import AuthToken from '../database/types/AuthToken' -import OrganizationUser from '../database/types/OrganizationUser' +import OrganizationUser, {OrgUserRole} from '../database/types/OrganizationUser' import {DataLoaderWorker} from '../graphql/graphql' -import {RDatum} from '../database/stricterR' -import {OrgUserRole} from '../database/types/OrganizationUser' export const getUserId = (authToken: any) => { return authToken && typeof authToken === 'object' ? (authToken.sub as string) : '' diff --git a/packages/server/utils/getGraphQLExecutor.ts b/packages/server/utils/getGraphQLExecutor.ts index 759f21bade2..3c40d66cbd8 100644 --- a/packages/server/utils/getGraphQLExecutor.ts +++ b/packages/server/utils/getGraphQLExecutor.ts @@ -1,7 +1,7 @@ import {ExecutionResult} from 'graphql' import {ServerChannel} from 'parabol-client/types/constEnums' -import type {GQLRequest} from '../types/custom' import SocketServerChannelId from '../../client/shared/gqlIds/SocketServerChannelId' +import type {GQLRequest} from '../types/custom' import PubSubPromise from './PubSubPromise' let pubsub: PubSubPromise diff --git a/packages/server/utils/getPhase.ts b/packages/server/utils/getPhase.ts index bf84ce59fe7..94a825bac70 100644 --- a/packages/server/utils/getPhase.ts +++ b/packages/server/utils/getPhase.ts @@ -4,9 +4,9 @@ import DiscussPhase from '../database/types/DiscussPhase' import EstimatePhase from '../database/types/EstimatePhase' import GenericMeetingPhase from '../database/types/GenericMeetingPhase' import ReflectPhase from '../database/types/ReflectPhase' +import TeamHealthPhase from '../database/types/TeamHealthPhase' import TeamPromptResponsesPhase from '../database/types/TeamPromptResponsesPhase' import UpdatesPhase from '../database/types/UpdatesPhase' -import TeamHealthPhase from '../database/types/TeamHealthPhase' interface PhaseTypeLookup { agendaitems: AgendaItemsPhase diff --git a/packages/server/utils/isPhaseAvailable.ts b/packages/server/utils/isPhaseAvailable.ts index 9f5ff95cd89..dd81f068140 100644 --- a/packages/server/utils/isPhaseAvailable.ts +++ b/packages/server/utils/isPhaseAvailable.ts @@ -1,6 +1,6 @@ -import {TierEnum} from '../database/types/Invoice' -import {NewMeetingPhaseTypeEnum} from '../database/types/GenericMeetingPhase' import isTeamHealthAvailable from 'parabol-client/utils/features/isTeamHealthAvailable' +import {NewMeetingPhaseTypeEnum} from '../database/types/GenericMeetingPhase' +import {TierEnum} from '../database/types/Invoice' const isPhaseAvailable = (tier: TierEnum) => (phaseType: NewMeetingPhaseTypeEnum) => { if (phaseType === 'TEAM_HEALTH') { diff --git a/packages/server/utils/isRequestToJoinDomainAllowed.ts b/packages/server/utils/isRequestToJoinDomainAllowed.ts index 1252dba7cf1..7fef1c6cbe1 100644 --- a/packages/server/utils/isRequestToJoinDomainAllowed.ts +++ b/packages/server/utils/isRequestToJoinDomainAllowed.ts @@ -1,11 +1,11 @@ import getRethink from '../database/rethinkDriver' import {RDatum} from '../database/stricterR' -import isUserVerified from './isUserVerified' +import Organization from '../database/types/Organization' +import TeamMember from '../database/types/TeamMember' import User from '../database/types/User' import {DataLoaderWorker} from '../graphql/graphql' import isValid from '../graphql/isValid' -import TeamMember from '../database/types/TeamMember' -import Organization from '../database/types/Organization' +import isUserVerified from './isUserVerified' export const getEligibleOrgIdsByDomain = async ( activeDomain: string, diff --git a/packages/server/utils/sendPromptToJoinOrg.ts b/packages/server/utils/sendPromptToJoinOrg.ts index c871808e5f9..1c8422dc79c 100644 --- a/packages/server/utils/sendPromptToJoinOrg.ts +++ b/packages/server/utils/sendPromptToJoinOrg.ts @@ -1,9 +1,9 @@ import getRethink from '../database/rethinkDriver' import NotificationPromptToJoinOrg from '../database/types/NotificationPromptToJoinOrg' -import isRequestToJoinDomainAllowed from './isRequestToJoinDomainAllowed' -import getDomainFromEmail from './getDomainFromEmail' import User from '../database/types/User' import {DataLoaderWorker} from '../graphql/graphql' +import getDomainFromEmail from './getDomainFromEmail' +import isRequestToJoinDomainAllowed from './isRequestToJoinDomainAllowed' const sendPromptToJoinOrg = async (newUser: User, dataLoader: DataLoaderWorker) => { const {id: userId, email} = newUser diff --git a/packages/server/utils/serverHealthChecker.ts b/packages/server/utils/serverHealthChecker.ts index 35d3539a46f..6b5ad020530 100644 --- a/packages/server/utils/serverHealthChecker.ts +++ b/packages/server/utils/serverHealthChecker.ts @@ -2,9 +2,9 @@ import sleep from '../../client/utils/sleep' import ServerAuthToken from '../database/types/ServerAuthToken' import {UserPresence} from '../graphql/private/mutations/connectSocket' import {disconnectQuery} from '../socketHandlers/handleDisconnect' +import RedisInstance from './RedisInstance' import publishInternalGQL from './publishInternalGQL' import sendToSentry from './sendToSentry' -import RedisInstance from './RedisInstance' const SERVER_ID = process.env.SERVER_ID! const INSTANCE_ID = `${SERVER_ID}:${process.pid}` diff --git a/packages/server/utils/updateGQLSchema.ts b/packages/server/utils/updateGQLSchema.ts index 32234ba4172..1a550e836a1 100644 --- a/packages/server/utils/updateGQLSchema.ts +++ b/packages/server/utils/updateGQLSchema.ts @@ -8,9 +8,9 @@ import fs from 'fs' import {printSchema} from 'graphql' import path from 'path' import {promisify} from 'util' +import getProjectRoot from '../../../scripts/webpack/utils/getProjectRoot' import privateSchema from '../graphql/private/rootSchema' import publicSchema from '../graphql/public/rootSchema' -import getProjectRoot from '../../../scripts/webpack/utils/getProjectRoot' const writeIfChanged = async (dataPath: string, data: string) => { const write = promisify(fs.writeFile) diff --git a/scripts/webpack/dev.client.config.js b/scripts/webpack/dev.client.config.js index 5c626108805..e3d6766bf59 100644 --- a/scripts/webpack/dev.client.config.js +++ b/scripts/webpack/dev.client.config.js @@ -59,12 +59,10 @@ module.exports = { 'self-hosted', // important terminating / so saml-redirect doesn't get targeted, too 'saml/' - ].reduce((obj, name) => { - obj[`/${name}`] = { - target: `http://localhost:${SOCKET_PORT}` - } - return obj - }, {}) + ].map((name) => ({ + context: [`/${name}`], + target: `http://localhost:${SOCKET_PORT}`, + })) }, infrastructureLogging: {level: 'warn'}, watchOptions: { diff --git a/yarn.lock b/yarn.lock index c01d5591da9..19cdfead7f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -237,185 +237,199 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-cloudwatch-logs@^3.427.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.433.0.tgz#eea311048050ade56292dbf9533ede7bbb9e90be" - integrity sha512-AeByrfKS1KQcFmCbP6FIsTGue7xAmxuJ+uvdjc1S6MEdcR6VfJEWIqxpUHDnwgroHJN1K4MG4ZUUWMZwXgNfOw== +"@aws-sdk/client-cloudwatch-logs@^3.537.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.552.0.tgz#3289fd1ec3dd5fa76c8cb64cf1a9973aa5f44653" + integrity sha512-ITJZmQkdpGLaE6o3FmP8WryOcBUxT7uAaAcNTr8G+bUMuEVeWqdwQ2YtnDa/h0BibMELacM50Cv8/FDmSPcp2A== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.433.0" - "@aws-sdk/credential-provider-node" "3.433.0" - "@aws-sdk/middleware-host-header" "3.433.0" - "@aws-sdk/middleware-logger" "3.433.0" - "@aws-sdk/middleware-recursion-detection" "3.433.0" - "@aws-sdk/middleware-signing" "3.433.0" - "@aws-sdk/middleware-user-agent" "3.433.0" - "@aws-sdk/region-config-resolver" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@aws-sdk/util-endpoints" "3.433.0" - "@aws-sdk/util-user-agent-browser" "3.433.0" - "@aws-sdk/util-user-agent-node" "3.433.0" - "@smithy/config-resolver" "^2.0.16" - "@smithy/fetch-http-handler" "^2.2.4" - "@smithy/hash-node" "^2.0.12" - "@smithy/invalid-dependency" "^2.0.12" - "@smithy/middleware-content-length" "^2.0.14" - "@smithy/middleware-endpoint" "^2.1.3" - "@smithy/middleware-retry" "^2.0.18" - "@smithy/middleware-serde" "^2.0.12" - "@smithy/middleware-stack" "^2.0.6" - "@smithy/node-config-provider" "^2.1.3" - "@smithy/node-http-handler" "^2.1.8" - "@smithy/protocol-http" "^3.0.8" - "@smithy/smithy-client" "^2.1.12" - "@smithy/types" "^2.4.0" - "@smithy/url-parser" "^2.0.12" - "@smithy/util-base64" "^2.0.0" - "@smithy/util-body-length-browser" "^2.0.0" - "@smithy/util-body-length-node" "^2.1.0" - "@smithy/util-defaults-mode-browser" "^2.0.16" - "@smithy/util-defaults-mode-node" "^2.0.21" - "@smithy/util-retry" "^2.0.5" - "@smithy/util-utf8" "^2.0.0" - tslib "^2.5.0" - uuid "^8.3.2" - -"@aws-sdk/client-cognito-identity@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.433.0.tgz#7113541599e7c3eac59500c0d7f65f091a3080c3" - integrity sha512-42znkBhcLweedtcp+k0Vz4As9FavThrYYGtvuleW82GQqtwyOXSifinXw7xfY2JngqCuCEenFQPsf1hudOWzyw== + "@aws-sdk/client-sts" "3.552.0" + "@aws-sdk/core" "3.552.0" + "@aws-sdk/credential-provider-node" "3.552.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/eventstream-serde-browser" "^2.2.0" + "@smithy/eventstream-serde-config-resolver" "^2.2.0" + "@smithy/eventstream-serde-node" "^2.2.0" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + uuid "^9.0.1" + +"@aws-sdk/client-cognito-identity@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.552.0.tgz#40825b0f84f27c8d5c2fb3dea72bca96023a7bf4" + integrity sha512-lNmgK68V7g0PhKT68IZi5EA7IUphonKDwn97GZVb6B4nfeE0pBT24di+jZzDt04EeuegZaj584sMkGHNk/4Wng== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.433.0" - "@aws-sdk/credential-provider-node" "3.433.0" - "@aws-sdk/middleware-host-header" "3.433.0" - "@aws-sdk/middleware-logger" "3.433.0" - "@aws-sdk/middleware-recursion-detection" "3.433.0" - "@aws-sdk/middleware-signing" "3.433.0" - "@aws-sdk/middleware-user-agent" "3.433.0" - "@aws-sdk/region-config-resolver" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@aws-sdk/util-endpoints" "3.433.0" - "@aws-sdk/util-user-agent-browser" "3.433.0" - "@aws-sdk/util-user-agent-node" "3.433.0" - "@smithy/config-resolver" "^2.0.16" - "@smithy/fetch-http-handler" "^2.2.4" - "@smithy/hash-node" "^2.0.12" - "@smithy/invalid-dependency" "^2.0.12" - "@smithy/middleware-content-length" "^2.0.14" - "@smithy/middleware-endpoint" "^2.1.3" - "@smithy/middleware-retry" "^2.0.18" - "@smithy/middleware-serde" "^2.0.12" - "@smithy/middleware-stack" "^2.0.6" - "@smithy/node-config-provider" "^2.1.3" - "@smithy/node-http-handler" "^2.1.8" - "@smithy/protocol-http" "^3.0.8" - "@smithy/smithy-client" "^2.1.12" - "@smithy/types" "^2.4.0" - "@smithy/url-parser" "^2.0.12" - "@smithy/util-base64" "^2.0.0" - "@smithy/util-body-length-browser" "^2.0.0" - "@smithy/util-body-length-node" "^2.1.0" - "@smithy/util-defaults-mode-browser" "^2.0.16" - "@smithy/util-defaults-mode-node" "^2.0.21" - "@smithy/util-retry" "^2.0.5" - "@smithy/util-utf8" "^2.0.0" - tslib "^2.5.0" - -"@aws-sdk/client-iam@^3.427.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-iam/-/client-iam-3.433.0.tgz#a39d1cea7753d30f76ede48eb04b99d073529bc9" - integrity sha512-QDRqWCmIQYrIqU+AcdAeH3V028JgqIW/PUcHE1CRn29rKamo9ArdlQOB6YsH2++qDTShu7MTStYRvSRORLMlQA== + "@aws-sdk/client-sts" "3.552.0" + "@aws-sdk/core" "3.552.0" + "@aws-sdk/credential-provider-node" "3.552.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + +"@aws-sdk/client-iam@^3.535.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-iam/-/client-iam-3.552.0.tgz#36babf847a36aced8e52399d7e6fd27a25ae5c6f" + integrity sha512-lRebSkFznHPq3LclO9cI4trWAfDQOMFglz8kUQgYQS7eafVXKvOSCPdht6QY5o6L1KkU7MlNaN6tS6yoNlk5gQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.433.0" - "@aws-sdk/credential-provider-node" "3.433.0" - "@aws-sdk/middleware-host-header" "3.433.0" - "@aws-sdk/middleware-logger" "3.433.0" - "@aws-sdk/middleware-recursion-detection" "3.433.0" - "@aws-sdk/middleware-signing" "3.433.0" - "@aws-sdk/middleware-user-agent" "3.433.0" - "@aws-sdk/region-config-resolver" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@aws-sdk/util-endpoints" "3.433.0" - "@aws-sdk/util-user-agent-browser" "3.433.0" - "@aws-sdk/util-user-agent-node" "3.433.0" - "@smithy/config-resolver" "^2.0.16" - "@smithy/fetch-http-handler" "^2.2.4" - "@smithy/hash-node" "^2.0.12" - "@smithy/invalid-dependency" "^2.0.12" - "@smithy/middleware-content-length" "^2.0.14" - "@smithy/middleware-endpoint" "^2.1.3" - "@smithy/middleware-retry" "^2.0.18" - "@smithy/middleware-serde" "^2.0.12" - "@smithy/middleware-stack" "^2.0.6" - "@smithy/node-config-provider" "^2.1.3" - "@smithy/node-http-handler" "^2.1.8" - "@smithy/protocol-http" "^3.0.8" - "@smithy/smithy-client" "^2.1.12" - "@smithy/types" "^2.4.0" - "@smithy/url-parser" "^2.0.12" - "@smithy/util-base64" "^2.0.0" - "@smithy/util-body-length-browser" "^2.0.0" - "@smithy/util-body-length-node" "^2.1.0" - "@smithy/util-defaults-mode-browser" "^2.0.16" - "@smithy/util-defaults-mode-node" "^2.0.21" - "@smithy/util-retry" "^2.0.5" - "@smithy/util-utf8" "^2.0.0" - "@smithy/util-waiter" "^2.0.12" - fast-xml-parser "4.2.5" - tslib "^2.5.0" - -"@aws-sdk/client-lambda@^3.427.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.433.0.tgz#5d0f202033082b88fb4f3997a57160363657a689" - integrity sha512-nmEw1729u8O20wCh9brqQCZqHM1MfDPTWvf5z/hcSnFHSPNz0ok/KkenIxTB5dFTOVjC5OeRHbmkAFwUKoKxiw== + "@aws-sdk/client-sts" "3.552.0" + "@aws-sdk/core" "3.552.0" + "@aws-sdk/credential-provider-node" "3.552.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + "@smithy/util-waiter" "^2.2.0" + tslib "^2.6.2" + +"@aws-sdk/client-lambda@^3.536.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.552.0.tgz#5c0bd15fb451e64d2a11086ee6ab230d445baab9" + integrity sha512-M/xrWjP+URM0cLccQOtKELEmgyOT83iz3yQkfDSsxDAuh8fmifPx7DFTHrmy9FXL/GsnBWHPmoZToZsqIPN7YQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.433.0" - "@aws-sdk/credential-provider-node" "3.433.0" - "@aws-sdk/middleware-host-header" "3.433.0" - "@aws-sdk/middleware-logger" "3.433.0" - "@aws-sdk/middleware-recursion-detection" "3.433.0" - "@aws-sdk/middleware-signing" "3.433.0" - "@aws-sdk/middleware-user-agent" "3.433.0" - "@aws-sdk/region-config-resolver" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@aws-sdk/util-endpoints" "3.433.0" - "@aws-sdk/util-user-agent-browser" "3.433.0" - "@aws-sdk/util-user-agent-node" "3.433.0" - "@smithy/config-resolver" "^2.0.16" - "@smithy/eventstream-serde-browser" "^2.0.12" - "@smithy/eventstream-serde-config-resolver" "^2.0.12" - "@smithy/eventstream-serde-node" "^2.0.12" - "@smithy/fetch-http-handler" "^2.2.4" - "@smithy/hash-node" "^2.0.12" - "@smithy/invalid-dependency" "^2.0.12" - "@smithy/middleware-content-length" "^2.0.14" - "@smithy/middleware-endpoint" "^2.1.3" - "@smithy/middleware-retry" "^2.0.18" - "@smithy/middleware-serde" "^2.0.12" - "@smithy/middleware-stack" "^2.0.6" - "@smithy/node-config-provider" "^2.1.3" - "@smithy/node-http-handler" "^2.1.8" - "@smithy/protocol-http" "^3.0.8" - "@smithy/smithy-client" "^2.1.12" - "@smithy/types" "^2.4.0" - "@smithy/url-parser" "^2.0.12" - "@smithy/util-base64" "^2.0.0" - "@smithy/util-body-length-browser" "^2.0.0" - "@smithy/util-body-length-node" "^2.1.0" - "@smithy/util-defaults-mode-browser" "^2.0.16" - "@smithy/util-defaults-mode-node" "^2.0.21" - "@smithy/util-retry" "^2.0.5" - "@smithy/util-stream" "^2.0.17" - "@smithy/util-utf8" "^2.0.0" - "@smithy/util-waiter" "^2.0.12" - tslib "^2.5.0" + "@aws-sdk/client-sts" "3.552.0" + "@aws-sdk/core" "3.552.0" + "@aws-sdk/credential-provider-node" "3.552.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/eventstream-serde-browser" "^2.2.0" + "@smithy/eventstream-serde-config-resolver" "^2.2.0" + "@smithy/eventstream-serde-node" "^2.2.0" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-stream" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + "@smithy/util-waiter" "^2.2.0" + tslib "^2.6.2" "@aws-sdk/client-s3@^3.347.1": version "3.428.0" @@ -478,48 +492,97 @@ fast-xml-parser "4.2.5" tslib "^2.5.0" -"@aws-sdk/client-sfn@^3.427.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sfn/-/client-sfn-3.433.0.tgz#2d1cf2b81200b7f81db2dff5c95edcd708436639" - integrity sha512-CALl71hbJMiXu94WFBPnjsbZXNcJwSx5Ho19/GqckrUIWxh4Fg2w0jPwPxq2BU12IghI4OCXY2jrYPw/nx4i0g== +"@aws-sdk/client-sfn@^3.535.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sfn/-/client-sfn-3.552.0.tgz#a27c7ce1f51834f17ee75e9847ac61fe0d040159" + integrity sha512-7+kyeBhwE9efZEDbPNTFPok5WFVMHQcyoTR1bV+cTpEJQJtjE1zwuCTtJpHMpLHrDf007Fzdnv4CF/9OrxxEbQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.433.0" - "@aws-sdk/credential-provider-node" "3.433.0" - "@aws-sdk/middleware-host-header" "3.433.0" - "@aws-sdk/middleware-logger" "3.433.0" - "@aws-sdk/middleware-recursion-detection" "3.433.0" - "@aws-sdk/middleware-signing" "3.433.0" - "@aws-sdk/middleware-user-agent" "3.433.0" - "@aws-sdk/region-config-resolver" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@aws-sdk/util-endpoints" "3.433.0" - "@aws-sdk/util-user-agent-browser" "3.433.0" - "@aws-sdk/util-user-agent-node" "3.433.0" - "@smithy/config-resolver" "^2.0.16" - "@smithy/fetch-http-handler" "^2.2.4" - "@smithy/hash-node" "^2.0.12" - "@smithy/invalid-dependency" "^2.0.12" - "@smithy/middleware-content-length" "^2.0.14" - "@smithy/middleware-endpoint" "^2.1.3" - "@smithy/middleware-retry" "^2.0.18" - "@smithy/middleware-serde" "^2.0.12" - "@smithy/middleware-stack" "^2.0.6" - "@smithy/node-config-provider" "^2.1.3" - "@smithy/node-http-handler" "^2.1.8" - "@smithy/protocol-http" "^3.0.8" - "@smithy/smithy-client" "^2.1.12" - "@smithy/types" "^2.4.0" - "@smithy/url-parser" "^2.0.12" - "@smithy/util-base64" "^2.0.0" - "@smithy/util-body-length-browser" "^2.0.0" - "@smithy/util-body-length-node" "^2.1.0" - "@smithy/util-defaults-mode-browser" "^2.0.16" - "@smithy/util-defaults-mode-node" "^2.0.21" - "@smithy/util-retry" "^2.0.5" - "@smithy/util-utf8" "^2.0.0" - tslib "^2.5.0" + "@aws-sdk/client-sts" "3.552.0" + "@aws-sdk/core" "3.552.0" + "@aws-sdk/credential-provider-node" "3.552.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + uuid "^9.0.1" + +"@aws-sdk/client-sso-oidc@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.552.0.tgz#3215792bbce40a4373d6fca711e4b58fbf794284" + integrity sha512-6JYTgN/n4xTm3Z+JhEZq06pyYsgo7heYDmR+0smmauQS02Eu8lvUc2jPs/0GDAmty7J4tq3gS6TRwvf7181C2w== + dependencies: + "@aws-crypto/sha256-browser" "3.0.0" + "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/client-sts" "3.552.0" + "@aws-sdk/core" "3.552.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" "@aws-sdk/client-sso@3.428.0": version "3.428.0" @@ -561,45 +624,49 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.5.0" -"@aws-sdk/client-sso@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.433.0.tgz#9d06768fab4d46efa77fa79142c173580be479e6" - integrity sha512-L7ksMP7UnYH+w52ly+m+s5vk8662VtyqJ+UduFEMPqKUHTFEm7w+CCw4Xfk3hl5GlVvqPvYWqBqv8eLKSHpCEQ== +"@aws-sdk/client-sso@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.552.0.tgz#dea1533cc74e80f9bb49f8926c21912497a08616" + integrity sha512-IAjRj5gcuyoPe/OhciMY/UyW8C1kyXSUJFagxvbeSv8q0mEfaPBVjGgz2xSYRFhhZr3gFlGCS9SiukwOL2/VoA== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/middleware-host-header" "3.433.0" - "@aws-sdk/middleware-logger" "3.433.0" - "@aws-sdk/middleware-recursion-detection" "3.433.0" - "@aws-sdk/middleware-user-agent" "3.433.0" - "@aws-sdk/region-config-resolver" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@aws-sdk/util-endpoints" "3.433.0" - "@aws-sdk/util-user-agent-browser" "3.433.0" - "@aws-sdk/util-user-agent-node" "3.433.0" - "@smithy/config-resolver" "^2.0.16" - "@smithy/fetch-http-handler" "^2.2.4" - "@smithy/hash-node" "^2.0.12" - "@smithy/invalid-dependency" "^2.0.12" - "@smithy/middleware-content-length" "^2.0.14" - "@smithy/middleware-endpoint" "^2.1.3" - "@smithy/middleware-retry" "^2.0.18" - "@smithy/middleware-serde" "^2.0.12" - "@smithy/middleware-stack" "^2.0.6" - "@smithy/node-config-provider" "^2.1.3" - "@smithy/node-http-handler" "^2.1.8" - "@smithy/protocol-http" "^3.0.8" - "@smithy/smithy-client" "^2.1.12" - "@smithy/types" "^2.4.0" - "@smithy/url-parser" "^2.0.12" - "@smithy/util-base64" "^2.0.0" - "@smithy/util-body-length-browser" "^2.0.0" - "@smithy/util-body-length-node" "^2.1.0" - "@smithy/util-defaults-mode-browser" "^2.0.16" - "@smithy/util-defaults-mode-node" "^2.0.21" - "@smithy/util-retry" "^2.0.5" - "@smithy/util-utf8" "^2.0.0" - tslib "^2.5.0" + "@aws-sdk/core" "3.552.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" "@aws-sdk/client-sts@3.428.0": version "3.428.0" @@ -645,60 +712,73 @@ fast-xml-parser "4.2.5" tslib "^2.5.0" -"@aws-sdk/client-sts@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.433.0.tgz#8155f058cd4f0259dc4377050b303b474744cd03" - integrity sha512-hQ+NLIcA1KRJ2qPdrtkJ3fOEVnehLLMlnB/I5mjg9K2UKjuiOufLao6tc5SyW9fseIL9AdX3fjJ8Unhg+y1RWg== +"@aws-sdk/client-sts@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.552.0.tgz#ae6879022644348596e822e80accb468676a2005" + integrity sha512-rOZlAj8GyFgUBESyKezes67A8Kj5+KjRhfBHMXrkcM5h9UOIz5q7QdkSQOmzWwRoPDmmAqb6t+y041/76TnPEg== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/credential-provider-node" "3.433.0" - "@aws-sdk/middleware-host-header" "3.433.0" - "@aws-sdk/middleware-logger" "3.433.0" - "@aws-sdk/middleware-recursion-detection" "3.433.0" - "@aws-sdk/middleware-sdk-sts" "3.433.0" - "@aws-sdk/middleware-signing" "3.433.0" - "@aws-sdk/middleware-user-agent" "3.433.0" - "@aws-sdk/region-config-resolver" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@aws-sdk/util-endpoints" "3.433.0" - "@aws-sdk/util-user-agent-browser" "3.433.0" - "@aws-sdk/util-user-agent-node" "3.433.0" - "@smithy/config-resolver" "^2.0.16" - "@smithy/fetch-http-handler" "^2.2.4" - "@smithy/hash-node" "^2.0.12" - "@smithy/invalid-dependency" "^2.0.12" - "@smithy/middleware-content-length" "^2.0.14" - "@smithy/middleware-endpoint" "^2.1.3" - "@smithy/middleware-retry" "^2.0.18" - "@smithy/middleware-serde" "^2.0.12" - "@smithy/middleware-stack" "^2.0.6" - "@smithy/node-config-provider" "^2.1.3" - "@smithy/node-http-handler" "^2.1.8" - "@smithy/protocol-http" "^3.0.8" - "@smithy/smithy-client" "^2.1.12" - "@smithy/types" "^2.4.0" - "@smithy/url-parser" "^2.0.12" - "@smithy/util-base64" "^2.0.0" - "@smithy/util-body-length-browser" "^2.0.0" - "@smithy/util-body-length-node" "^2.1.0" - "@smithy/util-defaults-mode-browser" "^2.0.16" - "@smithy/util-defaults-mode-node" "^2.0.21" - "@smithy/util-retry" "^2.0.5" - "@smithy/util-utf8" "^2.0.0" + "@aws-sdk/core" "3.552.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + +"@aws-sdk/core@3.552.0", "@aws-sdk/core@^3.535.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.552.0.tgz#7f744d7cd303d1fa60006d81f75a6f999b64bfb0" + integrity sha512-T7ovljf6fCvIHG9SOSZqGmbVbqZPXPywLAcU+onk/fYLZJj6kjfzKZzSAUBI0nO1OKpuP/nCHaCp51NLWNqsnw== + dependencies: + "@smithy/core" "^1.4.2" + "@smithy/protocol-http" "^3.3.0" + "@smithy/signature-v4" "^2.2.1" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" fast-xml-parser "4.2.5" - tslib "^2.5.0" + tslib "^2.6.2" -"@aws-sdk/credential-provider-cognito-identity@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.433.0.tgz#4d3569be6f81ccd7f10dcfea1a6ed7af8028b342" - integrity sha512-zBTrVbruYkPY4/YrUNP11mHbuVwGx7lxfo/Hlul7iUFhRbVhd/Xg3EYi6fgdTojEWEhY4SltFwVFUrzVAm8V5g== +"@aws-sdk/credential-provider-cognito-identity@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.552.0.tgz#2b56380ede0218a84d448d5de7e3da898fa8ac51" + integrity sha512-od45t2yc5d/vUqpWv76VgbqVc9yY5i0rKsH5U6nen6kpyZhtPlR/Q/Fwsx+TEsg8HH/GSzA4axBedL2qp8Owdg== dependencies: - "@aws-sdk/client-cognito-identity" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@smithy/property-provider" "^2.0.0" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" + "@aws-sdk/client-cognito-identity" "3.552.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/credential-provider-env@3.428.0": version "3.428.0" @@ -710,29 +790,30 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/credential-provider-env@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.433.0.tgz#7cceca1002ba2e79e10a9dfb119442bea7b88e7c" - integrity sha512-Vl7Qz5qYyxBurMn6hfSiNJeUHSqfVUlMt0C1Bds3tCkl3IzecRWwyBOlxtxO3VCrgVeW3HqswLzCvhAFzPH6nQ== - dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/property-provider" "^2.0.0" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" - -"@aws-sdk/credential-provider-http@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.433.0.tgz#2fdb52dcb9690103fc29269636745e0265ec3105" - integrity sha512-HA3Op+tT/EvJnRTzeURFbygNUX5wx5wlD84h4RgWpDa6x3G0lhI1wxCUR5/+qzIpF5vC7E3Q9/yu7ln07RmZlg== - dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/fetch-http-handler" "^2.2.4" - "@smithy/node-http-handler" "^2.1.8" - "@smithy/property-provider" "^2.0.0" - "@smithy/protocol-http" "^3.0.8" - "@smithy/smithy-client" "^2.1.12" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" +"@aws-sdk/credential-provider-env@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.535.0.tgz#26248e263a8107953d5496cb3760d4e7c877abcf" + integrity sha512-XppwO8c0GCGSAvdzyJOhbtktSEaShg14VJKg8mpMa1XcgqzmcqqHQjtDWbx5rZheY1VdpXZhpEzJkB6LpQejpA== + dependencies: + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-http@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.552.0.tgz#ecc88d02cba95621887e6b85b2583e756ad29eb6" + integrity sha512-vsmu7Cz1i45pFEqzVb4JcFmAmVnWFNLsGheZc8SCptlqCO5voETrZZILHYIl4cjKkSDk3pblBOf0PhyjqWW6WQ== + dependencies: + "@aws-sdk/types" "3.535.0" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/util-stream" "^2.2.0" + tslib "^2.6.2" "@aws-sdk/credential-provider-ini@3.428.0": version "3.428.0" @@ -750,21 +831,22 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/credential-provider-ini@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.433.0.tgz#2fa3da08739ab9364702fd4a54c5f50143ef0bea" - integrity sha512-T+YhCOORyA4+i4T86FfFCmi/jPsmLOP6GAtScHp/K8XzB9XuVvJSZ+T8SUKeW6/9G9z3Az7dqeBVLcMdC6fFDA== - dependencies: - "@aws-sdk/credential-provider-env" "3.433.0" - "@aws-sdk/credential-provider-process" "3.433.0" - "@aws-sdk/credential-provider-sso" "3.433.0" - "@aws-sdk/credential-provider-web-identity" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@smithy/credential-provider-imds" "^2.0.0" - "@smithy/property-provider" "^2.0.0" - "@smithy/shared-ini-file-loader" "^2.0.6" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" +"@aws-sdk/credential-provider-ini@3.552.0", "@aws-sdk/credential-provider-ini@^3.535.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.552.0.tgz#436f328ea0213efe3231354248ab0d82dade4345" + integrity sha512-/Z9y+P4M/eZA/5hGH3Kwm6TOIAiVtsIo7sC/x7hZPXn/IMJQ2QmxzeMozVqMWzx8+2zUA/dmgmWnHoVvH4R/jg== + dependencies: + "@aws-sdk/client-sts" "3.552.0" + "@aws-sdk/credential-provider-env" "3.535.0" + "@aws-sdk/credential-provider-process" "3.535.0" + "@aws-sdk/credential-provider-sso" "3.552.0" + "@aws-sdk/credential-provider-web-identity" "3.552.0" + "@aws-sdk/types" "3.535.0" + "@smithy/credential-provider-imds" "^2.3.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/credential-provider-node@3.428.0": version "3.428.0" @@ -783,22 +865,23 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/credential-provider-node@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.433.0.tgz#76bfb857b9d6339cc11223660afb2d7d925ac9da" - integrity sha512-uOTBJszqGJIX5SrH2YdN501cv9rW4ghuSkasxI9DL+sVV5YRMd/bwu6I3PphRyK7z4dosDEbJ1xoIuVR/W04HQ== - dependencies: - "@aws-sdk/credential-provider-env" "3.433.0" - "@aws-sdk/credential-provider-ini" "3.433.0" - "@aws-sdk/credential-provider-process" "3.433.0" - "@aws-sdk/credential-provider-sso" "3.433.0" - "@aws-sdk/credential-provider-web-identity" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@smithy/credential-provider-imds" "^2.0.0" - "@smithy/property-provider" "^2.0.0" - "@smithy/shared-ini-file-loader" "^2.0.6" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" +"@aws-sdk/credential-provider-node@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.552.0.tgz#7b25882a5694f50b288b284b1885ea3e138970fa" + integrity sha512-GUH5awokiR4FcALeQxOrNZtDKJgzEza6NW9HYxAaHt0LNSHCjG21zMFDPYAXlDjlPP9AIdWmVvYrfJoPJI28AQ== + dependencies: + "@aws-sdk/credential-provider-env" "3.535.0" + "@aws-sdk/credential-provider-http" "3.552.0" + "@aws-sdk/credential-provider-ini" "3.552.0" + "@aws-sdk/credential-provider-process" "3.535.0" + "@aws-sdk/credential-provider-sso" "3.552.0" + "@aws-sdk/credential-provider-web-identity" "3.552.0" + "@aws-sdk/types" "3.535.0" + "@smithy/credential-provider-imds" "^2.3.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/credential-provider-process@3.428.0": version "3.428.0" @@ -811,16 +894,16 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/credential-provider-process@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.433.0.tgz#dd51c92480ed620e4c3f989852ee408ab1209d59" - integrity sha512-W7FcGlQjio9Y/PepcZGRyl5Bpwb0uWU7qIUCh+u4+q2mW4D5ZngXg8V/opL9/I/p4tUH9VXZLyLGwyBSkdhL+A== +"@aws-sdk/credential-provider-process@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.535.0.tgz#ea1e8a38a32e36bbdc3f75eb03352e6eafa0c659" + integrity sha512-9O1OaprGCnlb/kYl8RwmH7Mlg8JREZctB8r9sa1KhSsWFq/SWO0AuJTyowxD7zL5PkeS4eTvzFFHWCa3OO5epA== dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/property-provider" "^2.0.0" - "@smithy/shared-ini-file-loader" "^2.0.6" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/credential-provider-sso@3.428.0": version "3.428.0" @@ -835,18 +918,18 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/credential-provider-sso@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.433.0.tgz#6de1406270c74004772f6b1c738a3977f09d9860" - integrity sha512-vuc2X7q/1HUAO/NowfnNMpRDoHw8H2lyZZzUc0lmamy6PDrEFBi/VTm1nStGPuS9egCFrYlkRHsfp50ukYGa5w== +"@aws-sdk/credential-provider-sso@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.552.0.tgz#dd076e6944494812b23e293ead759e859a91d70e" + integrity sha512-h+xyWG4HMqf4SFzilpK1u50fO2aIBRg3nwuXRy9v5E2qdpJgZS2JXibO1jNHd+JXq4qjs2YG1WK2fGcdxZJ2bQ== dependencies: - "@aws-sdk/client-sso" "3.433.0" - "@aws-sdk/token-providers" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@smithy/property-provider" "^2.0.0" - "@smithy/shared-ini-file-loader" "^2.0.6" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" + "@aws-sdk/client-sso" "3.552.0" + "@aws-sdk/token-providers" "3.552.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/credential-provider-web-identity@3.428.0": version "3.428.0" @@ -858,37 +941,38 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/credential-provider-web-identity@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.433.0.tgz#32403ba9cc47d3c46500f3c8e5e0041d20e4dbe8" - integrity sha512-RlwjP1I5wO+aPpwyCp23Mk8nmRbRL33hqRASy73c4JA2z2YiRua+ryt6MalIxehhwQU6xvXUKulJnPG9VaMFZg== - dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/property-provider" "^2.0.0" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" - -"@aws-sdk/credential-providers@^3.427.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.433.0.tgz#7d154bd2e623fe3175001f3b7552233ff77212fa" - integrity sha512-GKsdnFiab+uiwUCzEZKRVa0/h2Ov/Lft/69DJQtFqkM+RHT/XXhAOA9noZmCOyta6UlRbj3P5ep28oQOTc1czw== - dependencies: - "@aws-sdk/client-cognito-identity" "3.433.0" - "@aws-sdk/client-sso" "3.433.0" - "@aws-sdk/client-sts" "3.433.0" - "@aws-sdk/credential-provider-cognito-identity" "3.433.0" - "@aws-sdk/credential-provider-env" "3.433.0" - "@aws-sdk/credential-provider-http" "3.433.0" - "@aws-sdk/credential-provider-ini" "3.433.0" - "@aws-sdk/credential-provider-node" "3.433.0" - "@aws-sdk/credential-provider-process" "3.433.0" - "@aws-sdk/credential-provider-sso" "3.433.0" - "@aws-sdk/credential-provider-web-identity" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@smithy/credential-provider-imds" "^2.0.0" - "@smithy/property-provider" "^2.0.0" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" +"@aws-sdk/credential-provider-web-identity@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.552.0.tgz#213a8e5832a95d494b6a55ed9b1eefcc774b0cff" + integrity sha512-6jXfXaLKDy3S4LHR8ZXIIZw5B80uiYjnPp4bmqmY18LGeoZxmkJ/SfkwypVruezCu+GpA+IubmIbc5TQi6BCAw== + dependencies: + "@aws-sdk/client-sts" "3.552.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@aws-sdk/credential-providers@^3.535.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.552.0.tgz#cda713016c555a87dafad8b20bb0c881b4e5469c" + integrity sha512-aAmxaLwv8wf06XyuMbdxrQaVYAo7oASB6TaxI3rldl3xkhLLWNuvk7IpTnrKwD5+HakGkelyy7lPHRTL/8RTCA== + dependencies: + "@aws-sdk/client-cognito-identity" "3.552.0" + "@aws-sdk/client-sso" "3.552.0" + "@aws-sdk/client-sts" "3.552.0" + "@aws-sdk/credential-provider-cognito-identity" "3.552.0" + "@aws-sdk/credential-provider-env" "3.535.0" + "@aws-sdk/credential-provider-http" "3.552.0" + "@aws-sdk/credential-provider-ini" "3.552.0" + "@aws-sdk/credential-provider-node" "3.552.0" + "@aws-sdk/credential-provider-process" "3.535.0" + "@aws-sdk/credential-provider-sso" "3.552.0" + "@aws-sdk/credential-provider-web-identity" "3.552.0" + "@aws-sdk/types" "3.535.0" + "@smithy/credential-provider-imds" "^2.3.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/middleware-bucket-endpoint@3.428.0": version "3.428.0" @@ -937,15 +1021,15 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/middleware-host-header@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.433.0.tgz#3b6687ee4021c2b56c96cff61b45a33fb762b1c7" - integrity sha512-mBTq3UWv1UzeHG+OfUQ2MB/5GEkt5LTKFaUqzL7ESwzW8XtpBgXnjZvIwu3Vcd3sEetMwijwaGiJhY0ae/YyaA== +"@aws-sdk/middleware-host-header@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.535.0.tgz#d5264f813592f5e77df25e5a14bbb0e6441812db" + integrity sha512-0h6TWjBWtDaYwHMQJI9ulafeS4lLaw1vIxRjbpH0svFRt6Eve+Sy8NlVhECfTU2hNz/fLubvrUxsXoThaLBIew== dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/protocol-http" "^3.0.8" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/middleware-location-constraint@3.428.0": version "3.428.0" @@ -965,14 +1049,14 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/middleware-logger@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.433.0.tgz#fcd4e31a8f134861cd519477b959c218a3600186" - integrity sha512-We346Fb5xGonTGVZC9Nvqtnqy74VJzYuTLLiuuftA5sbNzftBDy/22QCfvYSTOAl3bvif+dkDUzQY2ihc5PwOQ== +"@aws-sdk/middleware-logger@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.535.0.tgz#1a8ffd6c368edd6cb32e1edf7b1dced95c1820ee" + integrity sha512-huNHpONOrEDrdRTvSQr1cJiRMNf0S52NDXtaPzdxiubTkP+vni2MohmZANMOai/qT0olmEVX01LhZ0ZAOgmg6A== dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/middleware-recursion-detection@3.428.0": version "3.428.0" @@ -984,15 +1068,15 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/middleware-recursion-detection@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.433.0.tgz#5b4b7878ea46c70f507c9ea7c30ad0e5ee4ae6bf" - integrity sha512-HEvYC9PQlWY/ccUYtLvAlwwf1iCif2TSAmLNr3YTBRVa98x6jKL0hlCrHWYklFeqOGSKy6XhE+NGJMUII0/HaQ== +"@aws-sdk/middleware-recursion-detection@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.535.0.tgz#6aa1e1bd1e84730d58a73021b745e20d4341a92d" + integrity sha512-am2qgGs+gwqmR4wHLWpzlZ8PWhm4ktj5bYSgDrsOfjhdBlWNxvPoID9/pDAz5RWL48+oH7I6SQzMqxXsFDikrw== dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/protocol-http" "^3.0.8" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/middleware-sdk-s3@3.428.0": version "3.428.0" @@ -1016,16 +1100,6 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/middleware-sdk-sts@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.433.0.tgz#9b30f17a922ecc5fd46b93f1edcd20d7146b814f" - integrity sha512-ORYbJnBejUyonFl5FwIqhvI3Cq6sAp9j+JpkKZtFNma9tFPdrhmYgfCeNH32H/wGTQV/tUoQ3luh0gA4cuk6DA== - dependencies: - "@aws-sdk/middleware-signing" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" - "@aws-sdk/middleware-signing@3.428.0": version "3.428.0" resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.428.0.tgz#ce9f21963bac8c8bb42d84dd2901628aa661b844" @@ -1039,19 +1113,6 @@ "@smithy/util-middleware" "^2.0.4" tslib "^2.5.0" -"@aws-sdk/middleware-signing@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.433.0.tgz#670557ace5b97729dbabb6a991815e44eb0ef03b" - integrity sha512-jxPvt59NZo/epMNLNTu47ikmP8v0q217I6bQFGJG7JVFnfl36zDktMwGw+0xZR80qiK47/2BWrNpta61Zd2FxQ== - dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/property-provider" "^2.0.0" - "@smithy/protocol-http" "^3.0.8" - "@smithy/signature-v4" "^2.0.0" - "@smithy/types" "^2.4.0" - "@smithy/util-middleware" "^2.0.5" - tslib "^2.5.0" - "@aws-sdk/middleware-ssec@3.428.0": version "3.428.0" resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.428.0.tgz#9a0c631401c5c4bf3acaeedd7fed6f808b5f5fd5" @@ -1072,16 +1133,16 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/middleware-user-agent@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.433.0.tgz#21b874708e015b6f5cc33bf0545d2a0f9d9ab3a5" - integrity sha512-jMgA1jHfisBK4oSjMKrtKEZf0sl2vzADivkFmyZFzORpSZxBnF6hC21RjaI+70LJLcc9rSCzLgcoz5lHb9LLDg== +"@aws-sdk/middleware-user-agent@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.540.0.tgz#4981c64c1eeb6b5c453bce02d060b8c71d44994d" + integrity sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ== dependencies: - "@aws-sdk/types" "3.433.0" - "@aws-sdk/util-endpoints" "3.433.0" - "@smithy/protocol-http" "^3.0.8" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/region-config-resolver@3.428.0": version "3.428.0" @@ -1094,16 +1155,17 @@ "@smithy/util-middleware" "^2.0.4" tslib "^2.5.0" -"@aws-sdk/region-config-resolver@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.433.0.tgz#37eb5f40db8af7ba9361aeb28c62b45421e780f0" - integrity sha512-xpjRjCZW+CDFdcMmmhIYg81ST5UAnJh61IHziQEk0FXONrg4kjyYPZAOjEdzXQ+HxJQuGQLKPhRdzxmQnbX7pg== +"@aws-sdk/region-config-resolver@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.535.0.tgz#20a30fb5fbbe27ab70f2ed16327bae7e367b5cec" + integrity sha512-IXOznDiaItBjsQy4Fil0kzX/J3HxIOknEphqHbOfUf+LpA5ugcsxuQQONrbEQusCBnfJyymrldBvBhFmtlU9Wg== dependencies: - "@smithy/node-config-provider" "^2.1.3" - "@smithy/types" "^2.4.0" - "@smithy/util-config-provider" "^2.0.0" - "@smithy/util-middleware" "^2.0.5" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/types" "^2.12.0" + "@smithy/util-config-provider" "^2.3.0" + "@smithy/util-middleware" "^2.2.0" + tslib "^2.6.2" "@aws-sdk/signature-v4-multi-region@3.428.0": version "3.428.0" @@ -1157,46 +1219,17 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.5.0" -"@aws-sdk/token-providers@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.433.0.tgz#de5c33a9fa660b64387afea7a89f495a3065ff2a" - integrity sha512-Q6aYVaQKB+CkBLHQQlN8MHVpOzZv9snRfVz7SxIpdbHkRuGEHiLliCY3fg6Sonvu3AKEPERPuHcaC75tnNpOBw== +"@aws-sdk/token-providers@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.552.0.tgz#e0cfbeb1ff9fb212ab214f2ade9827e1032fdf42" + integrity sha512-5dNE2KqtgkT+DQXfkSmzmVSB72LpjSIK86lLD9LeQ1T+b0gfEd74MAl/AGC15kQdKLg5I3LlN5q32f1fkmYR8g== dependencies: - "@aws-crypto/sha256-browser" "3.0.0" - "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/middleware-host-header" "3.433.0" - "@aws-sdk/middleware-logger" "3.433.0" - "@aws-sdk/middleware-recursion-detection" "3.433.0" - "@aws-sdk/middleware-user-agent" "3.433.0" - "@aws-sdk/types" "3.433.0" - "@aws-sdk/util-endpoints" "3.433.0" - "@aws-sdk/util-user-agent-browser" "3.433.0" - "@aws-sdk/util-user-agent-node" "3.433.0" - "@smithy/config-resolver" "^2.0.16" - "@smithy/fetch-http-handler" "^2.2.4" - "@smithy/hash-node" "^2.0.12" - "@smithy/invalid-dependency" "^2.0.12" - "@smithy/middleware-content-length" "^2.0.14" - "@smithy/middleware-endpoint" "^2.1.3" - "@smithy/middleware-retry" "^2.0.18" - "@smithy/middleware-serde" "^2.0.12" - "@smithy/middleware-stack" "^2.0.6" - "@smithy/node-config-provider" "^2.1.3" - "@smithy/node-http-handler" "^2.1.8" - "@smithy/property-provider" "^2.0.0" - "@smithy/protocol-http" "^3.0.8" - "@smithy/shared-ini-file-loader" "^2.0.6" - "@smithy/smithy-client" "^2.1.12" - "@smithy/types" "^2.4.0" - "@smithy/url-parser" "^2.0.12" - "@smithy/util-base64" "^2.0.0" - "@smithy/util-body-length-browser" "^2.0.0" - "@smithy/util-body-length-node" "^2.1.0" - "@smithy/util-defaults-mode-browser" "^2.0.16" - "@smithy/util-defaults-mode-node" "^2.0.21" - "@smithy/util-retry" "^2.0.5" - "@smithy/util-utf8" "^2.0.0" - tslib "^2.5.0" + "@aws-sdk/client-sso-oidc" "3.552.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/types@3.428.0": version "3.428.0" @@ -1206,7 +1239,15 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/types@3.433.0", "@aws-sdk/types@^3.222.0": +"@aws-sdk/types@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.535.0.tgz#5e6479f31299dd9df170e63f4d10fe739008cf04" + integrity sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@aws-sdk/types@^3.222.0": version "3.433.0" resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.433.0.tgz#0f94eae2a4a3525ca872c9ab04e143c01806d755" integrity sha512-0jEE2mSrNDd8VGFjTc1otYrwYPIkzZJEIK90ZxisKvQ/EURGBhNzWn7ejWB9XCMFT6XumYLBR0V9qq5UPisWtA== @@ -1229,13 +1270,15 @@ "@aws-sdk/types" "3.428.0" tslib "^2.5.0" -"@aws-sdk/util-endpoints@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.433.0.tgz#d1e00b3f0d7c3f77597787aef265fe1b247a1083" - integrity sha512-LFNUh9FH7RMtYjSjPGz9lAJQMzmJ3RcXISzc5X5k2R/9mNwMK7y1k2VAfvx+RbuDbll6xwsXlgv6QHcxVdF2zw== +"@aws-sdk/util-endpoints@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.540.0.tgz#a7fea1d2a5e64623353aaa6ee32dbb86ab9cd3f8" + integrity sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw== dependencies: - "@aws-sdk/types" "3.433.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/types" "^2.12.0" + "@smithy/util-endpoints" "^1.2.0" + tslib "^2.6.2" "@aws-sdk/util-locate-window@^3.0.0": version "3.310.0" @@ -1254,15 +1297,15 @@ bowser "^2.11.0" tslib "^2.5.0" -"@aws-sdk/util-user-agent-browser@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.433.0.tgz#b5ed0c0cca0db34a2c1c2ffc1b65e7cdd8dc88ff" - integrity sha512-2Cf/Lwvxbt5RXvWFXrFr49vXv0IddiUwrZoAiwhDYxvsh+BMnh+NUFot+ZQaTrk/8IPZVDeLPWZRdVy00iaVXQ== +"@aws-sdk/util-user-agent-browser@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.535.0.tgz#d67d72e8b933051620f18ddb1c2be225f79f588f" + integrity sha512-RWMcF/xV5n+nhaA/Ff5P3yNP3Kur/I+VNZngog4TEs92oB/nwOdAg/2JL8bVAhUbMrjTjpwm7PItziYFQoqyig== dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/types" "^2.4.0" + "@aws-sdk/types" "3.535.0" + "@smithy/types" "^2.12.0" bowser "^2.11.0" - tslib "^2.5.0" + tslib "^2.6.2" "@aws-sdk/util-user-agent-node@3.428.0": version "3.428.0" @@ -1274,15 +1317,15 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@aws-sdk/util-user-agent-node@3.433.0": - version "3.433.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.433.0.tgz#422f7f8f956bdcd97082869bc7b6520d7720b9de" - integrity sha512-yT1tO4MbbsUBLl5+S+jVv8wxiAtP5TKjKib9B2KQ2x0OtWWTrIf2o+IZK8va+zQqdV4MVMjezdxdE20hOdB4yQ== +"@aws-sdk/util-user-agent-node@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.535.0.tgz#f5c26fb6f3f561d3cf35f96f303b1775afad0a5b" + integrity sha512-dRek0zUuIT25wOWJlsRm97nTkUlh1NDcLsQZIN2Y8KxhwoXXWtJs5vaDPT+qAg+OpcNj80i1zLR/CirqlFg/TQ== dependencies: - "@aws-sdk/types" "3.433.0" - "@smithy/node-config-provider" "^2.1.3" - "@smithy/types" "^2.4.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/util-utf8-browser@^3.0.0": version "3.259.0" @@ -1884,11 +1927,6 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef" integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== -"@babel/parser@^7.20.15", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" - integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== - "@babel/parser@^7.20.7": version "7.20.15" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.15.tgz#eec9f36d8eaf0948bb88c87a46784b5ee9fd0c89" @@ -1904,6 +1942,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55" integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ== +"@babel/parser@^7.22.15", "@babel/parser@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" + integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== + "@babel/parser@^7.23.9": version "7.23.9" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b" @@ -2865,51 +2908,52 @@ "@datadog/browser-rum-core" "3.6.12" tslib "^1.10.0" -"@datadog/datadog-ci@^2.22.1": - version "2.22.1" - resolved "https://registry.yarnpkg.com/@datadog/datadog-ci/-/datadog-ci-2.22.1.tgz#c4a1c0428c3101d3b0ec3eb5fd74af50f923a3be" - integrity sha512-kjAcUSw8ZjKbyL+artJUBooSshew5VY82pgjZZEsK1nr8CKcejzyyHIQh3CEWxXy8Pj/7s65bCV1pkB+7GS5Gw== - dependencies: - "@aws-sdk/client-cloudwatch-logs" "^3.427.0" - "@aws-sdk/client-iam" "^3.427.0" - "@aws-sdk/client-lambda" "^3.427.0" - "@aws-sdk/client-sfn" "^3.427.0" - "@aws-sdk/credential-providers" "^3.427.0" - "@google-cloud/logging" "^10.5.0" - "@google-cloud/run" "^0.6.0" +"@datadog/datadog-ci@^2.33.0": + version "2.33.0" + resolved "https://registry.yarnpkg.com/@datadog/datadog-ci/-/datadog-ci-2.33.0.tgz#e672e2ee286bceac62ffea230250b3edc1c9a724" + integrity sha512-WTyOH7PIDOkXOZez0pKVN1l/z5/+AmxquWK5OZl4YLvPz7aXw8NBguBn+96x1NdjbHJYz/viiBvBCaE25V7dIQ== + dependencies: + "@aws-sdk/client-cloudwatch-logs" "^3.537.0" + "@aws-sdk/client-iam" "^3.535.0" + "@aws-sdk/client-lambda" "^3.536.0" + "@aws-sdk/client-sfn" "^3.535.0" + "@aws-sdk/core" "^3.535.0" + "@aws-sdk/credential-provider-ini" "^3.535.0" + "@aws-sdk/credential-providers" "^3.535.0" + "@google-cloud/logging" "^11.0.0" + "@google-cloud/run" "^1.0.2" "@smithy/property-provider" "^2.0.12" + "@smithy/util-retry" "^2.0.4" "@types/datadog-metrics" "0.6.1" "@types/retry" "0.12.0" ajv "^8.12.0" ajv-formats "^2.1.1" async-retry "1.3.1" - axios "0.21.4" + axios "^1.6.8" chalk "3.0.0" clipanion "^3.2.1" datadog-metrics "0.9.3" deep-extend "0.6.0" deep-object-diff "^1.1.9" fast-xml-parser "^4.2.5" - form-data "3.0.0" + form-data "4.0.0" fuzzy "^0.1.3" glob "7.1.4" google-auth-library "^8.9.0" - http-proxy-agent "^7.0.0" inquirer "^8.2.5" inquirer-checkbox-plus-prompt "^1.4.2" js-yaml "3.13.1" jszip "^3.10.1" ora "5.4.1" - protobufjs "^7.2.4" - proxy-agent "^6.3.0" + proxy-agent "^6.4.0" rimraf "^3.0.2" semver "^7.5.3" simple-git "3.16.0" - ssh2 "1.14.0" + ssh2 "^1.15.0" ssh2-streams "0.4.10" sshpk "1.16.1" terminal-link "2.1.1" - tiny-async-pool "1.2.0" + tiny-async-pool "^2.1.0" typanion "^3.14.0" uuid "^9.0.0" ws "7.4.6" @@ -3244,66 +3288,66 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@google-cloud/common@^4.0.0": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-4.0.3.tgz#d4324ac83087385d727593f7e1b6d81ee66442cf" - integrity sha512-fUoMo5b8iAKbrYpneIRV3z95AlxVJPrjpevxs4SKoclngWZvTXBSGpNisF5+x5m+oNGve7jfB1e6vNBZBUs7Fw== +"@google-cloud/common@^5.0.0": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-5.0.1.tgz#762e598b0ef61e28d20e5b627141125ef73df957" + integrity sha512-7NBC5vD0au75nkctVs2vEGpdUPFs1BaHTMpeI+RVEgQSMe5/wEU6dx9p0fmZA0bj4HgdpobMKeegOcLUiEoxng== dependencies: - "@google-cloud/projectify" "^3.0.0" - "@google-cloud/promisify" "^3.0.0" + "@google-cloud/projectify" "^4.0.0" + "@google-cloud/promisify" "^4.0.0" arrify "^2.0.1" duplexify "^4.1.1" ent "^2.2.0" extend "^3.0.2" - google-auth-library "^8.0.2" - retry-request "^5.0.0" - teeny-request "^8.0.0" - -"@google-cloud/logging@^10.5.0": - version "10.5.0" - resolved "https://registry.yarnpkg.com/@google-cloud/logging/-/logging-10.5.0.tgz#486dafe42228daf4af4a35b5944abcf73314f2c8" - integrity sha512-XmlNs6B8lDZvFwFB5M55g9ch873AA2rXSuFOczQ3FOAzuyd/qksf18suFJfcrLMu8lYSr3SQhTE45FlXz4p9pg== - dependencies: - "@google-cloud/common" "^4.0.0" - "@google-cloud/paginator" "^4.0.0" - "@google-cloud/projectify" "^3.0.0" - "@google-cloud/promisify" "^3.0.0" + google-auth-library "^9.0.0" + retry-request "^7.0.0" + teeny-request "^9.0.0" + +"@google-cloud/logging@^11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@google-cloud/logging/-/logging-11.0.0.tgz#f5a408d411ccdaac6d2738ef4cb4046cc2bcff86" + integrity sha512-uQeReiVICoV5yt9J/cczNxHxqzTkLLG7yGHXCMAk/wQNVZGevT4Bi7CBWpt0aXxm044a76Aj6V08cCAlBj7UZw== + dependencies: + "@google-cloud/common" "^5.0.0" + "@google-cloud/paginator" "^5.0.0" + "@google-cloud/projectify" "^4.0.0" + "@google-cloud/promisify" "^4.0.0" arrify "^2.0.1" dot-prop "^6.0.0" eventid "^2.0.0" extend "^3.0.2" - gcp-metadata "^4.0.0" - google-auth-library "^8.0.2" - google-gax "^3.5.8" + gcp-metadata "^6.0.0" + google-auth-library "^9.0.0" + google-gax "^4.0.3" on-finished "^2.3.0" pumpify "^2.0.1" stream-events "^1.0.5" uuid "^9.0.0" -"@google-cloud/paginator@^4.0.0": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-4.0.1.tgz#5fb8793d4f84d18c50a6f2fad3dadab8d2c533ef" - integrity sha512-6G1ui6bWhNyHjmbYwavdN7mpVPRBtyDg/bfqBTAlwr413On2TnFNfDxc9UhTJctkgoCDgQXEKiRPLPR9USlkbQ== +"@google-cloud/paginator@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-5.0.0.tgz#b8cc62f151685095d11467402cbf417c41bf14e6" + integrity sha512-87aeg6QQcEPxGCOthnpUjvw4xAZ57G7pL8FS0C4e/81fr3FjkpUpibf1s2v5XGyGhUVGF4Jfg7yEcxqn2iUw1w== dependencies: arrify "^2.0.0" extend "^3.0.2" -"@google-cloud/projectify@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-3.0.0.tgz#302b25f55f674854dce65c2532d98919b118a408" - integrity sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA== +"@google-cloud/projectify@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-4.0.0.tgz#d600e0433daf51b88c1fa95ac7f02e38e80a07be" + integrity sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA== -"@google-cloud/promisify@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-3.0.1.tgz#8d724fb280f47d1ff99953aee0c1669b25238c2e" - integrity sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA== +"@google-cloud/promisify@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-4.0.0.tgz#a906e533ebdd0f754dca2509933334ce58b8c8b1" + integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g== -"@google-cloud/run@^0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@google-cloud/run/-/run-0.6.0.tgz#e72612608b89b148e262f88e0d6e8acfe00d43a3" - integrity sha512-yLtfBG3T2Z+LcTA6eKpxQL81eojEJhHiATsmC2K0tIMYnPB14/jJMc8WErj0DoGtumhgTOiupUR4KBD+vCIFlw== +"@google-cloud/run@^1.0.2": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@google-cloud/run/-/run-1.1.0.tgz#d416d76c3ee41fe6b36cded8ae524b57bd86facc" + integrity sha512-87RiYnU6jCf/3OXkME9Wiz7YgxkQ2SvEJE2WcsGSoGeoYDbM2xgcn4TfmA+Mwdu//Jbi9sMMzbcnU8Ny8qa5kw== dependencies: - google-gax "^3.5.8" + google-gax "^4.0.3" "@graphiql/react@^0.18.0": version "0.18.0" @@ -3818,13 +3862,13 @@ resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== -"@grpc/grpc-js@~1.8.0": - version "1.8.21" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.21.tgz#d282b122c71227859bf6c5866f4c40f4a2696513" - integrity sha512-KeyQeZpxeEBSqFVTi3q2K7PiPXmgBfECc4updA1ejCLjYmoAlvvM3ZMp5ztTDUCUQmoY3CpDxvchjO1+rFkoHg== +"@grpc/grpc-js@~1.10.0": + version "1.10.6" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.10.6.tgz#1e3eb1af911dc888fbef7452f56a7573b8284d54" + integrity sha512-xP58G7wDQ4TCmN/cMUHh00DS7SRDv/+lC+xFLrTkMIN8h55X5NhZMLYbvy7dSELP15qlI6hPhNCRWVMtZMwqLA== dependencies: - "@grpc/proto-loader" "^0.7.0" - "@types/node" ">=12.12.47" + "@grpc/proto-loader" "^0.7.10" + "@js-sdsl/ordered-map" "^4.4.2" "@grpc/proto-loader@^0.7.0": version "0.7.10" @@ -3836,6 +3880,16 @@ protobufjs "^7.2.4" yargs "^17.7.2" +"@grpc/proto-loader@^0.7.10": + version "0.7.12" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.12.tgz#787b58e3e3771df30b1567c057b6ab89e3a42911" + integrity sha512-DCVwMxqYzpUCiDMl7hQ384FqP4T3DbNpXU8pt681l3UWCip1WUiD5JrkImUwCB9a7f2cq4CUTmi5r/xIMRPY1Q== + dependencies: + lodash.camelcase "^4.3.0" + long "^5.0.0" + protobufjs "^7.2.4" + yargs "^17.7.2" + "@headlessui/react@^1.7.15": version "1.7.15" resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.15.tgz#53ef6ae132af81b8f188414767b6e79ebf8dc73f" @@ -4155,18 +4209,16 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" +"@js-sdsl/ordered-map@^4.4.2": + version "4.4.2" + resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c" + integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw== + "@jsdevtools/ono@^7.1.3": version "7.1.3" resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796" integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg== -"@jsdoc/salty@^0.2.1": - version "0.2.5" - resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692" - integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw== - dependencies: - lodash "^4.17.21" - "@kwsites/file-exists@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99" @@ -6596,6 +6648,14 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/abort-controller@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-2.2.0.tgz#18983401a5e2154b5c94057730024a7d14cbcd35" + integrity sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/chunked-blob-reader-native@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.0.0.tgz#f6d0eeeb5481026b68b054f45540d924c194d558" @@ -6622,6 +6682,31 @@ "@smithy/util-middleware" "^2.0.5" tslib "^2.5.0" +"@smithy/config-resolver@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-2.2.0.tgz#54f40478bb61709b396960a3535866dba5422757" + integrity sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA== + dependencies: + "@smithy/node-config-provider" "^2.3.0" + "@smithy/types" "^2.12.0" + "@smithy/util-config-provider" "^2.3.0" + "@smithy/util-middleware" "^2.2.0" + tslib "^2.6.2" + +"@smithy/core@^1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.2.tgz#1c3ed886d403041ce5bd2d816448420c57baa19c" + integrity sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA== + dependencies: + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/util-middleware" "^2.2.0" + tslib "^2.6.2" + "@smithy/credential-provider-imds@^2.0.0", "@smithy/credential-provider-imds@^2.0.18": version "2.0.18" resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.18.tgz#9a5b8be3f268bb4ac7b7ef321f57b0e9a61e2940" @@ -6633,6 +6718,17 @@ "@smithy/url-parser" "^2.0.12" tslib "^2.5.0" +"@smithy/credential-provider-imds@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.3.0.tgz#326ce401b82e53f3c7ee4862a066136959a06166" + integrity sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w== + dependencies: + "@smithy/node-config-provider" "^2.3.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + tslib "^2.6.2" + "@smithy/eventstream-codec@^2.0.11", "@smithy/eventstream-codec@^2.0.12": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.0.12.tgz#99fab750d0ac3941f341d912d3c3a1ab985e1a7a" @@ -6643,7 +6739,17 @@ "@smithy/util-hex-encoding" "^2.0.0" tslib "^2.5.0" -"@smithy/eventstream-serde-browser@^2.0.11", "@smithy/eventstream-serde-browser@^2.0.12": +"@smithy/eventstream-codec@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.2.0.tgz#63d74fa817188995eb55e792a38060b0ede98dc4" + integrity sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw== + dependencies: + "@aws-crypto/crc32" "3.0.0" + "@smithy/types" "^2.12.0" + "@smithy/util-hex-encoding" "^2.2.0" + tslib "^2.6.2" + +"@smithy/eventstream-serde-browser@^2.0.11": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.12.tgz#46b578cf30ec4b91139800d89a752502d2b28a41" integrity sha512-0pi8QlU/pwutNshoeJcbKR1p7Ie5STd8UFAMX5xhSoSJjNlxIv/OsHbF023jscMRN2Prrqd6ToGgdCnsZVQjvg== @@ -6652,7 +6758,16 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" -"@smithy/eventstream-serde-config-resolver@^2.0.11", "@smithy/eventstream-serde-config-resolver@^2.0.12": +"@smithy/eventstream-serde-browser@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.2.0.tgz#69c93cc0210f04caeb0770856ef88c9a82564e11" + integrity sha512-UaPf8jKbcP71BGiO0CdeLmlg+RhWnlN8ipsMSdwvqBFigl5nil3rHOI/5GE3tfiuX8LvY5Z9N0meuU7Rab7jWw== + dependencies: + "@smithy/eventstream-serde-universal" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/eventstream-serde-config-resolver@^2.0.11": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.12.tgz#07871d226561394dfd6b468a7ede142b01491a76" integrity sha512-I0XfwQkIX3gAnbrU5rLMkBSjTM9DHttdbLwf12CXmj7SSI5dT87PxtKLRrZGanaCMbdf2yCep+MW5/4M7IbvQA== @@ -6660,7 +6775,15 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" -"@smithy/eventstream-serde-node@^2.0.11", "@smithy/eventstream-serde-node@^2.0.12": +"@smithy/eventstream-serde-config-resolver@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.2.0.tgz#23c8698ce594a128bcc556153efb7fecf6d04f87" + integrity sha512-RHhbTw/JW3+r8QQH7PrganjNCiuiEZmpi6fYUAetFfPLfZ6EkiA08uN3EFfcyKubXQxOwTeJRZSQmDDCdUshaA== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/eventstream-serde-node@^2.0.11": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.12.tgz#9f27037b7c782f9cbde6cc10a054df37915b0726" integrity sha512-vf1vMHGOkG3uqN9x1zKOhnvW/XgvhJXWqjV6zZiT2FMjlEayugQ1mzpSqr7uf89+BzjTzuZKERmOsEAmewLbxw== @@ -6669,6 +6792,15 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/eventstream-serde-node@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.2.0.tgz#b82870a838b1bd32ad6e0cf33a520191a325508e" + integrity sha512-zpQMtJVqCUMn+pCSFcl9K/RPNtQE0NuMh8sKpCdEHafhwRsjP50Oq/4kMmvxSRy6d8Jslqd8BLvDngrUtmN9iA== + dependencies: + "@smithy/eventstream-serde-universal" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/eventstream-serde-universal@^2.0.12": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.12.tgz#59593439e153c576ab2d46f233c7bc4ddc364cb3" @@ -6678,6 +6810,15 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/eventstream-serde-universal@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.2.0.tgz#a75e330040d5e2ca2ac0d8bccde3e390ac5afd38" + integrity sha512-pvoe/vvJY0mOpuF84BEtyZoYfbehiFj8KKWk1ds2AT0mTLYFVs+7sBJZmioOFdBXKd48lfrx1vumdPdmGlCLxA== + dependencies: + "@smithy/eventstream-codec" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/fetch-http-handler@^2.2.3", "@smithy/fetch-http-handler@^2.2.4": version "2.2.4" resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.4.tgz#405716581a5a336f2c162daf4169bff600fc47ce" @@ -6689,6 +6830,17 @@ "@smithy/util-base64" "^2.0.0" tslib "^2.5.0" +"@smithy/fetch-http-handler@^2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz#0b8e1562807fdf91fe7dd5cde620d7a03ddc10ac" + integrity sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw== + dependencies: + "@smithy/protocol-http" "^3.3.0" + "@smithy/querystring-builder" "^2.2.0" + "@smithy/types" "^2.12.0" + "@smithy/util-base64" "^2.3.0" + tslib "^2.6.2" + "@smithy/hash-blob-browser@^2.0.11": version "2.0.11" resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.11.tgz#6bcd0ffc1f68427dff1d8051c893df92a36f3e7e" @@ -6699,7 +6851,7 @@ "@smithy/types" "^2.3.5" tslib "^2.5.0" -"@smithy/hash-node@^2.0.11", "@smithy/hash-node@^2.0.12": +"@smithy/hash-node@^2.0.11": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.0.12.tgz#514586ca3f54840322273029eef66c41d9001e39" integrity sha512-fDZnTr5j9t5qcbeJ037aMZXxMka13Znqwrgy3PAqYj6Dm3XHXHftTH3q+NWgayUxl1992GFtQt1RuEzRMy3NnQ== @@ -6709,6 +6861,16 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.5.0" +"@smithy/hash-node@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.2.0.tgz#df29e1e64811be905cb3577703b0e2d0b07fc5cc" + integrity sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g== + dependencies: + "@smithy/types" "^2.12.0" + "@smithy/util-buffer-from" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + "@smithy/hash-stream-node@^2.0.11": version "2.0.11" resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-2.0.11.tgz#95c1ef3681d988770acdab863707daf068a851f8" @@ -6718,7 +6880,7 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.5.0" -"@smithy/invalid-dependency@^2.0.11", "@smithy/invalid-dependency@^2.0.12": +"@smithy/invalid-dependency@^2.0.11": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.0.12.tgz#de78a5e9457cc397aad0648e18c0260b522fe604" integrity sha512-p5Y+iMHV3SoEpy3VSR7mifbreHQwVSvHSAz/m4GdoXfOzKzaYC8hYv10Ks7Deblkf7lhas8U+lAp9ThbBM+ZXA== @@ -6726,6 +6888,14 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/invalid-dependency@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.2.0.tgz#ee3d8980022cb5edb514ac187d159b3e773640f0" + integrity sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/is-array-buffer@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz#8fa9b8040651e7ba0b2f6106e636a91354ff7d34" @@ -6733,6 +6903,13 @@ dependencies: tslib "^2.5.0" +"@smithy/is-array-buffer@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111" + integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA== + dependencies: + tslib "^2.6.2" + "@smithy/md5-js@^2.0.11": version "2.0.11" resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-2.0.11.tgz#0235c22eca4b5af72728f20348af5280bef2f275" @@ -6742,7 +6919,7 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.5.0" -"@smithy/middleware-content-length@^2.0.13", "@smithy/middleware-content-length@^2.0.14": +"@smithy/middleware-content-length@^2.0.13": version "2.0.14" resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.0.14.tgz#ee1aa842490cee90b6ac208fb13a7d56d3ed84f2" integrity sha512-poUNgKTw9XwPXfX9nEHpVgrMNVpaSMZbshqvPxFVoalF4wp6kRzYKOfdesSVectlQ51VtigoLfbXcdyPwvxgTg== @@ -6751,7 +6928,16 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" -"@smithy/middleware-endpoint@^2.1.0", "@smithy/middleware-endpoint@^2.1.3": +"@smithy/middleware-content-length@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.2.0.tgz#a82e97bd83d8deab69e07fea4512563bedb9461a" + integrity sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ== + dependencies: + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/middleware-endpoint@^2.1.0": version "2.1.3" resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.1.3.tgz#ab7ebff4ecbc9b02ec70dd57179f47c4f16bf03f" integrity sha512-ZrQ0/YX6hNVTxqMEHtEaDbDv6pNeEji/a5Vk3HuFC5R3ZY8lfoATyxmOGxBVYnF3NUvZLNC7umEv1WzWGWvCGQ== @@ -6764,7 +6950,20 @@ "@smithy/util-middleware" "^2.0.5" tslib "^2.5.0" -"@smithy/middleware-retry@^2.0.16", "@smithy/middleware-retry@^2.0.18": +"@smithy/middleware-endpoint@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz#1333c58304aff4d843e8ef4b85c8cb88975dd5ad" + integrity sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ== + dependencies: + "@smithy/middleware-serde" "^2.3.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-middleware" "^2.2.0" + tslib "^2.6.2" + +"@smithy/middleware-retry@^2.0.16": version "2.0.18" resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.0.18.tgz#37982552a1d3815148797831df025e470423fc5e" integrity sha512-VyrHQRldGSb3v9oFOB5yPxmLT7U2sQic2ytylOnYlnsmVOLlFIaI6sW22c+w2675yq+XZ6HOuzV7x2OBYCWRNA== @@ -6778,6 +6977,21 @@ tslib "^2.5.0" uuid "^8.3.2" +"@smithy/middleware-retry@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz#d6fdce94f2f826642c01b4448e97a509c4556ede" + integrity sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA== + dependencies: + "@smithy/node-config-provider" "^2.3.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/service-error-classification" "^2.1.5" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + tslib "^2.6.2" + uuid "^9.0.1" + "@smithy/middleware-serde@^2.0.11", "@smithy/middleware-serde@^2.0.12": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.0.12.tgz#edc93c400a5ffec6c068419163f9d880bdff5e5b" @@ -6786,6 +7000,14 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/middleware-serde@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.3.0.tgz#a7615ba646a88b6f695f2d55de13d8158181dd13" + integrity sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/middleware-stack@^2.0.5", "@smithy/middleware-stack@^2.0.6": version "2.0.6" resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.0.6.tgz#c58d6e4ffc4498bf47fd27adcddd142395d3ba84" @@ -6794,6 +7016,14 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/middleware-stack@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.2.0.tgz#3fb49eae6313f16f6f30fdaf28e11a7321f34d9f" + integrity sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/node-config-provider@^2.1.1", "@smithy/node-config-provider@^2.1.3": version "2.1.3" resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.1.3.tgz#bf4cee69df08d43618ad4329d234351b14d98ef7" @@ -6804,6 +7034,16 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/node-config-provider@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.3.0.tgz#9fac0c94a14c5b5b8b8fa37f20c310a844ab9922" + integrity sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg== + dependencies: + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/node-http-handler@^2.1.7", "@smithy/node-http-handler@^2.1.8": version "2.1.8" resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.1.8.tgz#aad989d5445c43a677e7e6161c6fa4abd0e46023" @@ -6815,6 +7055,17 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/node-http-handler@^2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.5.0.tgz#7b5e0565dd23d340380489bd5fe4316d2bed32de" + integrity sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA== + dependencies: + "@smithy/abort-controller" "^2.2.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/querystring-builder" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/property-provider@^2.0.0", "@smithy/property-provider@^2.0.12", "@smithy/property-provider@^2.0.13": version "2.0.13" resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.0.13.tgz#45ee47ad79d638082523f944c49fd2e851312098" @@ -6823,6 +7074,14 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/property-provider@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.2.0.tgz#37e3525a3fa3e11749f86a4f89f0fd7765a6edb0" + integrity sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/protocol-http@^3.0.7", "@smithy/protocol-http@^3.0.8": version "3.0.8" resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-3.0.8.tgz#0f7c114f6b8e23a57dff7a275d085bac97b9233c" @@ -6831,6 +7090,14 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/protocol-http@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-3.3.0.tgz#a37df7b4bb4960cdda560ce49acfd64c455e4090" + integrity sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/querystring-builder@^2.0.12": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.0.12.tgz#d13e0eea08d43596bdbb182206ccdee0956d06fd" @@ -6840,6 +7107,15 @@ "@smithy/util-uri-escape" "^2.0.0" tslib "^2.5.0" +"@smithy/querystring-builder@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.2.0.tgz#22937e19fcd0aaa1a3e614ef8cb6f8e86756a4ef" + integrity sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A== + dependencies: + "@smithy/types" "^2.12.0" + "@smithy/util-uri-escape" "^2.2.0" + tslib "^2.6.2" + "@smithy/querystring-parser@^2.0.12": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.0.12.tgz#d2c234031e266359716a0c62c8c1208a5bd2557e" @@ -6848,6 +7124,14 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/querystring-parser@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.2.0.tgz#24a5633f4b3806ff2888d4c2f4169e105fdffd79" + integrity sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/service-error-classification@^2.0.5": version "2.0.5" resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.0.5.tgz#22c84fad456730adfa31cae91d47acd31304c346" @@ -6855,6 +7139,13 @@ dependencies: "@smithy/types" "^2.4.0" +"@smithy/service-error-classification@^2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.1.5.tgz#0568a977cc0db36299d8703a5d8609c1f600c005" + integrity sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ== + dependencies: + "@smithy/types" "^2.12.0" + "@smithy/shared-ini-file-loader@^2.0.6", "@smithy/shared-ini-file-loader@^2.2.2": version "2.2.2" resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.2.tgz#b52064c5254a01f5c98a821207448de439938667" @@ -6863,6 +7154,14 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/shared-ini-file-loader@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.4.0.tgz#1636d6eb9bff41e36ac9c60364a37fd2ffcb9947" + integrity sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/signature-v4@^2.0.0": version "2.0.11" resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.0.11.tgz#e6d9065c7a73fc6f518f0cbc94039aed49307a1c" @@ -6877,6 +7176,19 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.5.0" +"@smithy/signature-v4@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.2.1.tgz#9b32571e9785c8f69aa4115517bf2a784f690c4d" + integrity sha512-j5fHgL1iqKTsKJ1mTcw88p0RUcidDu95AWSeZTgiYJb+QcfwWU/UpBnaqiB59FNH5MiAZuSbOBnZlwzeeY2tIw== + dependencies: + "@smithy/is-array-buffer" "^2.2.0" + "@smithy/types" "^2.12.0" + "@smithy/util-hex-encoding" "^2.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-uri-escape" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + "@smithy/smithy-client@^2.1.11", "@smithy/smithy-client@^2.1.12": version "2.1.12" resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.1.12.tgz#a7f10ab846d41ce1042eb81f087c4c9eb438b481" @@ -6887,6 +7199,25 @@ "@smithy/util-stream" "^2.0.17" tslib "^2.5.0" +"@smithy/smithy-client@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.1.tgz#0fd2efff09dc65500d260e590f7541f8a387eae3" + integrity sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ== + dependencies: + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + "@smithy/util-stream" "^2.2.0" + tslib "^2.6.2" + +"@smithy/types@^2.12.0": + version "2.12.0" + resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.12.0.tgz#c44845f8ba07e5e8c88eda5aed7e6a0c462da041" + integrity sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw== + dependencies: + tslib "^2.6.2" + "@smithy/types@^2.3.5", "@smithy/types@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.4.0.tgz#ed35e429e3ea3d089c68ed1bf951d0ccbdf2692e" @@ -6903,6 +7234,15 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/url-parser@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-2.2.0.tgz#6fcda6116391a4f61fef5580eb540e128359b3c0" + integrity sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ== + dependencies: + "@smithy/querystring-parser" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/util-base64@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-2.0.0.tgz#1beeabfb155471d1d41c8d0603be1351f883c444" @@ -6911,6 +7251,15 @@ "@smithy/util-buffer-from" "^2.0.0" tslib "^2.5.0" +"@smithy/util-base64@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-2.3.0.tgz#312dbb4d73fb94249c7261aee52de4195c2dd8e2" + integrity sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw== + dependencies: + "@smithy/util-buffer-from" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + "@smithy/util-body-length-browser@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz#5447853003b4c73da3bc5f3c5e82c21d592d1650" @@ -6918,6 +7267,13 @@ dependencies: tslib "^2.5.0" +"@smithy/util-body-length-browser@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-2.2.0.tgz#25620645c6b62b42594ef4a93b66e6ab70e27d2c" + integrity sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w== + dependencies: + tslib "^2.6.2" + "@smithy/util-body-length-node@^2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz#313a5f7c5017947baf5fa018bfc22628904bbcfa" @@ -6925,6 +7281,13 @@ dependencies: tslib "^2.5.0" +"@smithy/util-body-length-node@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-2.3.0.tgz#d065a9b5e305ff899536777bbfe075cdc980136f" + integrity sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw== + dependencies: + tslib "^2.6.2" + "@smithy/util-buffer-from@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz#7eb75d72288b6b3001bc5f75b48b711513091deb" @@ -6933,6 +7296,14 @@ "@smithy/is-array-buffer" "^2.0.0" tslib "^2.5.0" +"@smithy/util-buffer-from@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b" + integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA== + dependencies: + "@smithy/is-array-buffer" "^2.2.0" + tslib "^2.6.2" + "@smithy/util-config-provider@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz#4dd6a793605559d94267312fd06d0f58784b4c38" @@ -6940,7 +7311,14 @@ dependencies: tslib "^2.5.0" -"@smithy/util-defaults-mode-browser@^2.0.15", "@smithy/util-defaults-mode-browser@^2.0.16": +"@smithy/util-config-provider@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-2.3.0.tgz#bc79f99562d12a1f8423100ca662a6fb07cde943" + integrity sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ== + dependencies: + tslib "^2.6.2" + +"@smithy/util-defaults-mode-browser@^2.0.15": version "2.0.16" resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.16.tgz#7d60c4e1d00ed569f47fd6343b822c4ff3c2c9f8" integrity sha512-Uv5Cu8nVkuvLn0puX+R9zWbSNpLIR3AxUlPoLJ7hC5lvir8B2WVqVEkJLwtixKAncVLasnTVjPDCidtAUTGEQw== @@ -6951,7 +7329,18 @@ bowser "^2.11.0" tslib "^2.5.0" -"@smithy/util-defaults-mode-node@^2.0.19", "@smithy/util-defaults-mode-node@^2.0.21": +"@smithy/util-defaults-mode-browser@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.1.tgz#9db31416daf575d2963c502e0528cfe8055f0c4e" + integrity sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw== + dependencies: + "@smithy/property-provider" "^2.2.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + bowser "^2.11.0" + tslib "^2.6.2" + +"@smithy/util-defaults-mode-node@^2.0.19": version "2.0.21" resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.21.tgz#d10c887b3e641c63e235ce95ba32137fd0bd1838" integrity sha512-cUEsttVZ79B7Al2rWK2FW03HBpD9LyuqFtm+1qFty5u9sHSdesr215gS2Ln53fTopNiPgeXpdoM3IgjvIO0rJw== @@ -6964,12 +7353,41 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/util-defaults-mode-node@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.1.tgz#4613210a3d107aadb3f85bd80cb71c796dd8bf0a" + integrity sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA== + dependencies: + "@smithy/config-resolver" "^2.2.0" + "@smithy/credential-provider-imds" "^2.3.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/util-endpoints@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-1.2.0.tgz#b8b805f47e8044c158372f69b88337703117665d" + integrity sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ== + dependencies: + "@smithy/node-config-provider" "^2.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/util-hex-encoding@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz#0aa3515acd2b005c6d55675e377080a7c513b59e" integrity sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA== dependencies: - tslib "^2.5.0" + tslib "^2.5.0" + +"@smithy/util-hex-encoding@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz#87edb7c88c2f422cfca4bb21f1394ae9602c5085" + integrity sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ== + dependencies: + tslib "^2.6.2" "@smithy/util-middleware@^2.0.4", "@smithy/util-middleware@^2.0.5": version "2.0.5" @@ -6979,6 +7397,14 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/util-middleware@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-2.2.0.tgz#80cfad40f6cca9ffe42a5899b5cb6abd53a50006" + integrity sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/util-retry@^2.0.4", "@smithy/util-retry@^2.0.5": version "2.0.5" resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.0.5.tgz#1a93721da082301aca61d8b42380369761a7e80d" @@ -6988,6 +7414,15 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/util-retry@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.2.0.tgz#e8e019537ab47ba6b2e87e723ec51ee223422d85" + integrity sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g== + dependencies: + "@smithy/service-error-classification" "^2.1.5" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@smithy/util-stream@^2.0.16", "@smithy/util-stream@^2.0.17": version "2.0.17" resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.0.17.tgz#4c980891b0943e9e64949d7afcf1ec4a7b510ea8" @@ -7002,6 +7437,20 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.5.0" +"@smithy/util-stream@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.2.0.tgz#b1279e417992a0f74afa78d7501658f174ed7370" + integrity sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA== + dependencies: + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-buffer-from" "^2.2.0" + "@smithy/util-hex-encoding" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + "@smithy/util-uri-escape@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz#19955b1a0f517a87ae77ac729e0e411963dfda95" @@ -7009,6 +7458,13 @@ dependencies: tslib "^2.5.0" +"@smithy/util-uri-escape@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz#56f5764051a33b67bc93fdd2a869f971b0635406" + integrity sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA== + dependencies: + tslib "^2.6.2" + "@smithy/util-utf8@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.0.0.tgz#b4da87566ea7757435e153799df9da717262ad42" @@ -7017,7 +7473,15 @@ "@smithy/util-buffer-from" "^2.0.0" tslib "^2.5.0" -"@smithy/util-waiter@^2.0.11", "@smithy/util-waiter@^2.0.12": +"@smithy/util-utf8@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5" + integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A== + dependencies: + "@smithy/util-buffer-from" "^2.2.0" + tslib "^2.6.2" + +"@smithy/util-waiter@^2.0.11": version "2.0.12" resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-2.0.12.tgz#a7348f9fd2bade5f2f3ee7ecf7c43ab86ed244ee" integrity sha512-3sENmyVa1NnOPoiT2NCApPmu7ukP7S/v7kL9IxNmnygkDldn7/yK0TP42oPJLwB2k3mospNsSePIlqdXEUyPHA== @@ -7026,6 +7490,15 @@ "@smithy/types" "^2.4.0" tslib "^2.5.0" +"@smithy/util-waiter@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-2.2.0.tgz#d11baf50637bfaadb9641d6ca1619da413dd2612" + integrity sha512-IHk53BVw6MPMi2Gsn+hCng8rFA3ZmR3Rk7GllxDUW9qFJl/hiSvskn7XldkECapQVkIg/1dHpMAxI9xSTaLLSA== + dependencies: + "@smithy/abort-controller" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + "@stripe/react-stripe-js@^1.16.5": version "1.16.5" resolved "https://registry.yarnpkg.com/@stripe/react-stripe-js/-/react-stripe-js-1.16.5.tgz#51cf862b50ca91ae6193c77a5bec889e81047f10" @@ -7442,13 +7915,18 @@ "@types/connect" "*" "@types/node" "*" -"@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== +"@types/bonjour@^3.5.13": + version "3.5.13" + resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956" + integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ== dependencies: "@types/node" "*" +"@types/caseless@*": + version "0.12.5" + resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.5.tgz#db9468cb1b1b5a925b8f34822f1669df0c5472f5" + integrity sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg== + "@types/chalk@^2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@types/chalk/-/chalk-2.2.0.tgz#b7f6e446f4511029ee8e3f43075fb5b73fbaa0ba" @@ -7477,10 +7955,10 @@ dependencies: "@types/tern" "*" -"@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== +"@types/connect-history-api-fallback@^1.5.4": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3" + integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw== dependencies: "@types/express-serve-static-core" "*" "@types/node" "*" @@ -7570,7 +8048,7 @@ "@types/range-parser" "*" "@types/send" "*" -"@types/express@*", "@types/express@^4.17.13": +"@types/express@*": version "4.17.17" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4" integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q== @@ -7580,6 +8058,16 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/express@^4.17.21": + version "4.17.21" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" + integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.33" + "@types/qs" "*" + "@types/serve-static" "*" + "@types/faker@^5.5.9": version "5.5.9" resolved "https://registry.yarnpkg.com/@types/faker/-/faker-5.5.9.tgz#588ede92186dc557bff8341d294335d50d255f0c" @@ -7597,14 +8085,6 @@ resolved "https://registry.yarnpkg.com/@types/franc/-/franc-5.0.3.tgz#7263cef3ab3512ac95a78c328fcc51c51396b49f" integrity sha512-YX6o2vVkeiUvOF12bUmnSGf8sezOoBnCWjHHZGeh2lt3tqAutbJ9OL3cDRiZoiAYaZR638nuOc0Ji9bzdad2XA== -"@types/glob@*": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" - integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w== - dependencies: - "@types/minimatch" "^5.1.2" - "@types/node" "*" - "@types/glob@^7.1.1": version "7.2.0" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" @@ -7770,7 +8250,7 @@ resolved "https://registry.yarnpkg.com/@types/jwt-decode/-/jwt-decode-2.2.1.tgz#afdf5c527fcfccbd4009b5fd02d1e18241f2d2f2" integrity sha512-aWw2YTtAdT7CskFyxEX2K21/zSDStuf/ikI3yBqmwpwJF0pS+/IX5DWv+1UFffZIbruP6cnT9/LAJV1gFwAT1A== -"@types/linkify-it@*", "@types/linkify-it@^3.0.2": +"@types/linkify-it@^3.0.2": version "3.0.4" resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.4.tgz#def6a9bb0ce78140860602f16ace37a9997f086a" integrity sha512-hPpIeeHb/2UuCw06kSNAOVWgehBLXEo0/fUs0mw3W2qhqX89PI2yvok83MnuctYGCPrabGIoi0fFso4DQ+sNUQ== @@ -7797,19 +8277,6 @@ resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.3.0.tgz#a61043a62c0a72696c73a0a305c544c96501e006" integrity sha512-uKRI5QORDnrGFYgcdAVnHvEIvEZ8noTpP/Bg+HeUzZghwinDlIS87DEenV5r1YoOF9G4x600YsUXLWZ19rmTmg== -"@types/markdown-it@^12.2.3": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51" - integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ== - dependencies: - "@types/linkify-it" "*" - "@types/mdurl" "*" - -"@types/mdurl@*": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.4.tgz#574bfbec51eb41ab5f444116c8555bc4347feba5" - integrity sha512-ARVxjAEX5TARFRzpDRVC6cEk0hUIXCCwaMhz8y7S1/PxU6zZS1UMjyobz7q4w/D/R552r4++EhwmXK1N2rAy0A== - "@types/mime-types@^2.1.0": version "2.1.1" resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1" @@ -7825,7 +8292,7 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== -"@types/minimatch@*", "@types/minimatch@^5.1.2": +"@types/minimatch@*": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== @@ -7858,7 +8325,14 @@ "@types/node" "*" form-data "^4.0.0" -"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0": +"@types/node-forge@^1.3.0": + version "1.3.11" + resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da" + integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ== + dependencies: + "@types/node" "*" + +"@types/node@*", "@types/node@>=13.7.0", "@types/node@>=8.1.0": version "20.8.8" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.8.tgz#adee050b422061ad5255fc38ff71b2bb96ea2a0e" integrity sha512-YRsdVxq6OaLfmR9Hy816IMp33xOBjfyOgUd77ehqg96CFywxAPbDbXvAsuN2KVg2HOT8Eh6uAfU+l4WffwPVrQ== @@ -8041,6 +8515,16 @@ resolved "https://registry.yarnpkg.com/@types/relay-runtime/-/relay-runtime-14.1.9.tgz#bb0e2d6574f058f8da90992166b1364fff09e2dc" integrity sha512-zMZnZPPawAC15zHygMk6lfHhT11xgkx2jLhXqJpgFKpV86MnQcMEs/dVTADKuUIBLBzf6Og6wK4n5PMsJ0OjVw== +"@types/request@^2.48.8": + version "2.48.12" + resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.12.tgz#0f590f615a10f87da18e9790ac94c29ec4c5ef30" + integrity sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw== + dependencies: + "@types/caseless" "*" + "@types/node" "*" + "@types/tough-cookie" "*" + form-data "^2.5.0" + "@types/resolve@1.17.1": version "1.17.1" resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" @@ -8053,18 +8537,10 @@ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== -"@types/retry@^0.12.0": - version "0.12.1" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" - integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g== - -"@types/rimraf@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8" - integrity sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ== - dependencies: - "@types/glob" "*" - "@types/node" "*" +"@types/retry@0.12.2": + version "0.12.2" + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a" + integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow== "@types/semver@^7.5.0": version "7.5.6" @@ -8079,14 +8555,14 @@ "@types/mime" "^1" "@types/node" "*" -"@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== +"@types/serve-index@^1.9.4": + version "1.9.4" + resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898" + integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug== dependencies: "@types/express" "*" -"@types/serve-static@*", "@types/serve-static@^1.13.10": +"@types/serve-static@*": version "1.15.2" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a" integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw== @@ -8095,6 +8571,15 @@ "@types/mime" "*" "@types/node" "*" +"@types/serve-static@^1.15.5": + version "1.15.7" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714" + integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw== + dependencies: + "@types/http-errors" "*" + "@types/node" "*" + "@types/send" "*" + "@types/sharp@^0.32.0": version "0.32.0" resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.32.0.tgz#fc3ac6df6b456319bae807c3d24efdc6631cdd6f" @@ -8102,10 +8587,10 @@ dependencies: sharp "*" -"@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== +"@types/sockjs@^0.3.36": + version "0.3.36" + resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535" + integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q== dependencies: "@types/node" "*" @@ -8199,13 +8684,20 @@ anymatch "^3.0.0" source-map "^0.6.0" -"@types/ws@^8.0.0", "@types/ws@^8.5.5": +"@types/ws@^8.0.0": version "8.5.5" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== dependencies: "@types/node" "*" +"@types/ws@^8.5.10": + version "8.5.10" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787" + integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A== + dependencies: + "@types/node" "*" + "@types/yargs-parser@*": version "20.2.1" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" @@ -8703,7 +9195,7 @@ ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv-keywords@^5.0.0: +ajv-keywords@^5.0.0, ajv-keywords@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== @@ -8720,7 +9212,7 @@ ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.10.0, ajv@^8.12.0, ajv@^8.6.0, ajv@^8.8.0: +ajv@^8.0.0, ajv@^8.10.0, ajv@^8.12.0, ajv@^8.6.0, ajv@^8.8.0, ajv@^8.9.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -8924,11 +9416,6 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== -array-flatten@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - array-ify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" @@ -9104,13 +9591,6 @@ axios-retry@3.2.0: dependencies: is-retry-allowed "^1.1.0" -axios@0.21.4: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - axios@^0.27.2: version "0.27.2" resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" @@ -9137,6 +9617,15 @@ axios@^1.3.3: form-data "^4.0.0" proxy-from-env "^1.1.0" +axios@^1.6.8: + version "1.6.8" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66" + integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ== + dependencies: + follow-redirects "^1.15.6" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + b4a@^1.6.4: version "1.6.4" resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9" @@ -9430,11 +9919,6 @@ blessed@0.1.81: resolved "https://registry.yarnpkg.com/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129" integrity sha1-+WLWh+wsNpVwrnGvhDJW5tDKESk= -bluebird@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - bodec@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/bodec/-/bodec-0.1.0.tgz#bc851555430f23c9f7650a75ef64c6a94c3418cc" @@ -9458,13 +9942,11 @@ body-parser@1.20.2: type-is "~1.6.18" unpipe "1.0.0" -bonjour-service@^1.0.11: - version "1.1.1" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" - integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg== +bonjour-service@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02" + integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw== dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" fast-deep-equal "^3.1.3" multicast-dns "^7.2.5" @@ -9592,6 +10074,13 @@ builtins@^5.0.0: dependencies: semver "^7.0.0" +bundle-name@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889" + integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q== + dependencies: + run-applescript "^7.0.0" + busboy@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893" @@ -9742,9 +10231,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001580, caniuse-lite@~1.0.0: - version "1.0.30001605" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001605.tgz#ca12d7330dd8bcb784557eb9aa64f0037870d9d6" - integrity sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ== + version "1.0.30001608" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz#7ae6e92ffb300e4b4ec2f795e0abab456ec06cc0" + integrity sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA== capital-case@^1.0.4: version "1.0.4" @@ -9765,13 +10254,6 @@ caseless@^0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== -catharsis@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121" - integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A== - dependencies: - lodash "^4.17.15" - chai@latest: version "4.3.4" resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz#b55e655b31e1eac7099be4c08c21964fce2e6c49" @@ -9937,6 +10419,21 @@ chokidar@^3.5.3: optionalDependencies: fsevents "~2.3.2" +chokidar@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + chownr@^1.1.1, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -10202,7 +10699,7 @@ columnify@^1.6.0: strip-ansi "^6.0.1" wcwidth "^1.0.0" -combined-stream@^1.0.8: +combined-stream@^1.0.6, combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -10610,7 +11107,7 @@ cosmiconfig@^8.1.0, cosmiconfig@^8.1.3: parse-json "^5.0.0" path-type "^4.0.0" -cpu-features@~0.0.8: +cpu-features@~0.0.9: version "0.0.9" resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.9.tgz#5226b92f0f1c63122b0a3eb84cb8335a4de499fc" integrity sha512-AKjgn2rP2yJyfbepsmLfiYcmtNn/2eUvocUyM/09yB0YDiz39HteK/5/T4Onf0pmdYDMgkBoGvRLvEguzyL7wQ== @@ -10979,6 +11476,19 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +default-browser-id@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26" + integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA== + +default-browser@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf" + integrity sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg== + dependencies: + bundle-name "^4.1.0" + default-browser-id "^5.0.0" + default-gateway@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" @@ -10998,6 +11508,11 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== +define-lazy-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" + integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== + define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -11184,11 +11699,6 @@ dlv@^1.1.3: resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= - dns-packet@^5.2.2: version "5.6.0" resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d" @@ -11668,7 +12178,7 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -escodegen@^1.13.0, escodegen@^1.8.1: +escodegen@^1.8.1: version "1.14.3" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== @@ -11801,7 +12311,7 @@ esniff@^2.0.1: event-emitter "^0.3.5" type "^2.7.2" -espree@^9.0.0, espree@^9.6.0, espree@^9.6.1: +espree@^9.6.0, espree@^9.6.1: version "9.6.1" resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== @@ -12130,7 +12640,7 @@ fast-safe-stringify@^2.0.7: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== -fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3: +fast-text-encoding@^1.0.0: version "1.0.6" resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== @@ -12356,7 +12866,7 @@ flow-parser@0.*: resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.168.0.tgz#e9c385499145828b42fd754d3528f4cb7d5c6edf" integrity sha512-YMlc+6vvyDPqWKOpzmyifJXBbwlNdqznuy8YBHxX1/90F8d+NnhsxMe1u/ok5LNvNJVJ2TVMkWudu0BUKOSawA== -follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0: +follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0, follow-redirects@^1.15.6: version "1.15.6" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== @@ -12379,22 +12889,22 @@ form-data-encoder@^1.7.2: resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.9.0.tgz#fd18d316b1ec830d2a8be8ad86c1cf0317320b34" integrity sha512-rahaRMkN8P8d/tgK/BLPX+WBVM27NbvdXBxqQujBtkDAIFspaRqN7Od7lfdGQA6KAD+f82fYCLBq1ipvcu8qLw== -form-data@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682" - integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg== +form-data@4.0.0, form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" mime-types "^2.1.12" -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== +form-data@^2.5.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" + integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== dependencies: asynckit "^0.4.0" - combined-stream "^1.0.8" + combined-stream "^1.0.6" mime-types "^2.1.12" formdata-node@^4.3.2: @@ -12509,11 +13019,6 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0: dependencies: minipass "^3.0.0" -fs-monkey@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.4.tgz#ee8c1b53d3fe8bb7e5d2c5c5dfc0168afdd2f747" - integrity sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ== - fs-readdir-recursive@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" @@ -12580,17 +13085,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaxios@^4.0.0: - version "4.3.3" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22" - integrity sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA== - dependencies: - abort-controller "^3.0.0" - extend "^3.0.2" - https-proxy-agent "^5.0.0" - is-stream "^2.0.0" - node-fetch "^2.6.7" - gaxios@^5.0.0, gaxios@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-5.1.0.tgz#133b77b45532be71eec72012b7e97c2320b6140a" @@ -12601,13 +13095,16 @@ gaxios@^5.0.0, gaxios@^5.0.1: is-stream "^2.0.0" node-fetch "^2.6.7" -gcp-metadata@^4.0.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.1.tgz#fb205fe6a90fef2fd9c85e6ba06e5559ee1eefa9" - integrity sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A== +gaxios@^6.0.0, gaxios@^6.1.1: + version "6.4.0" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.4.0.tgz#08a42cb44d5123a72efaaf9f786c266e7f18be70" + integrity sha512-apAloYrY4dlBGlhauDAYSZveafb5U6+L9titing1wox6BvWM0TSXBp603zTrLpyLMGkrcFgohnUN150dFN/zOA== dependencies: - gaxios "^4.0.0" - json-bigint "^1.0.0" + extend "^3.0.2" + https-proxy-agent "^7.0.1" + is-stream "^2.0.0" + node-fetch "^2.6.9" + uuid "^9.0.1" gcp-metadata@^5.3.0: version "5.3.0" @@ -12617,6 +13114,14 @@ gcp-metadata@^5.3.0: gaxios "^5.0.0" json-bigint "^1.0.0" +gcp-metadata@^6.0.0, gcp-metadata@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-6.1.0.tgz#9b0dd2b2445258e7597f2024332d20611cbd6b8c" + integrity sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg== + dependencies: + gaxios "^6.0.0" + json-bigint "^1.0.0" + generate-function@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" @@ -12849,6 +13354,17 @@ glob@^10.0.0: minipass "^5.0.0" path-scurry "^1.7.0" +glob@^10.3.7: + version "10.3.12" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" + integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.6" + minimatch "^9.0.1" + minipass "^7.0.4" + path-scurry "^1.10.2" + glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -12861,7 +13377,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.0, glob@^8.0.1: +glob@^8.0.1: version "8.1.0" resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -12945,26 +13461,35 @@ google-auth-library@^8.0.2, google-auth-library@^8.9.0: jws "^4.0.0" lru-cache "^6.0.0" -google-gax@^3.5.8: - version "3.6.1" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-3.6.1.tgz#02c78fc496f5adf86f2ca9145545f4b6575f6118" - integrity sha512-g/lcUjGcB6DSw2HxgEmCDOrI/CByOwqRvsuUvNalHUK2iPPPlmAIpbMbl62u0YufGMr8zgE3JL7th6dCb1Ry+w== +google-auth-library@^9.0.0, google-auth-library@^9.3.0: + version "9.7.0" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.7.0.tgz#dd99a08e2e3f70778de8be4ed8556460e237550a" + integrity sha512-I/AvzBiUXDzLOy4iIZ2W+Zq33W4lcukQv1nl7C8WUA6SQwyQwUwu3waNmWNAvzds//FG8SZ+DnKnW/2k6mQS8A== + dependencies: + base64-js "^1.3.0" + ecdsa-sig-formatter "^1.0.11" + gaxios "^6.1.1" + gcp-metadata "^6.1.0" + gtoken "^7.0.0" + jws "^4.0.0" + +google-gax@^4.0.3: + version "4.3.2" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.3.2.tgz#417cbee97f2e68d78f641af19c0f15234c0dbd9c" + integrity sha512-2mw7qgei2LPdtGrmd1zvxQviOcduTnsvAWYzCxhOWXK4IQKmQztHnDQwD0ApB690fBQJemFKSU7DnceAy3RLzw== dependencies: - "@grpc/grpc-js" "~1.8.0" + "@grpc/grpc-js" "~1.10.0" "@grpc/proto-loader" "^0.7.0" "@types/long" "^4.0.0" - "@types/rimraf" "^3.0.2" abort-controller "^3.0.0" duplexify "^4.0.0" - fast-text-encoding "^1.0.3" - google-auth-library "^8.0.2" - is-stream-ended "^0.1.4" + google-auth-library "^9.3.0" node-fetch "^2.6.1" object-hash "^3.0.0" - proto3-json-serializer "^1.0.0" - protobufjs "7.2.4" - protobufjs-cli "1.1.1" - retry-request "^5.0.0" + proto3-json-serializer "^2.0.0" + protobufjs "7.2.6" + retry-request "^7.0.0" + uuid "^9.0.1" google-p12-pem@^4.0.0: version "4.0.1" @@ -12993,7 +13518,7 @@ googleapis@^118.0.0: google-auth-library "^8.0.2" googleapis-common "^6.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -13136,6 +13661,14 @@ gtoken@^6.1.0: google-p12-pem "^4.0.0" jws "^4.0.0" +gtoken@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-7.1.0.tgz#d61b4ebd10132222817f7222b1e6064bd463fc26" + integrity sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw== + dependencies: + gaxios "^6.0.0" + jws "^4.0.0" + gzip-size@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" @@ -13305,11 +13838,16 @@ html-encoding-sniffer@^3.0.0: dependencies: whatwg-encoding "^2.0.0" -html-entities@^2.1.0, html-entities@^2.3.2: +html-entities@^2.1.0: version "2.3.2" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== +html-entities@^2.4.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" + integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== + html-escaper@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" @@ -13424,6 +13962,14 @@ http-proxy-agent@^7.0.0: agent-base "^7.1.0" debug "^4.3.4" +http-proxy-agent@^7.0.1: + version "7.0.2" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" + integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig== + dependencies: + agent-base "^7.1.0" + debug "^4.3.4" + http-proxy-middleware@^2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" @@ -13465,6 +14011,14 @@ https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.2: agent-base "^7.0.2" debug "4" +https-proxy-agent@^7.0.1, https-proxy-agent@^7.0.3: + version "7.0.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168" + integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg== + dependencies: + agent-base "^7.0.2" + debug "4" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" @@ -13777,6 +14331,11 @@ ipaddr.js@^2.0.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== +ipaddr.js@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f" + integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ== + is-absolute@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" @@ -13865,6 +14424,11 @@ is-docker@^2.0.0, is-docker@^2.1.1: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== + is-extendable@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" @@ -13906,6 +14470,13 @@ is-glob@4.0.3, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + is-interactive@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" @@ -13933,6 +14504,11 @@ is-negative-zero@^2.0.1: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== +is-network-error@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.1.0.tgz#d26a760e3770226d11c169052f266a4803d9c997" + integrity sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g== + is-number-object@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" @@ -14063,11 +14639,6 @@ is-ssh@^1.4.0: dependencies: protocols "^2.0.1" -is-stream-ended@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda" - integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw== - is-stream@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" @@ -14137,6 +14708,13 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" +is-wsl@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2" + integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw== + dependencies: + is-inside-container "^1.0.0" + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -14221,6 +14799,15 @@ jackspeak@^2.0.3: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" +jackspeak@^2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jake@^10.8.5: version "10.8.5" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" @@ -14686,13 +15273,6 @@ js-yaml@^3.10.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js2xmlparser@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a" - integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA== - dependencies: - xmlcreate "^2.0.4" - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -14723,27 +15303,6 @@ jscodeshift@^0.14.0: temp "^0.8.4" write-file-atomic "^2.3.0" -jsdoc@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e" - integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg== - dependencies: - "@babel/parser" "^7.20.15" - "@jsdoc/salty" "^0.2.1" - "@types/markdown-it" "^12.2.3" - bluebird "^3.7.2" - catharsis "^0.9.0" - escape-string-regexp "^2.0.0" - js2xmlparser "^4.0.2" - klaw "^3.0.0" - markdown-it "^12.3.2" - markdown-it-anchor "^8.4.1" - marked "^4.0.10" - mkdirp "^1.0.4" - requizzle "^0.2.3" - strip-json-comments "^3.1.0" - underscore "~1.13.2" - jsdom@^20.0.0: version "20.0.2" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.2.tgz#65ccbed81d5e877c433f353c58bb91ff374127db" @@ -15035,13 +15594,6 @@ kind-of@^6.0.2, kind-of@^6.0.3: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146" - integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g== - dependencies: - graceful-fs "^4.1.9" - kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" @@ -15073,13 +15625,13 @@ kysely@^0.27.3: resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.27.3.tgz#6cc6c757040500b43c4ac596cdbb12be400ee276" integrity sha512-lG03Ru+XyOJFsjH3OMY6R/9U38IjDPfnOfDgO3ynhbDr+Dz8fak+X6L62vqu3iybQnj+lG84OttBuU9KY3L9kA== -launch-editor@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" - integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== +launch-editor@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c" + integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw== dependencies: picocolors "^1.0.0" - shell-quote "^1.7.3" + shell-quote "^1.8.1" lazy@~1.0.11: version "1.0.11" @@ -15545,6 +16097,11 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" +lru-cache@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" + integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== + lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -15696,12 +16253,7 @@ map-obj@^4.0.0, map-obj@^4.1.0: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== -markdown-it-anchor@^8.4.1: - version "8.6.7" - resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634" - integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA== - -markdown-it@^12.2.0, markdown-it@^12.3.2: +markdown-it@^12.2.0: version "12.3.2" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== @@ -15723,7 +16275,7 @@ markdown-it@^13.0.1: mdurl "^1.0.1" uc.micro "^1.0.5" -marked@^4.0.10, marked@^4.3.0: +marked@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== @@ -15747,12 +16299,12 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== -memfs@^3.4.3: - version "3.6.0" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6" - integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ== +memfs@^4.6.0: + version "4.8.1" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.8.1.tgz#1e02c15c4397212a9a1b037fa4324c6f7dd45b47" + integrity sha512-7q/AdPzf2WpwPlPL4v1kE2KsJsHl7EF4+hAeVzlyanr2+YnR21NVn9mDqo+7DEaKDRsQy8nvxPlKH4WqMtiO0w== dependencies: - fs-monkey "^1.0.4" + tslib "^2.0.0" memoize-one@^5.1.1: version "5.2.1" @@ -15945,6 +16497,13 @@ minimatch@^9.0.0: dependencies: brace-expansion "^2.0.1" +minimatch@^9.0.1: + version "9.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" + integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -16037,6 +16596,11 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" @@ -16171,6 +16735,11 @@ nan@^2.17.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== +nan@^2.18.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.19.0.tgz#bb58122ad55a6c5bc973303908d5b16cfdd5a8c0" + integrity sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw== + nanoid@^2.1.0, nanoid@^3.1.31, nanoid@^3.3.6: version "3.3.7" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" @@ -16314,6 +16883,13 @@ node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" +node-fetch@^2.6.9: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + node-forge@^0.10.0, node-forge@^1, node-forge@^1.2.1, node-forge@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -16853,7 +17429,7 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@2.4.1, on-finished@^2.3.0: +on-finished@2.4.1, on-finished@^2.3.0, on-finished@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== @@ -16879,7 +17455,17 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^8.0.9, open@^8.4.0: +open@^10.0.3: + version "10.1.0" + resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1" + integrity sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw== + dependencies: + default-browser "^5.2.1" + define-lazy-prop "^3.0.0" + is-inside-container "^1.0.0" + is-wsl "^3.1.0" + +open@^8.4.0: version "8.4.0" resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== @@ -17090,12 +17676,13 @@ p-reduce@^2.0.0, p-reduce@^2.1.0: resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a" integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw== -p-retry@^4.5.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" - integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA== +p-retry@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.0.tgz#8d6df01af298750009691ce2f9b3ad2d5968f3bd" + integrity sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA== dependencies: - "@types/retry" "^0.12.0" + "@types/retry" "0.12.2" + is-network-error "^1.0.0" retry "^0.13.1" p-timeout@^3.2.0: @@ -17368,6 +17955,14 @@ path-root@^0.1.1: dependencies: path-root-regex "^0.1.0" +path-scurry@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" + integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== + dependencies: + lru-cache "^10.2.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.7.0.tgz#99c741a2cfbce782294a39994d63748b5a24f6db" @@ -18086,33 +18681,17 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -proto3-json-serializer@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz#1b5703152b6ce811c5cdcc6468032caf53521331" - integrity sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw== - dependencies: - protobufjs "^7.0.0" - -protobufjs-cli@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704" - integrity sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA== +proto3-json-serializer@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-2.0.1.tgz#da0b510f6d6e584b1b5c271f045c26728abe71e0" + integrity sha512-8awBvjO+FwkMd6gNoGFZyqkHZXCFd54CIYTb6De7dPaufGJ2XNW+QUNqbMr8MaAocMdb+KpsD4rxEOaTBDCffA== dependencies: - chalk "^4.0.0" - escodegen "^1.13.0" - espree "^9.0.0" - estraverse "^5.1.0" - glob "^8.0.0" - jsdoc "^4.0.0" - minimist "^1.2.0" - semver "^7.1.2" - tmp "^0.2.1" - uglify-js "^3.7.7" + protobufjs "^7.2.5" -protobufjs@7.2.4: - version "7.2.4" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.4.tgz#3fc1ec0cdc89dd91aef9ba6037ba07408485c3ae" - integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ== +protobufjs@7.2.6, protobufjs@^7.2.5: + version "7.2.6" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.6.tgz#4a0ccd79eb292717aacf07530a07e0ed20278215" + integrity sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -18127,7 +18706,7 @@ protobufjs@7.2.4: "@types/node" ">=13.7.0" long "^5.0.0" -protobufjs@^7.0.0, protobufjs@^7.1.2, protobufjs@^7.2.4: +protobufjs@^7.1.2, protobufjs@^7.2.4: version "7.2.5" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.5.tgz#45d5c57387a6d29a17aab6846dcc283f9b8e7f2d" integrity sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A== @@ -18158,15 +18737,15 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" -proxy-agent@^6.3.0: - version "6.3.1" - resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.3.1.tgz#40e7b230552cf44fd23ffaf7c59024b692612687" - integrity sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ== +proxy-agent@^6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.4.0.tgz#b4e2dd51dee2b377748aef8d45604c2d7608652d" + integrity sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ== dependencies: agent-base "^7.0.2" debug "^4.3.4" - http-proxy-agent "^7.0.0" - https-proxy-agent "^7.0.2" + http-proxy-agent "^7.0.1" + https-proxy-agent "^7.0.3" lru-cache "^7.14.1" pac-proxy-agent "^7.0.1" proxy-from-env "^1.1.0" @@ -18845,7 +19424,7 @@ regenerator-runtime@^0.13.11: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== -regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.5: +regenerator-runtime@^0.13.4: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== @@ -18996,13 +19575,6 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -requizzle@^0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c" - integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw== - dependencies: - lodash "^4.17.21" - resize-observer-polyfill@^1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" @@ -19092,13 +19664,14 @@ rethinkdb-ts@2.6.0, rethinkdb-ts@^2.4.5: resolved "https://registry.yarnpkg.com/rethinkdb-ts/-/rethinkdb-ts-2.6.0.tgz#25ad1561d58836761463718470310b4bf911f9eb" integrity sha512-RKkTP/P1dNNK265qmNjBqiiWlawRw7+MNVoro9UJa8RPvdB9+MJwzWxz7rgTLrfJr77FuaRQMqzlRexx6ivfUQ== -retry-request@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-5.0.2.tgz#143d85f90c755af407fcc46b7166a4ba520e44da" - integrity sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ== +retry-request@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-7.0.2.tgz#60bf48cfb424ec01b03fca6665dee91d06dd95f3" + integrity sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w== dependencies: - debug "^4.1.1" + "@types/request" "^2.48.8" extend "^3.0.2" + teeny-request "^9.0.0" retry@0.12.0, retry@^0.12.0: version "0.12.0" @@ -19144,6 +19717,13 @@ rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" +rimraf@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf" + integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A== + dependencies: + glob "^10.3.7" + rimraf@~2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -19180,6 +19760,11 @@ rrule@^2.7.2: dependencies: tslib "^2.4.0" +run-applescript@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb" + integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A== + run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -19286,6 +19871,16 @@ schema-utils@^4.0.0: ajv-formats "^2.1.1" ajv-keywords "^5.0.0" +schema-utils@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" + integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.9.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.1.0" + scuid@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab" @@ -19296,11 +19891,12 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selfsigned@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" - integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== +selfsigned@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0" + integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q== dependencies: + "@types/node-forge" "^1.3.0" node-forge "^1" semver-compare@^1.0.0: @@ -19330,7 +19926,7 @@ semver@7.3.4: dependencies: lru-cache "^6.0.0" -semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4: +semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -19485,7 +20081,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.7.3, shell-quote@^1.8.0: +shell-quote@^1.7.3, shell-quote@^1.8.0, shell-quote@^1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== @@ -19906,16 +20502,16 @@ ssh2-streams@0.4.10: bcrypt-pbkdf "^1.0.2" streamsearch "~0.1.2" -ssh2@1.14.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.14.0.tgz#8f68440e1b768b66942c9e4e4620b2725b3555bb" - integrity sha512-AqzD1UCqit8tbOKoj6ztDDi1ffJZ2rV2SwlgrVVrHPkV5vWqGJOVp5pmtj18PunkPJAuKQsnInyKV+/Nb2bUnA== +ssh2@^1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.15.0.tgz#2f998455036a7f89e0df5847efb5421748d9871b" + integrity sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw== dependencies: asn1 "^0.2.6" bcrypt-pbkdf "^1.0.2" optionalDependencies: - cpu-features "~0.0.8" - nan "^2.17.0" + cpu-features "~0.0.9" + nan "^2.18.0" sshpk@1.16.1: version "1.16.1" @@ -20202,7 +20798,7 @@ strip-json-comments@^2.0.0, strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: +strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -20469,14 +21065,14 @@ tayden-clusterfck@^0.7.0: resolved "https://registry.yarnpkg.com/tayden-clusterfck/-/tayden-clusterfck-0.7.0.tgz#25ebb1291a96e8bc204fff785f320cd9c3a3e62e" integrity sha1-JeuxKRqW6LwgT/94XzIM2cOj5i4= -teeny-request@^8.0.0: - version "8.0.3" - resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-8.0.3.tgz#5cb9c471ef5e59f2fca8280dc3c5909595e6ca24" - integrity sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww== +teeny-request@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-9.0.0.tgz#18140de2eb6595771b1b02203312dfad79a4716d" + integrity sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g== dependencies: http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" - node-fetch "^2.6.1" + node-fetch "^2.6.9" stream-events "^1.0.5" uuid "^9.0.0" @@ -20616,13 +21212,10 @@ timers-ext@^0.1.7: es5-ext "~0.10.46" next-tick "1" -tiny-async-pool@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tiny-async-pool/-/tiny-async-pool-1.2.0.tgz#22132957e18f8b6020a94b390d07718fd519cc71" - integrity sha512-PY/OiSenYGBU3c1nTuP1HLKRkhKFDXsAibYI5GeHbHw2WVpt6OFzAPIRP94dGnS66Jhrkheim2CHAXUNI4XwMg== - dependencies: - semver "^5.5.0" - yaassertion "^1.0.0" +tiny-async-pool@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tiny-async-pool/-/tiny-async-pool-2.1.0.tgz#3ec126568c18a7916912fb9fbecf812337ec6b84" + integrity sha512-ltAHPh/9k0STRQqaoUX52NH4ZQYAJz24ZAEwf1Zm+HYg3l9OXTWeqWKyYsHu40wF/F0rxd2N2bk5sLvX2qlSvg== tiny-invariant@^1.0.2, tiny-invariant@^1.0.6: version "1.2.0" @@ -20665,7 +21258,7 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" -tmp@^0.2.1, tmp@~0.2.1: +tmp@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== @@ -20912,7 +21505,7 @@ tslib@^1.10.0, tslib@^1.11.1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, "tslib@^2.4.1 || ^1.9.3", tslib@^2.5.0: +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, "tslib@^2.4.1 || ^1.9.3", tslib@^2.5.0, tslib@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== @@ -21074,7 +21667,7 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== -uglify-js@^3.1.4, uglify-js@^3.7.7: +uglify-js@^3.1.4: version "3.17.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== @@ -21094,11 +21687,6 @@ unc-path-regex@^0.1.2: resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= -underscore@~1.13.2: - version "1.13.6" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" - integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== - undici-types@~5.25.1: version "5.25.3" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3" @@ -21109,17 +21697,10 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -undici@^5.26.2: - version "5.26.3" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.26.3.tgz#ab3527b3d5bb25b12f898dfd22165d472dd71b79" - integrity sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw== - dependencies: - "@fastify/busboy" "^2.0.0" - -undici@^5.28.3: - version "5.28.3" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b" - integrity sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA== +undici@^5.26.2, undici@^5.28.4: + version "5.28.4" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.4.tgz#6b280408edb6a1a604a9b20340f45b422e373068" + integrity sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g== dependencies: "@fastify/busboy" "^2.0.0" @@ -21374,6 +21955,11 @@ uuid@^9.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== +uuid@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" + integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== + v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" @@ -21622,52 +22208,53 @@ webpack-cli@4.9.1: rechoir "^0.7.0" webpack-merge "^5.7.3" -webpack-dev-middleware@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" - integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA== +webpack-dev-middleware@^7.1.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-7.2.1.tgz#2af00538b6e4eda05f5afdd5d711dbebc05958f7" + integrity sha512-hRLz+jPQXo999Nx9fXVdKlg/aehsw1ajA9skAneGmT03xwmyuhvF93p6HUKKbWhXdcERtGTzUCtIQr+2IQegrA== dependencies: colorette "^2.0.10" - memfs "^3.4.3" + memfs "^4.6.0" mime-types "^2.1.31" + on-finished "^2.4.1" range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@^4.15.1: - version "4.15.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7" - integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.5" +webpack-dev-server@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz#cb6ea47ff796b9251ec49a94f24a425e12e3c9b8" + integrity sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA== + dependencies: + "@types/bonjour" "^3.5.13" + "@types/connect-history-api-fallback" "^1.5.4" + "@types/express" "^4.17.21" + "@types/serve-index" "^1.9.4" + "@types/serve-static" "^1.15.5" + "@types/sockjs" "^0.3.36" + "@types/ws" "^8.5.10" ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" + bonjour-service "^1.2.1" + chokidar "^3.6.0" colorette "^2.0.10" compression "^1.7.4" connect-history-api-fallback "^2.0.0" default-gateway "^6.0.3" express "^4.17.3" graceful-fs "^4.2.6" - html-entities "^2.3.2" + html-entities "^2.4.0" http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - launch-editor "^2.6.0" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.1.1" + ipaddr.js "^2.1.0" + launch-editor "^2.6.1" + open "^10.0.3" + p-retry "^6.2.0" + rimraf "^5.0.5" + schema-utils "^4.2.0" + selfsigned "^2.4.1" serve-index "^1.9.1" sockjs "^0.3.24" spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.13.0" + webpack-dev-middleware "^7.1.0" + ws "^8.16.0" webpack-hot-middleware@^2.22.2: version "2.25.1" @@ -22112,6 +22699,11 @@ ws@^7.0.0, ws@^7.3.1: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== +ws@^8.16.0: + version "8.16.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" + integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + x-path@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/x-path/-/x-path-0.0.2.tgz#294d076bb97a7706cc070bbb2a6fd8c54df67b12" @@ -22155,11 +22747,6 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmlcreate@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be" - integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg== - xpath@0.0.32, xpath@^0.0.32: version "0.0.32" resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af" @@ -22185,11 +22772,6 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yaassertion@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/yaassertion/-/yaassertion-1.0.2.tgz#f1a90166e1cc4ad44dbb71487009ebca017e9874" - integrity sha512-sBoJBg5vTr3lOpRX0yFD+tz7wv/l2UPMFthag4HGTMPrypBRKerjjS8jiEnNMjcAEtPXjbHiKE0UwRR1W1GXBg== - yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"