Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 2.11] Remove loading progress for integration setup #1162

Merged
merged 1 commit into from
Oct 24, 2023
Merged

[Backport 2.11] Remove loading progress for integration setup #1162

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
2 changes: 0 additions & 2 deletions ...omponents/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,9 +692,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
}
}
loading={false}
loadingProgress={0}
setLoading={[Function]}
setProgress={[Function]}
setSetupCallout={[Function]}
>
<EuiBottomBar>
Expand Down
47 changes: 10 additions & 37 deletions public/components/integrations/components/setup_integration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ import {
EuiButtonEmpty,
EuiCallOut,
EuiComboBox,
EuiEmptyPrompt,
EuiFieldText,
EuiFlexGroup,
EuiFlexItem,
EuiForm,
EuiFormRow,
EuiLoadingDashboards,
EuiLoadingLogo,
EuiPage,
EuiPageBody,
EuiPageContent,
EuiPageContentBody,
EuiProgress,
EuiSelect,
EuiSpacer,
EuiText,
Expand Down Expand Up @@ -274,16 +274,12 @@ export function SetupBottomBar({
integration,
loading,
setLoading,
loadingProgress,
setProgress,
setSetupCallout,
}: {
config: IntegrationSetupInputs;
integration: IntegrationTemplate;
loading: boolean;
setLoading: (loading: boolean) => void;
loadingProgress: number;
setProgress: (updater: number | ((progress: number) => number)) => void;
setSetupCallout: (setupCallout: SetupCallout) => void;
}) {
// Drop-in replacement for setToast
Expand Down Expand Up @@ -333,14 +329,12 @@ export function SetupBottomBar({
config.displayName,
config.connectionDataSource
);
setProgress((progress) => progress + 1);
} else if (config.connectionType === 's3') {
const http = coreRefs.http!;

const assets = await http.get(
`${INTEGRATIONS_BASE}/repository/${integration.name}/assets`
);
setProgress((progress) => progress + 1);

// Queries must exist because we disable s3 if they're not present
for (const query of assets.data.queries!) {
Expand All @@ -350,10 +344,7 @@ export function SetupBottomBar({
);
queryStr = queryStr.replaceAll('{s3_bucket_location}', config.connectionLocation);
queryStr = queryStr.replaceAll('{object_name}', integration.name);
const currProgress = loadingProgress; // Need a frozen copy for getting accurate query steps
const result = await runQuery(queryStr, (step) =>
setProgress(currProgress + step)
);
const result = await runQuery(queryStr, (_) => {});
if (!result.ok) {
setLoading(false);
setCalloutLikeToast(
Expand All @@ -375,7 +366,6 @@ export function SetupBottomBar({
config.displayName,
config.connectionDataSource
);
setProgress((progress) => progress + 1);
} else {
console.error('Invalid data source type');
}
Expand All @@ -390,27 +380,14 @@ export function SetupBottomBar({
);
}

export function LoadingPage({ value, max }: { value: number; max: number }) {
export function LoadingPage() {
return (
<>
<EuiSpacer size="xxl" />
<EuiFlexGroup direction="column" justifyContent="center" alignItems="center">
<EuiFlexItem grow={false}>
<EuiLoadingDashboards size="xxl" />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiTitle>
<h3>Adding Integration</h3>
</EuiTitle>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText>
This may take a few minutes. The integration and assets are being added.
</EuiText>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer />
<EuiProgress value={value} max={max} size="m" />
<EuiEmptyPrompt
icon={<EuiLoadingLogo logo="logoOpenSearch" size="xl" />}
title={<h2>Setting Up the Integration</h2>}
body={<p>This can take several minutes.</p>}
/>
</>
);
}
Expand All @@ -432,7 +409,6 @@ export function SetupIntegrationPage({ integration }: { integration: string }) {
const [setupCallout, setSetupCallout] = useState({ show: false } as SetupCallout);

const [showLoading, setShowLoading] = useState(false);
const [loadingProgress, setLoadingProgress] = useState(0);

useEffect(() => {
const getTemplate = async () => {
Expand All @@ -445,15 +421,14 @@ export function SetupIntegrationPage({ integration }: { integration: string }) {

const updateConfig = (updates: Partial<IntegrationSetupInputs>) =>
setConfig(Object.assign({}, integConfig, updates));
const maxProgress = 2 + 3 * (template.assets?.queries?.length ?? 0);

return (
<EuiPage>
<EuiPageBody>
<EuiPageContent>
<EuiPageContentBody>
{showLoading ? (
<LoadingPage value={loadingProgress} max={maxProgress} />
<LoadingPage />
) : (
<SetupIntegrationForm
config={integConfig}
Expand All @@ -469,8 +444,6 @@ export function SetupIntegrationPage({ integration }: { integration: string }) {
integration={template}
loading={showLoading}
setLoading={setShowLoading}
loadingProgress={loadingProgress}
setProgress={setLoadingProgress}
setSetupCallout={setSetupCallout}
/>
</EuiPageBody>
Expand Down
Loading