Remove loading progress for integration setup (opensearch-project#1156)…

… (opensearch-project#1163) * Switch from toast to callout for set up failures * Fix label selection for truncated labels * Fix button color * Fix tests * Remove loading progress bar * Remove unused imports --------- (cherry picked from commit 6d07d6f) Signed-off-by: Simeon Widdis <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> (cherry picked from commit ca1eccd)
amsiglan · Jan 8, 2024 · f1c8681 · f1c8681
1 parent a959d04
commit f1c8681
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 41 deletions.
diff --git a/auto_sync_commit_metadata.json b/auto_sync_commit_metadata.json
@@ -1,4 +1,4 @@
 {
-    "last_github_commit": "5beb92c60f39d323622cf5d2e634a2cb28475073",
-    "last_gitfarm_commit": "06a33037b9d06b4000a49f566ad8e643b5fc6f63"
+    "last_github_commit": "ca1eccd70396e0ca4c4f942f8632fe1af96f0b70",
+    "last_gitfarm_commit": "ef89b5bd564c6d417577d25a4600813c3c1039d6"
 }
diff --git a/...omponents/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap b/...omponents/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
@@ -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>

diff --git a/public/components/integrations/components/setup_integration.tsx b/public/components/integrations/components/setup_integration.tsx
@@ -9,17 +9,17 @@ import {
   EuiButtonEmpty,
   EuiCallOut,
   EuiComboBox,
+  EuiEmptyPrompt,
   EuiFieldText,
   EuiFlexGroup,
   EuiFlexItem,
   EuiForm,
   EuiFormRow,
-  EuiLoadingDashboards,
+  EuiLoadingLogo,
   EuiPage,
   EuiPageBody,
   EuiPageContent,
   EuiPageContentBody,
-  EuiProgress,
   EuiSelect,
   EuiSpacer,
   EuiText,
@@ -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
@@ -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!) {
@@ -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(
@@ -375,7 +366,6 @@ export function SetupBottomBar({
                   config.displayName,
                   config.connectionDataSource
                 );
-                setProgress((progress) => progress + 1);
               } else {
                 console.error('Invalid data source type');
               }
@@ -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>}
+      />
     </>
   );
 }
@@ -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 () => {
@@ -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}
@@ -469,8 +444,6 @@ export function SetupIntegrationPage({ integration }: { integration: string }) {
           integration={template}
           loading={showLoading}
           setLoading={setShowLoading}
-          loadingProgress={loadingProgress}
-          setProgress={setLoadingProgress}
           setSetupCallout={setSetupCallout}
         />
       </EuiPageBody>