merge fixes

Author: jordanverasamy

packages/app/src/cli/services/bulk-operations/execute-bulk-operation.ts

@@ -1,14 +1,5 @@
 import {runBulkOperationQuery} from './run-query.js'
 import {runBulkOperationMutation} from './run-mutation.js'
-<<<<<<< HEAD
-import {AppLinkedInterface} from '../../models/app/app.js'
-import {renderSuccess, renderInfo, renderWarning} from '@shopify/cli-kit/node/ui'
-import {outputContent, outputToken} from '@shopify/cli-kit/node/output'
-import {ensureAuthenticatedAdmin} from '@shopify/cli-kit/node/session'
-import {AbortError} from '@shopify/cli-kit/node/error'
-import {parse} from 'graphql'
-
-=======
 import {formatBulkOperationStatus} from './format-bulk-operation-status.js'
 import {
   GetBulkOperationById,
@@ -20,6 +11,7 @@ import {ensureAuthenticatedAdmin} from '@shopify/cli-kit/node/session'
 import {outputContent, outputToken} from '@shopify/cli-kit/node/output'
 import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin'
 import {sleep} from '@shopify/cli-kit/node/system'
+import {AbortError} from '@shopify/cli-kit/node/error'
 import {parse} from 'graphql'
 
 const TERMINAL_STATUSES = ['COMPLETED', 'FAILED', 'CANCELED', 'EXPIRED']
@@ -30,24 +22,16 @@ type BulkOperation = NonNullable<GetBulkOperationByIdQuery['bulkOperation']> & {
   objectCount: unknown
 }
 
->>>>>>> f9d62c9956 (move back from tsx to ts)
 interface ExecuteBulkOperationInput {
   app: AppLinkedInterface
   storeFqdn: string
   query: string
   variables?: string[]
-<<<<<<< HEAD
-}
-
-export async function executeBulkOperation(input: ExecuteBulkOperationInput): Promise<void> {
-  const {app, storeFqdn, query, variables} = input
-=======
   watch?: boolean
 }
 
 export async function executeBulkOperation(input: ExecuteBulkOperationInput): Promise<void> {
   const {app, storeFqdn, query, variables, watch = false} = input
->>>>>>> f9d62c9956 (move back from tsx to ts)
 
   renderInfo({
     headline: 'Starting bulk operation.',
@@ -56,7 +40,6 @@ export async function executeBulkOperation(input: ExecuteBulkOperationInput): Pr
 
   const adminSession = await ensureAuthenticatedAdmin(storeFqdn)
 
-<<<<<<< HEAD
   const operationIsMutation = isMutation(query)
   if (!operationIsMutation && variables) {
     throw new AbortError(
@@ -65,9 +48,6 @@ export async function executeBulkOperation(input: ExecuteBulkOperationInput): Pr
   }
 
   const bulkOperationResponse = operationIsMutation
-=======
-  const bulkOperationResponse = isMutation(query)
->>>>>>> f9d62c9956 (move back from tsx to ts)
     ? await runBulkOperationMutation({adminSession, query, variables})
     : await runBulkOperationQuery({adminSession, query})
 
@@ -87,31 +67,6 @@ export async function executeBulkOperation(input: ExecuteBulkOperationInput): Pr
 
   const result = bulkOperationResponse?.bulkOperation
   if (result) {
-<<<<<<< HEAD
-    const infoSections = [
-      {
-        title: 'Bulk Operation Created',
-        body: [
-          {
-            list: {
-              items: [
-                outputContent`ID: ${outputToken.cyan(result.id)}`.value,
-                outputContent`Status: ${outputToken.yellow(result.status)}`.value,
-                outputContent`Created: ${outputToken.gray(String(result.createdAt))}`.value,
-              ],
-            },
-          },
-        ],
-      },
-    ]
-
-    renderInfo({customSections: infoSections})
-
-    renderSuccess({
-      headline: 'Bulk operation started successfully!',
-      body: 'Congrats!',
-    })
-=======
     if (watch) {
       const finalOperation = await renderSingleTask<BulkOperation>({
         title: outputContent`Starting bulk operation...`,
@@ -187,7 +142,6 @@ export async function executeBulkOperation(input: ExecuteBulkOperationInput): Pr
         body: 'Congrats!',
       })
     }
->>>>>>> f9d62c9956 (move back from tsx to ts)
   }
 }