resolve merge conflicts dynamically

formbricks · Jul 17, 2023 · 599f26c · 599f26c
1 parent b4eeffb
commit 599f26c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/apps/web/app/environments/[environmentId]/(actionsAndAttributes)/actions/page.tsx b/apps/web/app/environments/[environmentId]/(actionsAndAttributes)/actions/page.tsx
@@ -2,6 +2,11 @@ import ActionClassesTable from "@/app/environments/[environmentId]/(actionsAndAt
 import ActionClassDataRow from "@/app/environments/[environmentId]/(actionsAndAttributes)/actions/ActionRowData";
 import ActionTableHeading from "@/app/environments/[environmentId]/(actionsAndAttributes)/actions/ActionTableHeading";
 import { getActionClasses } from "@formbricks/lib/services/action";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Actions",
+};
 
 export default async function ActionClassesComponent({ params }) {
   let actionClasses = await getActionClasses(params.environmentId);

diff --git a/...p/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeDetailModal.tsx b/...p/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeDetailModal.tsx
@@ -27,7 +27,6 @@ export default function AttributeDetailModal({
       children: (
         <AttributeSettingsTab
           attributeClass={attributeClass}
-          environmentId={environmentId}
           setOpen={setOpen}
         />
       ),

diff --git a/...p/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx b/...p/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx
@@ -7,13 +7,11 @@ import { updatetAttributeClass } from "@formbricks/lib/services/attribute";
 import { useState } from "react";
 
 interface AttributeSettingsTabProps {
-  environmentId: string;
   attributeClass: AttributeClass;
   setOpen: (v: boolean) => void;
 }
 
 export default async function AttributeSettingsTab({
-  environmentId,
   attributeClass,
   setOpen,
 }: AttributeSettingsTabProps) {
@@ -26,15 +24,15 @@ export default async function AttributeSettingsTab({
   const onSubmit = async (data) => {
     setisAttributeBeingSubmitted(true);
     setOpen(false);
-    await updatetAttributeClass(environmentId, attributeClass.id, data);
+    await updatetAttributeClass(attributeClass.id, data);
     router.refresh();
     setisAttributeBeingSubmitted(false);
   };
 
   const handleArchiveToggle = async () => {
     setisAttributeBeingSubmitted(true);
     const data = { archived: !attributeClass.archived };
-    await updatetAttributeClass(environmentId, attributeClass.id, data);
+    await updatetAttributeClass(attributeClass.id, data);
     setisAttributeBeingSubmitted(false);
   };
 

diff --git a/apps/web/app/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx b/apps/web/app/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx
@@ -3,6 +3,11 @@ import AttributeClassDataRow from "@/app/environments/[environmentId]/(actionsAn
 import AttributeTableHeading from "@/app/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeTableHeading";
 import HowToAddAttributesButton from "@/app/environments/[environmentId]/(actionsAndAttributes)/attributes/HowToAddAttributesButton";
 import { getAttributeClasses } from "@formbricks/lib/services/attribute";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Attributes",
+};
 
 export default async function AttributesPage({ params }) {
   let attributeClasses = await getAttributeClasses(params.environmentId);

diff --git a/packages/lib/services/attribute.ts b/packages/lib/services/attribute.ts
@@ -38,14 +38,12 @@ export const getAttributeClasses = async (environmentId: string): Promise<TAttri
 };
 
 export const updatetAttributeClass = async (
-  environmentId: string,
   attributeClassId: string,
   data: { description?: string; archived?: boolean }
 ): Promise<TAttributeClass | null> => {
   try {
     let attributeClass = await prisma.attributeClass.update({
       where: {
-        environmentId: environmentId,
         id: attributeClassId,
       },
       data: {
@@ -58,7 +56,7 @@ export const updatetAttributeClass = async (
     return transformedAttributeClass;
   } catch (error) {
     throw new DatabaseError(
-      `Database error when updating attribute class with id ${attributeClassId} for environment ${environmentId}`
+      `Database error when updating attribute class with id ${attributeClassId}`
     );
   }
 };
diff --git a/packages/types/v1/actions.ts b/packages/types/v1/actions.ts
@@ -1,12 +1,12 @@
 import z from "zod";
-import { ZEventClassNoCodeConfig } from "./eventClasses";
+import { ZActionClassNoCodeConfig } from "./actionClasses";
 
 export const ZAction = z.object({
   id: z.string().cuid2(),
   name: z.string(),
   description: z.string(),
   type: z.enum(["code", "noCode", "automatic"]),
-  noCodeConfig: z.union([ZEventClassNoCodeConfig, z.null()]),
+  noCodeConfig: z.union([ZActionClassNoCodeConfig, z.null()]),
   environmentId: z.string(),
   actionCount: z.number(),
   createdAt: z.date(),
@@ -18,7 +18,7 @@ export type TAction = z.infer<typeof ZAction>;
 export const ZActionInput = z.object({
   name: z.string(),
   description: z.union([z.string(), z.null()]),
-  noCodeConfig: z.union([ZEventClassNoCodeConfig, z.null()]),
+  noCodeConfig: z.union([ZActionClassNoCodeConfig, z.null()]),
   type: z.enum(["code", "noCode", "automatic"]),
 });