Skip to content

[Fix] Built-in automation settings stay stuck loading after a failed read #3633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roomote-roomote wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[Fix] Built-in automation settings stay stuck loading after a failed read #3633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 113 additions & 0 deletions apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 35 additions & 2 deletions apps/web/src/components/settings/automations/AutomationsSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1927,6 +1927,7 @@ export function AutomationsSettings({
const [formState, setFormState] = useState<FormState | null>(null);
const [savedState, setSavedState] = useState<FormState | null>(null);
const [fieldErrors, setFieldErrors] = useState<FieldErrors>({});
const [retryingInitialSettings, setRetryingInitialSettings] = useState(false);
const [slackChannelAccessWarnings, setSlackChannelAccessWarnings] =
useState<SlackChannelAccessWarnings>(EMPTY_SLACK_CHANNEL_ACCESS_WARNINGS);
const [managerSlackChannelId, setManagerSlackChannelId] = useState<
Expand Down Expand Up @@ -1963,6 +1964,16 @@ export function AutomationsSettings({
});

const settingsQuery = useQuery(trpc.automations.getSettings.queryOptions());
const hasInitialSettingsError =
settingsQuery.data === undefined &&
(settingsQuery.isError || retryingInitialSettings);
const retryInitialSettings = () => {
if (settingsQuery.isFetching || retryingInitialSettings) return;
setRetryingInitialSettings(true);
void settingsQuery
.refetch()
.finally(() => setRetryingInitialSettings(false));
};
const commsStatus = useQuery(trpc.comms.status.queryOptions());
const slackChannelsQuery = useQuery(
trpc.automations.listSlackChannels.queryOptions(undefined, {
Expand Down Expand Up @@ -3238,6 +3249,26 @@ export function AutomationsSettings({
) as Record<ScheduleOnlyBackgroundAutomationId, string | null>;
return (
<div className="space-y-6 md:flex md:min-h-0 md:flex-1 md:flex-col md:gap-6 md:space-y-0">
{hasInitialSettingsError ? (
<div role="alert" className="flex flex-wrap items-center gap-2">
<p className="text-sm">
Could not load built-in automation settings.
</p>
<Button
type="button"
variant="outline"
size="sm"
aria-label="Retry loading built-in automation settings"
aria-busy={retryingInitialSettings || settingsQuery.isFetching}
disabled={retryingInitialSettings || settingsQuery.isFetching}
onClick={retryInitialSettings}
>
{retryingInitialSettings || settingsQuery.isFetching
? 'Retrying…'
: 'Retry'}
</Button>
</div>
) : null}
{!settingsQuery.isPending &&
capabilities?.requiresSlackReconnect &&
capabilities.missingScopes.length > 0 ? (
Expand Down Expand Up @@ -3290,7 +3321,8 @@ export function AutomationsSettings({
<div className="flex flex-col gap-3 md:mr-auto">
{toolbarLeading}
<div id="managerChannel" className="scroll-mt-24">
{settingsQuery.isPending || !formState ? (
{hasInitialSettingsError ? null : settingsQuery.isPending ||
!formState ? (
<Skeleton className="h-5 w-64" />
) : (
<AutomationDefaultDestinationSetting
Expand Down Expand Up @@ -3359,7 +3391,8 @@ export function AutomationsSettings({
</div>
}
>
{settingsQuery.isPending || !formState ? (
{hasInitialSettingsError ? null : settingsQuery.isPending ||
!formState ? (
<LoadingSkeleton />
) : visibleBuiltInAutomations.size === 0 &&
!(
Expand Down
Loading