From f440a8f501e1bb20ddea422cd4127ef0efd91dbe Mon Sep 17 00:00:00 2001
From: Shailesh Parmar <shailesh.parmar.webdev@gmail.com>
Date: Wed, 11 May 2022 22:45:29 +0530
Subject: [PATCH] Fix #4864 Ingestion UI | Updating an existing Snowflake Usage
 Ingestion pipeline via UI is not working (#4891)

---
 .../AddIngestion/AddIngestion.component.tsx   |  8 ++---
 .../Ingestion/Ingestion.component.tsx         |  8 ++---
 .../Ingestion/ingestion.interface.ts          |  2 +-
 .../EditIngestionPage.component.tsx           |  6 ++--
 .../resources/ui/src/pages/service/index.tsx  | 31 ++-----------------
 5 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx
index c58fae541f2..fcfa9be1a00 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx
@@ -474,9 +474,7 @@ const AddIngestion = ({
 
       if (onUpdateIngestion) {
         setSaveState('waiting');
-        if (!data.deployed) {
-          setShowDeployModal(true);
-        }
+        setShowDeployModal(true);
         onUpdateIngestion(updatedData, data, data.id as string, data.name)
           .then(() => {
             setSaveState('success');
@@ -510,9 +508,7 @@ const AddIngestion = ({
   };
 
   const getSuccessMessage = () => {
-    const updateMessage = data?.deployed
-      ? `has been updated successfully`
-      : showDeployButton
+    const updateMessage = showDeployButton
       ? 'has been updated, but failed to deploy'
       : 'has been updated and deployed successfully';
     const createMessage = showDeployButton
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx
index bed8445aa30..75d5815cffe 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx
@@ -113,9 +113,9 @@ const Ingestion: React.FC<IngestionProps> = ({
       .catch(() => setCurrTriggerId({ id: '', state: '' }));
   };
 
-  const handleDeployIngestion = (id: string, ingestion: IngestionPipeline) => {
+  const handleDeployIngestion = (id: string) => {
     setCurrDeployId({ id, state: 'waiting' });
-    deployIngestion(ingestion)
+    deployIngestion(id)
       .then(() => {
         setCurrDeployId({ id, state: 'success' });
         setTimeout(() => setCurrDeployId({ id: '', state: '' }), 1500);
@@ -332,9 +332,7 @@ const Ingestion: React.FC<IngestionProps> = ({
         <button
           className="link-text tw-mr-2"
           data-testid="deploy"
-          onClick={() =>
-            handleDeployIngestion(ingestion.id as string, ingestion)
-          }>
+          onClick={() => handleDeployIngestion(ingestion.id as string)}>
           {currDeployId.id === ingestion.id ? (
             currDeployId.state === 'success' ? (
               <FontAwesomeIcon icon="check" />
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/ingestion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/ingestion.interface.ts
index 97c018a3534..9b909e52dbf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/ingestion.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/ingestion.interface.ts
@@ -64,7 +64,7 @@ export interface IngestionProps {
   currrentPage: number;
   pagingHandler: (value: string | number, activePage?: number) => void;
   deleteIngestion: (id: string, displayName: string) => Promise<void>;
-  deployIngestion: (data: IngestionPipeline) => Promise<void>;
+  deployIngestion: (id: string) => Promise<void>;
   triggerIngestion: (id: string, displayName: string) => Promise<void>;
 }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EditIngestionPage/EditIngestionPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EditIngestionPage/EditIngestionPage.component.tsx
index 2b0484b56f5..c50bd586602 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/EditIngestionPage/EditIngestionPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/EditIngestionPage/EditIngestionPage.component.tsx
@@ -185,9 +185,7 @@ const EditIngestionPage = () => {
       return updateIngestionPipeline(updateData as CreateIngestionPipeline)
         .then((res: AxiosResponse) => {
           if (res.data) {
-            if (!ingestionData.deployed) {
-              onIngestionDeploy();
-            }
+            onIngestionDeploy();
             resolve();
           } else {
             throw jsonData['api-error-messages']['update-ingestion-error'];
@@ -215,7 +213,7 @@ const EditIngestionPage = () => {
         ? activeIngestionStep >= 3
         : activeIngestionStep >= 2;
 
-    return ingestion && !showIngestionButton && !ingestionData.deployed;
+    return ingestion && !showIngestionButton;
   };
 
   useEffect(() => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
index dd82cb12ff7..b91f6434cfc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
@@ -22,9 +22,9 @@ import { getDashboards } from '../../axiosAPIs/dashboardAPI';
 import { getDatabases } from '../../axiosAPIs/databaseAPI';
 import {
   deleteIngestionPipelineById,
+  deployIngestionPipelineById,
   getIngestionPipelines,
   triggerIngestionPipelineById,
-  updateIngestionPipeline,
 } from '../../axiosAPIs/ingestionPipelineAPI';
 import { fetchAirflowConfig } from '../../axiosAPIs/miscAPI';
 import { getPipelines } from '../../axiosAPIs/pipelineAPI';
@@ -51,7 +51,6 @@ import {
 } from '../../constants/constants';
 import { SearchIndex } from '../../enums/search.enum';
 import { ServiceCategory } from '../../enums/service.enum';
-import { CreateIngestionPipeline } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline';
 import { Dashboard } from '../../generated/entity/data/dashboard';
 import { Database } from '../../generated/entity/data/database';
 import { Pipeline } from '../../generated/entity/data/pipeline';
@@ -288,33 +287,9 @@ const ServicePage: FunctionComponent = () => {
     });
   };
 
-  const deployIngestion = (data: IngestionPipeline) => {
-    const {
-      airflowConfig,
-      description,
-      displayName,
-      name,
-      owner,
-      pipelineType,
-      service,
-      source,
-    } = data;
-    const updateData = {
-      airflowConfig: {
-        ...airflowConfig,
-        forceDeploy: true,
-      },
-      description,
-      displayName,
-      name,
-      owner,
-      pipelineType,
-      service,
-      sourceConfig: source.sourceConfig,
-    };
-
+  const deployIngestion = (id: string) => {
     return new Promise<void>((resolve, reject) => {
-      return updateIngestionPipeline(updateData as CreateIngestionPipeline)
+      return deployIngestionPipelineById(id)
         .then((res: AxiosResponse) => {
           if (res.data) {
             resolve();