@vtex/faststore-plugin-buyer-portal 1.0.18 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtex/faststore-plugin-buyer-portal",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "A plugin for faststore with buyer portal",
   "main": "index.js",
   "dependencies": {},

package/src/components/AddressLine/AddressLine.tsx

@@ -6,17 +6,17 @@ import { Icon } from "../Icon";
 export type AddressLineProps = {
   id: string;
   name: string;
-  tags: string[];
-  status: boolean;
+  types: string[];
+  isActive: boolean;
   href: string;
 };
 
 export const AddressLine = ({
   name,
-  tags,
+  types,
   id,
   href,
-  status,
+  isActive,
 }: AddressLineProps) => (
   <li data-fs-addresses-line>
     <Link href={href} data-fs-addresses-line-link>
@@ -30,11 +30,12 @@ export const AddressLine = ({
         {name}
       </span>
 
-      {tags.map((tag, index) => (
-        <Tag key={index}>{tag}</Tag>
+      {types.map((type, index) => (
+        <Tag key={index}>{type}</Tag>
       ))}
     </Link>
-    <Toggle id={id} defaultChecked={status} />
+
+    <Toggle id={id} defaultChecked={isActive} />
     <button data-fs-addresses-dropdown-trigger>
       <Icon
         name="MoreVert"

package/src/layouts/AddressesLayout/AddressesLayout.tsx

@@ -20,7 +20,7 @@ export const AddressLayout = ({ data }: AddressLayoutProps) => {
   const { setQueryString, removeQueryString } = useQueryParams();
 
   const types = data
-    .flatMap((address) => address.tags)
+    .flatMap((address) => address.types)
     .filter((tag, index, self) => self.indexOf(tag) === index);
 
   return (

package/src/pages/addresses.tsx

@@ -1,20 +1,25 @@
 import { AddressLayout } from "../layouts/AddressesLayout/AddressesLayout";
 import {
   getAddressesService,
-  GetAddressesServiceProps,
 } from "../services/get-addresses.service";
 import { AddressSummaryData } from "../types/AddressData";
+import { getCookieAsString, getCustomerIdFromCookieServerSide } from "../utils/cookie";
+
 
 export type AddressesPageData = { data: AddressSummaryData[] };
 
 export type AddressesPageContext = {
-  query: GetAddressesServiceProps;
+  req: {
+    cookies: Record<string, string>
+  };
 };
 
-export async function loader({
-  query,
-}: AddressesPageContext): Promise<AddressesPageData> {
-  return { data: await getAddressesService(query) };
+export async function loader(data: AddressesPageContext): Promise<AddressesPageData> {
+  return {
+    data: await getAddressesService({
+      customerId: getCustomerIdFromCookieServerSide(data), cookie: getCookieAsString(data?.req?.cookies)
+    })
+  }
 }
 
 const AddressPage = ({ data }: AddressesPageData) => (

package/src/pages/contracts.tsx

@@ -4,7 +4,7 @@ import {
   GetContractsServiceProps,
 } from "../services/get-contracts.service";
 import { ContractData } from "../types/ContractData";
-import { getCustomerIdFromCookieServerSide } from "../utils/cookie";
+import { getCookieAsString, getCustomerIdFromCookieServerSide } from "../utils/cookie";
 
 
 export type ContractsPageData = { data: ContractData[] };
@@ -16,7 +16,7 @@ export type ContractsPageContext = {
 };
 
 export async function loader(data: ContractsPageContext): Promise<ContractsPageData> {
-  return { data: await getContractsService({ customerId: getCustomerIdFromCookieServerSide(data), cookie: JSON.stringify(data?.req?.cookies).replace(/[{}]/g, '') }) };
+  return { data: await getContractsService({ customerId: getCustomerIdFromCookieServerSide(data), cookie: getCookieAsString(data?.req?.cookies) }) };
 }
 
 const ContractsPage = ({ data }: ContractsPageData) => (

package/src/services/get-address-details.service.ts

@@ -4,6 +4,7 @@ import { AddressData } from "../types/AddressData";
 export const getAddressDetailsService = async (
   id: string
 ): Promise<AddressData> => {
+  // TODO: Need to create get of single address on api
   const addressData = addressesData.find(
     (address) => String(address.id) === id
   )!;

package/src/services/get-addresses.service.ts

@@ -1,27 +1,57 @@
-import { addressesData } from "../mock/addresses-data";
-import { AddressSummaryData } from "../types/AddressData";
+import { AddressData, AddressSummaryData } from "../types/AddressData";
 import { statusFilters } from "../utils/search";
+import { API_URL } from '../utils/constants';
+import storeConfig from '../../../../discovery.config'
+import { getApiUrl } from "../utils/api";
 
 export type GetAddressesServiceProps = {
   search: string;
+  customerId: string,
   status: string;
   type: string;
   sort: string;
+  cookie: string;
 };
 
 export const getAddressesService = async ({
   search = "",
+  customerId,
   status,
   type,
   sort,
+  cookie,
 }: Partial<GetAddressesServiceProps> = {}): Promise<AddressSummaryData[]> => {
-  return addressesData
+
+  const getAddresses = async () => {
+    try {
+      if (!customerId) {
+        return []
+      }
+      const headers = {
+        "Content-type": "application/json",
+        'Cookie': cookie ?? '',
+      }
+
+      const rawResposne = await fetch(getApiUrl('addresses', customerId), { method: 'GET', credentials: 'include', headers })
+
+      const response = await rawResposne.json()
+
+      return response?.addresses ?? []
+    } catch (err) {
+      console.log('>> err', err)
+      return []
+    }
+  }
+
+  const addressesData = await getAddresses() as AddressData[]
+
+  return addressesData && addressesData
     .filter((address) => {
       const matchesName = address.name
         .toLowerCase()
         .includes(search.toLowerCase());
-      const matchesStatus = !status || address.status === statusFilters[status];
-      const matchesType = !type || address.tags.includes(type);
+      const matchesStatus = !status || address.isActive === statusFilters[status];
+      const matchesType = !type || address.types.includes(type);
 
       return matchesName && matchesStatus && matchesType;
     })
@@ -32,9 +62,9 @@ export const getAddressesService = async ({
         case "Alphabetical Order Desc":
           return b.name.localeCompare(a.name);
         case "Active First":
-          return (b.status ? 1 : 0) - (a.status ? 1 : 0);
+          return (b.isActive ? 1 : 0) - (a.isActive ? 1 : 0);
         case "Inactive First":
-          return (a.status ? 1 : 0) - (b.status ? 1 : 0);
+          return (a.isActive ? 1 : 0) - (b.isActive ? 1 : 0);
         default:
           return 0;
       }

package/src/services/get-contracts.service.ts

@@ -2,6 +2,7 @@ import { ContractData } from "../types/ContractData";
 import { statusFilters } from "../utils/search";
 import { API_URL } from '../utils/constants';
 import storeConfig from '../../../../discovery.config'
+import { getApiUrl } from "../utils/api";
 
 
 export type GetContractsServiceProps = {
@@ -29,9 +30,9 @@ export const getContractsService = async ({
         'Cookie': cookie ?? '',
       }
 
-      const url = `${API_URL(storeConfig?.secureSubdomain ?? '', 'getContracts')}/${customerId}`
+      const rawResposne = await fetch(getApiUrl('contracts', customerId), { method: 'GET', credentials: 'include', headers })
 
-      const response = await (await fetch(url, { method: 'GET', credentials: 'include', headers })).json()
+      const response = await rawResposne.json()
 
       return response?.data?.contracts ?? []
     } catch (err) {

package/src/types/AddressData.ts

@@ -1,8 +1,8 @@
 export type AddressSummaryData = {
   id: number;
   name: string;
-  tags: string[];
-  status: boolean;
+  types: string[];
+  isActive: boolean;
 };
 
 export type AddressData = AddressSummaryData & {

package/src/utils/api.ts

@@ -0,0 +1,7 @@
+import { API_URL } from "./constants"
+import storeConfig from '../../../../discovery.config'
+
+
+export function getApiUrl(operation: string, customerId: string) {
+  return `${API_URL(storeConfig?.secureSubdomain ?? '', operation)}${customerId ? `/${customerId}` : ''}`
+}

package/src/utils/constants.ts

@@ -1,2 +1,6 @@
 export const AUT_COOKIE_KEY = 'VtexIdclientAutCookie'
-export const API_URL = (checkoutUrl: string, operation: string) => `${checkoutUrl}/_v/buyer-portal/${operation}`
+// PROD URL
+// export const API_URL = (checkoutUrl: string, operation: string) => `${checkoutUrl}/_v/buyer-portal/${operation}`
+// DEV URL - CHANGE BEFORE MERGE
+export const API_URL = (checkoutUrl?: string, operation?: string) => `https://everton--b2bfaststoredev.myvtex.com/_v/buyer-portal/${operation}`
+

package/src/utils/cookie.ts

@@ -22,6 +22,10 @@ export function getCustomerIdFromCookieServerSide(data: LoaderData) {
   return parsedCookie.customerId
 }
 
+export function getCookieAsString(cookie: Record<string, string>) {
+  return JSON.stringify(cookie).replace(/[{}]/g, '')
+}
+
 function parseJwt(token: string) {
   return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
 }