Skip to content

Commit

Permalink
Merge pull request #148 from LerianStudio/refactor/product-id-to-segm…
Browse files Browse the repository at this point in the history
…ent-id

Refactor/product id to segment
  • Loading branch information
gabrielcastr0 authored Feb 12, 2025
2 parents a92a837 + 0e44c78 commit 5065386
Show file tree
Hide file tree
Showing 71 changed files with 870 additions and 869 deletions.
6 changes: 3 additions & 3 deletions STRUCTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The project is structured into several key directories, each serving specific ro
│ | | └── [id]
│ | | ├── accounts-and-portfolios
│ | | ├── overview
│ | | └── products
│ | | └── segments
│ | ├── settings
│ | | └── organizations
│ └── api
Expand All @@ -40,8 +40,8 @@ The project is structured into several key directories, each serving specific ro
| | | | └── [assetId]
| | | ├── portfolios
| | | | └── [portfolioId]
| | | └── products
| | | └── [productId]
| | | └── segments
| | | └── [segmentId]
| | |
| | └── ledgers-assets
| └── utils
Expand Down
4 changes: 2 additions & 2 deletions locales/compiled/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"common.new.account": "New Account",
"common.new.asset": "New Asset",
"common.new.portfolio": "New Portfolio",
"common.new.product": "New Product",
"common.new.segment": "New Product",
"common.noOptions": "No options found.",
"common.none": "None",
"common.operations": "Operations",
Expand Down Expand Up @@ -372,4 +372,4 @@
"transactions.subtitle": "View, edit, and manage the transactions of a specific ledger.",
"transactions.tab.create": "New Transaction",
"transactions.title": "Transactions"
}
}
40 changes: 20 additions & 20 deletions locales/extracted/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"common.new.account": "New Account",
"common.new.asset": "New Asset",
"common.new.portfolio": "New Portfolio",
"common.new.product": "New Product",
"common.new.segment": "New Segment",
"common.noOptions": "No options found.",
"common.none": "None",
"common.operations": "Operations",
Expand Down Expand Up @@ -102,7 +102,7 @@
"entity.portfolio.description": "Enter the unique identifier for the entity associated with this portfolio",
"entity.portfolio.entityId": "Entity Id",
"entity.portfolio.name": "Portfolio Name",
"entity.product.name": "Product Name",
"entity.segment.name": "Segment Name",
"entity.transaction.asset": "Asset",
"entity.transaction.value": "Value",
"entity.transactions.data": "Data",
Expand All @@ -115,7 +115,7 @@
"error.midaz.assetNameOrCodeDuplicate": "Error Midaz asset name or code duplicate",
"error.midaz.codeUpperCaseRequirement": "Error Midaz code upper case requirement",
"error.midaz.currencyCodeStandardCompliance": "Error Midaz currency code standard compliance",
"error.midaz.duplicateProductNameError": "Error Midaz duplicate product name error",
"error.midaz.duplicateSegmentNameError": "Error Midaz duplicate segment name error",
"error.midaz.entityNotFound": "Error Midaz entity not found",
"error.midaz.invalidCodeFormat": "Error Midaz invalid code format",
"error.midaz.invalidCountryCode": "Error Midaz invalid country code",
Expand Down Expand Up @@ -185,8 +185,8 @@
"ledgers.account.field.name.tooltip": "Enter the name of the account",
"ledgers.account.field.portfolio": "Portfolio",
"ledgers.account.field.portfolio.tooltip": "Portfolio that will receive this account",
"ledgers.account.field.product": "Product",
"ledgers.account.field.product.tooltip": "Category (cluster) of clients with specific characteristics",
"ledgers.account.field.segment": "Segment",
"ledgers.account.field.segment.tooltip": "Category (cluster) of clients with specific characteristics",
"ledgers.account.field.type.tooltip": "The type of account",
"ledgers.account.sheet.create.description": "Fill in the details of the Account you want to create.",
"ledgers.account.sheet.create.title": "New Account",
Expand Down Expand Up @@ -228,7 +228,7 @@
"ledgers.portfolio.deleteDialog.description": "You will delete a portfolio",
"ledgers.portfolio.deleteDialog.title": "Are you sure?",
"ledgers.portfolio.sheet.description": "Fill in the details of the Portfolio you want to create.",
"ledgers.portfolio.sheet.edit.description": "View and edit product fields.",
"ledgers.portfolio.sheet.edit.description": "View and edit segment fields.",
"ledgers.portfolio.sheet.edit.title": "Edit {portfolioName}",
"ledgers.portfolio.sheet.tabs.details": "Portfolio Details",
"ledgers.portfolio.sheet.title": "New Portfolio",
Expand All @@ -237,16 +237,16 @@
"ledgers.portfolio.tooltip": "Create portfolios and link accounts to manage more efficiently.",
"ledgers.portfolios.emptyResource": "You haven't created any Portfolios yet",
"ledgers.portfolios.showing": "{number, plural, =0 {No portfolios found} one {Showing {count} portfolio} other {Showing {count} portfolios}}.",
"ledgers.products.emptyResource": "You haven't created any Products yet",
"ledgers.products.sheet.description": "Fill in the details of the Product you want to create.",
"ledgers.products.sheet.edit.description": "View and edit product fields.",
"ledgers.products.sheet.edit.title": "Edit \"{productName}\"",
"ledgers.products.sheet.tabs.details": "Product Details",
"ledgers.products.sheet.title": "New Product",
"ledgers.products.showing": "{number, plural, =0 {No products found} one {Showing {count} product} other {Showing {count} products}}.",
"ledgers.products.subtitle": "Manage the products of this ledger.",
"ledgers.products.title": "Products",
"ledgers.products.tooltip": "Clustering or allocation of customers at different levels.",
"ledgers.segments.emptyResource": "You haven't created any Segments yet",
"ledgers.segments.sheet.description": "Fill in the details of the Segment you want to create.",
"ledgers.segments.sheet.edit.description": "View and edit segment fields.",
"ledgers.segments.sheet.edit.title": "Edit \"{segmentName}\"",
"ledgers.segments.sheet.tabs.details": "Segment Details",
"ledgers.segments.sheet.title": "New Segment",
"ledgers.segments.showing": "{number, plural, =0 {No segments found} one {Showing {count} segment} other {Showing {count} segments}}.",
"ledgers.segments.subtitle": "Manage the segments of this ledger.",
"ledgers.segments.title": "Segments",
"ledgers.segments.tooltip": "Clustering or allocation of customers at different levels.",
"ledgers.sheet.tabs.details": "Ledger Details",
"ledgers.sheetCreate.description": "Fill in the data of the Ledger you wish to create.",
"ledgers.sheetCreate.title": "New Ledger",
Expand All @@ -256,7 +256,7 @@
"ledgers.tab.assets": "Assets",
"ledgers.tab.overview": "Overview",
"ledgers.tab.portfolios": "Portfolios",
"ledgers.tab.products": "Products",
"ledgers.tab.segments": "Segments",
"ledgers.title": "Ledgers",
"ledgers.toast.accountCreated": "{accountName} account successfully created",
"ledgers.toast.accountDeleted": "{accountName} account successfully deleted",
Expand Down Expand Up @@ -299,12 +299,12 @@
"organizations.title": "Settings",
"organizations.toast.create.success": "Organization created!",
"organizations.toast.update.success": "Organization updated successfully!",
"products.delete.description": "You are about to permanently delete this product. This action cannot be undone. Do you wish to continue?",
"segments.delete.description": "You are about to permanently delete this segment. This action cannot be undone. Do you wish to continue?",
"settings.system.language": "Language",
"settings.system.locale.description": "Select the language you would like to use on Midaz.",
"settings.system.paper.description": "Adjust system preferences.",
"settings.tab.portfolios": "Portfolios",
"settings.tab.products": "Products",
"settings.tab.segments": "Segments",
"settings.tabs.organizations": "Organizations",
"settings.tabs.system": "System",
"settings.title": "Settings",
Expand All @@ -316,7 +316,7 @@
"settingsDropdown.system": "System",
"sideBar.accountHolders.accounts": "Accounts",
"sideBar.accountHolders.portfolios": "Portfolios",
"sideBar.accountHolders.products": "Products",
"sideBar.accountHolders.segments": "Segments",
"sideBar.accountHolders.title": "AccountHolders",
"sideBar.home": "Home",
"sideBar.ledgers": "Ledgers",
Expand Down
38 changes: 19 additions & 19 deletions locales/extracted/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
"settingsDialog.title": "Configurações",
"sideBar.accountHolders.accounts": "Contas",
"sideBar.accountHolders.portfolios": "Portfólios",
"sideBar.accountHolders.products": "Produtos",
"sideBar.accountHolders.title": "AccountHolders",
"sideBar.home": "Home",
"sideBar.ledgers": "Ledgers",
Expand Down Expand Up @@ -79,7 +78,6 @@
"error.midaz.invalidType": "O 'tipo' fornecido não é válido. Os tipos aceitos são moeda, criptografia, commodities ou outros. Forneça um tipo válido.",
"error.midaz.assetNameOrCodeDuplicate": "Já existe um ativo com o mesmo nome ou código em seu razão. Modifique o nome ou código do seu novo ativo.",
"error.midaz.invalidScriptError": "O script fornecido na sua solicitação é inválido ou está em um formato incompatível. Verifique o formato do script e tente novamente.",
"error.midaz.duplicateProductNameError": "Já existe um produto com o nome para este ID contábil. Tente novamente com um razão ou nome diferente.",
"error.midaz.unauthorized": "O token fornecido está expirado, inválido ou malformado. Forneça um token válido e tente novamente.",
"error.midaz.accountIneligibilityError": "Uma ou mais contas listadas na transação não são elegíveis para participar. Revise o status da conta e tente novamente.",
"error.midaz.insufficientFundsError": "A transação não pôde ser concluída devido a fundos insuficientes na conta. Adicione fundos suficientes à sua conta e tente novamente.",
Expand All @@ -103,7 +101,6 @@
"common.name": "Nome",
"common.requiredFields": "(*) campos obrigatórios.",
"common.table.metadata": "{number, plural, =0 {-} one {# registro} other {# registros}}",
"entity.product.name": "Nome do Produto",
"errors.custom.date.invalid": "Data inválida",
"errors.custom.one_lowercase_letter": "Campo deve conter pelo menos 1 letra minúscula",
"errors.custom.one_number": "Campo deve conter pelo menos 1 número",
Expand All @@ -123,20 +120,10 @@
"errors.too_small.string.exact": "Campo deve conter exatamente {minimum} {minimum, plural, =0 {caracteres} one {caractere} other {caracteres}}",
"errors.too_small.string.inclusive": "Campo deve conter no mínimo {minimum} {minimum, plural, =0 {caracteres} one {caractere} other {caracteres}}",
"errors.too_small.string.not_inclusive": "Campo deve conter mais de {minimum} {minimum, plural, =0 {caracteres} one {caractere} other {caracteres}}",
"ledgers.products.sheet.description": "Preencha os dados do Produto que você deseja criar.",
"ledgers.products.sheet.title": "Novo Produto",
"ledgers.products.subtitle": "Gerencie os produtos deste ledger.",
"ledgers.products.title": "Produtos",
"ledgers.tab.products": "Produtos",
"settings.tab.products": "Produtos",
"ledgers.products.emptyResource": "Você ainda não criou um Produto.",
"ledgers.products.sheet.edit.description": "Visualize e edite os campos do produto.",
"ledgers.products.sheet.edit.title": "Editar \"{productName}\"",
"common.confirmDeletion": "Confirmar Exclusão",
"common.remove": "Remover",
"common.send": "Enviar",
"organizations.delete.description": "Você está prestes a excluir permanentemente esta organização. Essa ação não pode ser desfeita. Deseja continuar?",
"products.delete.description": "Você está prestes a excluir permanentemente este produto. Essa ação não pode ser desfeita. Deseja continuar?",
"entity.address": "Endereço",
"entity.address.city": "Cidade",
"entity.address.complement": "Complemento",
Expand Down Expand Up @@ -207,8 +194,6 @@
"ledgers.account.field.name.tooltip": "Insira o nome da conta",
"ledgers.account.field.portfolio": "Portfólio",
"ledgers.account.field.portfolio.tooltip": "Portfólio que vai receber essa conta",
"ledgers.account.field.product": "Produto",
"ledgers.account.field.product.tooltip": "Categoria (cluster) de clientes com características específicas",
"ledgers.account.sheet.create.description": "Preencha os detalhes da Conta que deseja criar.",
"ledgers.account.sheet.create.title": "Nova Conta",
"ledgers.account.sheet.edit.description": "Visualizar e editar campos da conta.",
Expand Down Expand Up @@ -270,15 +255,13 @@
"ledgers.account.sheet.tabs.details": "Detalhes da Conta",
"ledgers.assets.sheet.tabs.details": "Detalhes do Ativo",
"ledgers.portfolio.sheet.tabs.details": "Detalhes do Portfólio",
"ledgers.products.sheet.tabs.details": "Detalhes do Produto",
"ledgers.sheet.tabs.details": "Detalhes do Ledger",
"common.records": "registros",
"ledgers.tab.accounts": "Contas",
"ledgers.tab.portfolios": "Portfólios",
"settings.tab.portfolios": "Portfólios",
"notFound.backToHome": "Voltar para Home",
"ledgers.assets.showing": "{number, plural, =0 {Nenhum ativo encontrado} one {Mostrando {count} ativo} other {Mostrando {count} ativos}}.",
"ledgers.products.showing": "{number, plural, =0 {Nenhum produto encontrado} one {Mostrando {count} produto} other {Mostrando {count} produtos}}.",
"ledgers.showing": "Mostrando {count} {number, plural, =0 {ledgers} one {ledger} other {ledgers}}.",
"ledgers.accounts.showing": "{number, plural, =0 {Nenhum conta encontrado} one {Mostrando {count} conta} other {Mostrando {count} contas}}.",
"ledgers.portfolios.showing": "{number, plural, =0 {Nenhum portfólio encontrado} one {Mostrando {count} portfólio} other {Mostrando {count} portfólios}}.",
Expand Down Expand Up @@ -340,8 +323,6 @@
"settings.tabs.system": "Sistema",
"notAuthorized.backToHome": "Voltar para Home",
"notAuthorized.title": "Você não tem autorização para acessar esta página.",
"common.new.product": "Novo Produto",
"ledgers.products.tooltip": "Clusterização ou alocação de clientes em diferentes níveis.",
"common.new.asset": "Novo Ativo",
"ledgers.assets.tooltip": "Moedas ou ativos de quaisquer naturezas transacionados neste Ledger.",
"common.new.portfolio": "Novo Portfólio",
Expand Down Expand Up @@ -386,5 +367,24 @@
"transactions.tab.operations": "Operações e Metadados",
"transactions.tab.summary": "Resumo",
"transactions.toast.update.success": "Transação atualizada com sucesso",
"common.new.segment": "Novo Segmento",
"entity.segment.name": "Nome do Segmento",
"error.midaz.duplicateSegmentNameError": "Já existe um segmento com o nome para este ID contábil. Tente novamente com um razão ou nome diferente.",
"ledgers.account.field.segment": "Segmento",
"ledgers.account.field.segment.tooltip": "Categoria (cluster) de clientes com características específicas",
"ledgers.segments.emptyResource": "Você ainda não criou um Segmento.",
"ledgers.segments.sheet.description": "Preencha os dados do Segmento que você deseja criar.",
"ledgers.segments.sheet.edit.description": "Visualize e edite os campos do segmento.",
"ledgers.segments.sheet.edit.title": "Editar \"{segmentName}\"",
"ledgers.segments.sheet.tabs.details": "Detalhes do Segmento",
"ledgers.segments.sheet.title": "Novo Segmento",
"ledgers.segments.showing": "{number, plural, =0 {Nenhum segmento encontrado} one {Mostrando {count} segmento} other {Mostrando {count} segmentos}}.",
"ledgers.segments.subtitle": "Gerencie os segmentos deste ledger.",
"ledgers.segments.title": "Segmentos",
"ledgers.segments.tooltip": "Clusterização ou alocação de clientes em diferentes níveis.",
"ledgers.tab.segments": "Segmentos",
"segments.delete.description": "Você está prestes a excluir permanentemente este segmento. Essa ação não pode ser desfeita. Deseja continuar?",
"settings.tab.segments": "Segmentos",
"sideBar.accountHolders.segments": "Segmentos",
"common.user": "Usuário"
}
30 changes: 15 additions & 15 deletions src/app/(routes)/ledgers/[id]/accounts/accounts-sheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { DialogProps } from '@radix-ui/react-dialog'
import { LoadingButton } from '@/components/ui/loading-button'
import { useOrganization } from '@/context/organization-provider/organization-provider-client'
import { MetadataField } from '@/components/form/metadata-field'
import { useListProducts } from '@/client/products'
import { useListSegments } from '@/client/segments'
import { useCreateAccount, useUpdateAccount } from '@/client/accounts'
import { useListPortfolios } from '@/client/portfolios'
import { isNil, omitBy } from 'lodash'
Expand Down Expand Up @@ -46,7 +46,7 @@ const initialValues = {
name: '',
entityId: '',
portfolioId: '',
productId: '',
segmentId: '',
assetCode: '',
alias: '',
type: '',
Expand All @@ -70,7 +70,7 @@ export const AccountSheet = ({
const { id: ledgerId } = useParams<{ id: string }>()
const { currentOrganization } = useOrganization()

const { data: rawProductListData } = useListProducts({
const { data: rawSegmentListData } = useListSegments({
organizationId: currentOrganization.id!,
ledgerId
})
Expand All @@ -89,14 +89,14 @@ export const AccountSheet = ({
)
}, [rawPortfolioData])

const productListData = useMemo(() => {
const segmentListData = useMemo(() => {
return (
rawProductListData?.items?.map((product) => ({
value: product.id,
label: product.name
rawSegmentListData?.items?.map((segment) => ({
value: segment.id,
label: segment.name
})) || []
)
}, [rawProductListData])
}, [rawSegmentListData])

const { data: rawAssetListData } = useListAssets({
organizationId: currentOrganization.id!,
Expand Down Expand Up @@ -412,21 +412,21 @@ export const AccountSheet = ({

<SelectField
control={form.control}
name="productId"
name="segmentId"
label={intl.formatMessage({
id: 'ledgers.account.field.product',
defaultMessage: 'Product'
id: 'ledgers.account.field.segment',
defaultMessage: 'Segment'
})}
tooltip={intl.formatMessage({
id: 'ledgers.account.field.product.tooltip',
id: 'ledgers.account.field.segment.tooltip',
defaultMessage:
'Category (cluster) of clients with specific characteristics'
})}
required
>
{productListData?.map((product) => (
<SelectItem key={product.value} value={product.value}>
{product.label}
{segmentListData?.map((segment) => (
<SelectItem key={segment.value} value={segment.value}>
{segment.label}
</SelectItem>
))}
</SelectField>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const AccountsTabContent = () => {
...account,
assetCode: account.assetCode,
parentAccountId: account.parentAccountId,
productId: account.productId,
segmentId: account.segmentId,
metadata: account.metadata,
portfolioId: account.portfolio?.id,
portfolioName: account.portfolio?.name
Expand Down
Loading

0 comments on commit 5065386

Please sign in to comment.