Import Promotion class from types

Author: spaceman03

apps/cms/src/@types/IPromotion.ts

@@ -3,19 +3,18 @@ import { Button } from "payload/components/elements";
 import { AdminView } from "payload/config";
 import ViewTemplate from "./ViewTemplate";
 import { Column } from "payload/dist/admin/components/elements/Table/types";
-import { Promotion } from "../../@types/Promotion";
-import { IPromotion } from "../../@types/IPromotion";
+import { PromoInfo } from "types";
 import PromotionsApi from "../../apis/promotions.api";
 import { RenderCellFactory } from "../utils/RenderCellFactory";
 import SortedColumn from "../utils/SortedColumn";
 import { Table } from "payload/dist/admin/components/elements/Table";
 
 const MerchPromotion: AdminView = ({ user, canAccessAdmin }) => {
   // Get data from API
-  const [data, setData] = useState<IPromotion[]>(null);
+  const [data, setData] = useState<PromoInfo[]>(null);
   useEffect(() => {
     PromotionsApi.getPromotions()
-      .then((res: IPromotion[]) => setData(res))
+      .then((res: PromoInfo[]) => setData(res))
       .catch((error) => console.log(error));
   }, []);
 
@@ -34,7 +33,9 @@ const MerchPromotion: AdminView = ({ user, canAccessAdmin }) => {
   }
 
   const tableCols = new Array<Column>();
-  for (const key of Object.keys(new Promotion())) {
+  const samplePromo = data[0];
+  const keys = Object.keys(samplePromo);
+  for (const key of keys) {
     const renderCellComponent = RenderCellFactory.get(data[0], key);
     const renderCell: React.FC<{ children?: React.ReactNode }> =
       renderCellComponent instanceof Promise
@@ -118,9 +119,7 @@ const MerchPromotion: AdminView = ({ user, canAccessAdmin }) => {
         </Button>
         <div
           style={{
-            position: "absolute",
-            top: 0,
-            right: 0,
+            position: "relative",
           }}
         >
           <Button onClick={handleCreatePromotion} buttonStyle="primary">

apps/cms/src/@types/Promotion.ts

@@ -1,19 +1,18 @@
-import { IPromotion } from "../@types/IPromotion";
-
+import { PromoInfo } from "types";
 // todo turn into real api
 class OrdersApi {
   // eslint-disable-next-line @typescript-eslint/require-await
-  async getPromotions(): Promise<IPromotion[]> {
-    const res: IPromotion[] = [];
-    const item1: IPromotion = {
+  async getPromotions(): Promise<PromoInfo[]> {
+    const res: PromoInfo[] = [];
+    const item1: PromoInfo = {
       promotion_id: "1",
       name: "March Sales",
       discount_percentage: "10%",
       category: "T-shirts",
     };
     res.push(item1);
 
-    const item2: IPromotion = {
+    const item2: PromoInfo = {
       promotion_id: "2",
       name: "Summer Sales",
       discount_percentage: "10%",

apps/cms/src/admin/views/MerchPromotion.tsx

@@ -85,6 +85,14 @@ export interface Promotion {
   }>;
 }
 
+export interface PromoInfo {
+  
+  promotion_id: string;
+  name: string;
+  discount_percentage: string;
+  category: string;
+};
+
 export type PricedCart = {
   promoCode?: string;
   subtotal: number;