From d3b9ebbd34d0929de5849592c879b3dbd86f6dae Mon Sep 17 00:00:00 2001 From: Hariom Balhara Date: Thu, 15 Sep 2022 13:46:56 +0530 Subject: [PATCH] Add automation category and move zapier and n8n to it (#4410) * Add automation category * Move n8n and Zapier to automation category * Fix n8n category Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Bailey Pumfleet --- packages/app-store-cli/src/CliApp.tsx | 1 + packages/app-store/n8n/_metadata.ts | 2 +- packages/app-store/n8n/config.json | 4 ++-- packages/app-store/zapier/_metadata.ts | 4 ++-- .../20220912134714_add_automation_category/migration.sql | 2 ++ .../migration.sql | 1 + packages/prisma/schema.prisma | 1 + packages/prisma/seed-app-store.config.json | 4 ++-- packages/prisma/seed-app-store.ts | 2 +- packages/types/App.d.ts | 1 + 10 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 packages/prisma/migrations/20220912134714_add_automation_category/migration.sql create mode 100644 packages/prisma/migrations/20220913034937_move_n8n_zapier_to_automation_category/migration.sql diff --git a/packages/app-store-cli/src/CliApp.tsx b/packages/app-store-cli/src/CliApp.tsx index 6b3c3ae41e..d99d73729f 100644 --- a/packages/app-store-cli/src/CliApp.tsx +++ b/packages/app-store-cli/src/CliApp.tsx @@ -210,6 +210,7 @@ const CreateApp = ({ noDbUpdate, slug = null, editMode = false }) => { { label: "Payment", value: "payment" }, { label: "Messaging", value: "messaging" }, { label: "Web3", value: "web3" }, + { label: "Automation", value: "automation" }, { label: "Other", value: "other" }, ], explainer: "This is how apps are categorized in App Store.", diff --git a/packages/app-store/n8n/_metadata.ts b/packages/app-store/n8n/_metadata.ts index 9c7f2aa320..85ffde521b 100644 --- a/packages/app-store/n8n/_metadata.ts +++ b/packages/app-store/n8n/_metadata.ts @@ -3,7 +3,7 @@ import type { AppMeta } from "@calcom/types/App"; import config from "./config.json"; export const metadata = { - category: "other", + category: "automation", ...config, } as AppMeta; diff --git a/packages/app-store/n8n/config.json b/packages/app-store/n8n/config.json index 5bca3fd84d..4385e24810 100644 --- a/packages/app-store/n8n/config.json +++ b/packages/app-store/n8n/config.json @@ -2,12 +2,12 @@ "/*": "Don't modify slug - If required, do it using cli edit command", "name": "n8n", "slug": "n8n", - "type": "n8n_other", + "type": "n8n_automation", "imageSrc": "/api/app-store/n8n/icon.svg", "logo": "/api/app-store/n8n/icon.svg", "url": "https://cal.com/apps/n8n", "variant": "other", - "categories": ["other"], + "categories": ["automation"], "publisher": "Cal.com, Inc.", "email": "help@cal.com", "description": "Automate without limits. The workflow automation platform that doesn't box you in, that you never outgrow", diff --git a/packages/app-store/zapier/_metadata.ts b/packages/app-store/zapier/_metadata.ts index 4dcd134d32..2de419b737 100644 --- a/packages/app-store/zapier/_metadata.ts +++ b/packages/app-store/zapier/_metadata.ts @@ -6,7 +6,7 @@ export const metadata = { name: "Zapier", description: _package.description, installed: true, - category: "other", + category: "automation", imageSrc: "/api/app-store/zapier/icon.svg", logo: "/api/app-store/zapier/icon.svg", publisher: "Cal.com", @@ -15,7 +15,7 @@ export const metadata = { slug: "zapier", title: "Zapier", trending: true, - type: "zapier_other", + type: "zapier_automation", url: "https://cal.com/apps/zapier", variant: "other", verified: true, diff --git a/packages/prisma/migrations/20220912134714_add_automation_category/migration.sql b/packages/prisma/migrations/20220912134714_add_automation_category/migration.sql new file mode 100644 index 0000000000..e7f03fec35 --- /dev/null +++ b/packages/prisma/migrations/20220912134714_add_automation_category/migration.sql @@ -0,0 +1,2 @@ +-- AlterEnum +ALTER TYPE "AppCategories" ADD VALUE 'automation'; diff --git a/packages/prisma/migrations/20220913034937_move_n8n_zapier_to_automation_category/migration.sql b/packages/prisma/migrations/20220913034937_move_n8n_zapier_to_automation_category/migration.sql new file mode 100644 index 0000000000..77232df63f --- /dev/null +++ b/packages/prisma/migrations/20220913034937_move_n8n_zapier_to_automation_category/migration.sql @@ -0,0 +1 @@ +UPDATE "App" set categories='{automation}' where slug in ('n8n', 'zapier'); \ No newline at end of file diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 311ba91f65..2ac4fc93e4 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -474,6 +474,7 @@ enum AppCategories { payment video web3 + automation } model App { diff --git a/packages/prisma/seed-app-store.config.json b/packages/prisma/seed-app-store.config.json index b25675900d..504a33dd97 100644 --- a/packages/prisma/seed-app-store.config.json +++ b/packages/prisma/seed-app-store.config.json @@ -56,9 +56,9 @@ }, { "dirName": "n8n", - "categories": ["other"], + "categories": ["automation"], "slug": "n8n", - "type": "n8n_other" + "type": "n8n_automation" }, { "dirName": "exchangecalendar", diff --git a/packages/prisma/seed-app-store.ts b/packages/prisma/seed-app-store.ts index 86abe3d803..212f887f36 100644 --- a/packages/prisma/seed-app-store.ts +++ b/packages/prisma/seed-app-store.ts @@ -259,7 +259,7 @@ export default async function main() { } if (process.env.ZAPIER_INVITE_LINK) { - await createApp("zapier", "zapier", ["other"], "zapier_other", { + await createApp("zapier", "zapier", ["automation"], "zapier_automation", { invite_link: process.env.ZAPIER_INVITE_LINK, }); } diff --git a/packages/types/App.d.ts b/packages/types/App.d.ts index e6edaaf208..7db0509090 100644 --- a/packages/types/App.d.ts +++ b/packages/types/App.d.ts @@ -53,6 +53,7 @@ export interface App { | `${string}_video` | `${string}_web3` | `${string}_other` + | `${string}_automation` | `${string}_other_calendar`; /**