Merge branch 'activepieces:main' into apitraffic/main

apitraffic · Jan 6, 2025 · aaa9203 · aaa9203
2 parents 8c2414f + 44e3433
commit aaa9203
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.0'
 services:
   activepieces:
-    image: ghcr.io/activepieces/activepieces:0.38.5
+    image: ghcr.io/activepieces/activepieces:0.38.6
     container_name: activepieces
     restart: unless-stopped
     ## Enable the following line if you already use AP_EXECUTION_MODE with SANDBOXED or old activepieces, checking the breaking change documentation for more info.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "activepieces",
-  "version": "0.38.5",
+  "version": "0.38.6",
   "rcVersion": "0.39.0-rc.0",
   "scripts": {
     "prepare": "husky install",

diff --git a/packages/react-ui/src/components/custom/markdown.tsx b/packages/react-ui/src/components/custom/markdown.tsx
@@ -55,7 +55,9 @@ const Container = ({
           )}
         </>
       )}
-      <AlertDescription className='flex-grow w-full'>{children}</AlertDescription>
+      <AlertDescription className="flex-grow w-full">
+        {children}
+      </AlertDescription>
     </Alert>
   );
 };
@@ -90,7 +92,7 @@ const ApMarkdown = React.memo(
     return (
       <Container variant={variant}>
         <ReactMarkdown
-        className='flex-grow w-full'
+          className="flex-grow w-full"
           remarkPlugins={[gfm]}
           components={{
             code(props) {

diff --git a/...ages/server/api/src/app/database/migration/postgres/1735262417593-AddExternalIdForFlow.ts b/...ages/server/api/src/app/database/migration/postgres/1735262417593-AddExternalIdForFlow.ts
@@ -34,20 +34,25 @@ export class AddExternalIdForFlow1735262417593 implements MigrationInterface {
                         `, [sourceId, key])
                 }
             }
-        }
 
-        await queryRunner.query(`
+            await queryRunner.query(`
                 ALTER TABLE "git_repo" DROP COLUMN "mapping"
             `)
+        }
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
         await queryRunner.query(`
             ALTER TABLE "flow" DROP COLUMN "externalId"
         `)
-        await queryRunner.query(`
-            ALTER TABLE "git_repo"
-            ADD "mapping" jsonb
-        `)
+
+        // Only add the mapping column if the git_repo table exists
+        const hasGitRepoTable = await queryRunner.hasTable('git_repo')
+        if (hasGitRepoTable) {
+            await queryRunner.query(`
+                ALTER TABLE "git_repo"
+                ADD "mapping" jsonb
+            `)
+        }
     }
 }