From 0219561dd92772089e9143f6e1e515fd2c67e104 Mon Sep 17 00:00:00 2001 From: Lukasz Ostrowski Date: Fri, 10 Feb 2023 16:29:54 +0100 Subject: [PATCH] Remove firstName and lastName from billing address of the company and form (#143) * [Invoices] Remove firstName and lastName from billing address of the company and form * Fix fixtures --- .changeset/new-walls-appear.md | 5 +++++ apps/invoices/src/fixtures/mock-address.ts | 2 -- .../src/modules/app-configuration/address.ts | 15 +++++++++++---- .../app-config-container.test.ts | 2 -- .../app-configuration/app-config-container.ts | 2 -- .../app-config-input-schema.test.ts | 2 -- .../app-configuration/app-config-input-schema.ts | 2 -- .../src/modules/app-configuration/app-config.ts | 15 ++------------- .../app-configuration/fallback-app-config.ts | 2 -- .../modules/app-configuration/ui/address-form.tsx | 2 -- .../microinvoice-invoice-generator.ts | 1 - .../src/modules/shop-info/shop-info-fetcher.ts | 2 -- 12 files changed, 18 insertions(+), 34 deletions(-) create mode 100644 .changeset/new-walls-appear.md diff --git a/.changeset/new-walls-appear.md b/.changeset/new-walls-appear.md new file mode 100644 index 0000000..4134379 --- /dev/null +++ b/.changeset/new-walls-appear.md @@ -0,0 +1,5 @@ +--- +"saleor-app-invoices": minor +--- + +Remove firstName and lastName fields in billing address of a company diff --git a/apps/invoices/src/fixtures/mock-address.ts b/apps/invoices/src/fixtures/mock-address.ts index 9e0b92c..20e4cb5 100644 --- a/apps/invoices/src/fixtures/mock-address.ts +++ b/apps/invoices/src/fixtures/mock-address.ts @@ -7,8 +7,6 @@ export const getMockAddress = (): SellerShopConfig["address"] => { companyName: "Saleor", country: "Poland", countryArea: "Dolnoslaskie", - firstName: "", - lastName: "", postalCode: "12-123", streetAddress1: "Techowa 7", streetAddress2: "", diff --git a/apps/invoices/src/modules/app-configuration/address.ts b/apps/invoices/src/modules/app-configuration/address.ts index 635bf79..edaa15e 100644 --- a/apps/invoices/src/modules/app-configuration/address.ts +++ b/apps/invoices/src/modules/app-configuration/address.ts @@ -1,15 +1,22 @@ -import { SellerShopConfig } from "./app-config"; +export type SellerAddress = { + companyName: string; + cityArea: string; + countryArea: string; + streetAddress1: string; + streetAddress2: string; + postalCode: string; + city: string; + country: string; +}; export const Address = { - createEmpty(): SellerShopConfig["address"] { + createEmpty(): SellerAddress { return { city: "", cityArea: "", companyName: "", country: "", countryArea: "", - firstName: "", - lastName: "", postalCode: "", streetAddress1: "", streetAddress2: "", diff --git a/apps/invoices/src/modules/app-configuration/app-config-container.test.ts b/apps/invoices/src/modules/app-configuration/app-config-container.test.ts index 36c68ff..ef5fdc2 100644 --- a/apps/invoices/src/modules/app-configuration/app-config-container.test.ts +++ b/apps/invoices/src/modules/app-configuration/app-config-container.test.ts @@ -8,8 +8,6 @@ const getDefaultAddressData = (): SellerShopConfig["address"] => ({ companyName: "Saleor", country: "", countryArea: "", - firstName: "", - lastName: "", postalCode: "", streetAddress1: "", streetAddress2: "", diff --git a/apps/invoices/src/modules/app-configuration/app-config-container.ts b/apps/invoices/src/modules/app-configuration/app-config-container.ts index 2766c9b..6abc269 100644 --- a/apps/invoices/src/modules/app-configuration/app-config-container.ts +++ b/apps/invoices/src/modules/app-configuration/app-config-container.ts @@ -6,8 +6,6 @@ const getDefaultEmptyAddress = (): SellerShopConfig["address"] => ({ companyName: "", country: "", countryArea: "", - firstName: "", - lastName: "", postalCode: "", streetAddress1: "", streetAddress2: "", diff --git a/apps/invoices/src/modules/app-configuration/app-config-input-schema.test.ts b/apps/invoices/src/modules/app-configuration/app-config-input-schema.test.ts index ab839f3..6cea42e 100644 --- a/apps/invoices/src/modules/app-configuration/app-config-input-schema.test.ts +++ b/apps/invoices/src/modules/app-configuration/app-config-input-schema.test.ts @@ -23,8 +23,6 @@ describe("appConfigInputSchema", () => { companyName: "", country: "", countryArea: "", - firstName: "", - lastName: "", postalCode: "", streetAddress1: "", streetAddress2: "", diff --git a/apps/invoices/src/modules/app-configuration/app-config-input-schema.ts b/apps/invoices/src/modules/app-configuration/app-config-input-schema.ts index 518b0f6..5ff4d80 100644 --- a/apps/invoices/src/modules/app-configuration/app-config-input-schema.ts +++ b/apps/invoices/src/modules/app-configuration/app-config-input-schema.ts @@ -13,8 +13,6 @@ export const appConfigInputSchema = z.object({ streetAddress1: z.string().min(0), streetAddress2: z.string().min(0), postalCode: z.string().min(0), - firstName: z.string().min(0), - lastName: z.string().min(0), city: z.string().min(0), country: z.string().min(0), }), diff --git a/apps/invoices/src/modules/app-configuration/app-config.ts b/apps/invoices/src/modules/app-configuration/app-config.ts index 29d6fdb..685f340 100644 --- a/apps/invoices/src/modules/app-configuration/app-config.ts +++ b/apps/invoices/src/modules/app-configuration/app-config.ts @@ -1,18 +1,7 @@ -import { AddressFragment } from "../../../generated/graphql"; +import { SellerAddress } from "./address"; export interface SellerShopConfig { - address: { - companyName: string; - cityArea: string; - countryArea: string; - streetAddress1: string; - streetAddress2: string; - postalCode: string; - firstName: string; - lastName: string; - city: string; - country: string; - }; + address: SellerAddress; } export type ShopConfigPerChannelSlug = Record; diff --git a/apps/invoices/src/modules/app-configuration/fallback-app-config.ts b/apps/invoices/src/modules/app-configuration/fallback-app-config.ts index 1b89850..8487958 100644 --- a/apps/invoices/src/modules/app-configuration/fallback-app-config.ts +++ b/apps/invoices/src/modules/app-configuration/fallback-app-config.ts @@ -18,8 +18,6 @@ export const FallbackAppConfig = { companyName: shopAddress?.companyAddress?.companyName ?? "", country: shopAddress?.companyAddress?.country.country ?? "", countryArea: shopAddress?.companyAddress?.countryArea ?? "", - firstName: shopAddress?.companyAddress?.firstName ?? "", - lastName: shopAddress?.companyAddress?.lastName ?? "", postalCode: shopAddress?.companyAddress?.postalCode ?? "", streetAddress1: shopAddress?.companyAddress?.streetAddress1 ?? "", streetAddress2: shopAddress?.companyAddress?.streetAddress2 ?? "", diff --git a/apps/invoices/src/modules/app-configuration/ui/address-form.tsx b/apps/invoices/src/modules/app-configuration/ui/address-form.tsx index af866a8..014f480 100644 --- a/apps/invoices/src/modules/app-configuration/ui/address-form.tsx +++ b/apps/invoices/src/modules/app-configuration/ui/address-form.tsx @@ -61,8 +61,6 @@ export const AddressForm = (props: Props) => { channel: - -
diff --git a/apps/invoices/src/modules/invoice-generator/microinvoice/microinvoice-invoice-generator.ts b/apps/invoices/src/modules/invoice-generator/microinvoice/microinvoice-invoice-generator.ts index 486fb26..3e044fc 100644 --- a/apps/invoices/src/modules/invoice-generator/microinvoice/microinvoice-invoice-generator.ts +++ b/apps/invoices/src/modules/invoice-generator/microinvoice/microinvoice-invoice-generator.ts @@ -70,7 +70,6 @@ export class MicroinvoiceInvoiceGenerator implements InvoiceGenerator { { label: "Seller", value: [ - `${companyAddressData.firstName} ${companyAddressData.lastName}`, companyAddressData.companyName, companyAddressData.streetAddress1, companyAddressData.streetAddress2, diff --git a/apps/invoices/src/modules/shop-info/shop-info-fetcher.ts b/apps/invoices/src/modules/shop-info/shop-info-fetcher.ts index ba3f0c8..5264a5f 100644 --- a/apps/invoices/src/modules/shop-info/shop-info-fetcher.ts +++ b/apps/invoices/src/modules/shop-info/shop-info-fetcher.ts @@ -9,8 +9,6 @@ gql` code } city - firstName - lastName streetAddress1 streetAddress2 companyName