From b18383cb1244563ffec0b75db31aa6a9cffd832f Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Wed, 31 Jan 2024 21:30:27 +0200 Subject: [PATCH 1/3] Update israeli-bank-scrapers-core version to 4.2.2 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f3f21050..f0074cc9 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "electron-updater": "^5.2.4", "emittery": "^0.10.0", "googleapis": "^87.0.0", - "israeli-bank-scrapers-core": "4.0.3", + "israeli-bank-scrapers-core": "4.2.2", "keytar": "^7.4.0", "lint-staged": "~13.2.3", "lodash": "^4.17.15", diff --git a/yarn.lock b/yarn.lock index e8b604e5..78cad128 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9967,10 +9967,10 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -israeli-bank-scrapers-core@4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/israeli-bank-scrapers-core/-/israeli-bank-scrapers-core-4.0.3.tgz#2a1230ea8bcd2824e561228cbbcdc139d655a592" - integrity sha512-9aUV8xz330mGZtvf60FcMOisKVQ1LjnBtLHVN97Fc09K2jbgewQ20wRVZl2bMIO/HnOfiJ8TyNLe0GSI33Jqjw== +israeli-bank-scrapers-core@4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/israeli-bank-scrapers-core/-/israeli-bank-scrapers-core-4.2.2.tgz#021a9b0987de27b99a44a26bb90793d275e7bac4" + integrity sha512-RCbpF/Gzf6gCZWfeeLQVg1FachrBhxaDU3k/H/RwTDkIIs7haii8BvQIYv2ettN+QwjZ9QGOYVPndBpF9yNF5g== dependencies: build-url "^2.0.0" core-js "^3.1.4" From 6f57f5172048b42a266d01bc737ab1bce037b68b Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Wed, 31 Jan 2024 21:53:36 +0200 Subject: [PATCH 2/3] Add behatsdaa logo and import in accountsMetadata.ts --- src/accountsMetadata.ts | 10 ++++++++-- src/ui/assets/logos/behatsdaa.png | Bin 0 -> 19961 bytes 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/ui/assets/logos/behatsdaa.png diff --git a/src/accountsMetadata.ts b/src/accountsMetadata.ts index 3bdf90be..1388aace 100644 --- a/src/accountsMetadata.ts +++ b/src/accountsMetadata.ts @@ -1,5 +1,7 @@ import { CompanyTypes } from '@/backend'; +import { OutputVendorName } from './backend/commonTypes'; import americanExpressLogo from './ui/assets/logos/americanExpress.jpeg'; +import behatsdaaLogo from './ui/assets/logos/behatsdaa.png'; import beinleumiLogo from './ui/assets/logos/beinleumi.jpeg'; import beyahadLogo from './ui/assets/logos/beyahadLogo.png'; import discountLogo from './ui/assets/logos/discount.jpeg'; @@ -13,14 +15,13 @@ import leumiCardLogo from './ui/assets/logos/leumicard.png'; import massadLogo from './ui/assets/logos/massad.png'; import maxLogo from './ui/assets/logos/max.jpeg'; import mizrahiLogo from './ui/assets/logos/mizrahi.png'; +import oneZeroLogo from './ui/assets/logos/oneZero.jpeg'; import otsarHahayalLogo from './ui/assets/logos/otsarHahayal.jpeg'; import poalimLogo from './ui/assets/logos/poalim.jpeg'; import googleSheetsLogo from './ui/assets/logos/sheets.png'; import visaCalLogo from './ui/assets/logos/visa-cal.jpeg'; import yahavLogo from './ui/assets/logos/yahavLogo.jpg'; import ynabLogo from './ui/assets/logos/ynab.jpeg'; -import oneZeroLogo from './ui/assets/logos/oneZero.jpeg'; -import { OutputVendorName } from './backend/commonTypes'; export type AccountMetadata = { companyKey: string; @@ -119,6 +120,11 @@ const ACCOUNT_METADATA: AccountsMetadata = { companyKey: CompanyTypes.oneZero, companyName: 'ONE ZERO', logo: oneZeroLogo + }, + [CompanyTypes.behatsdaa]: { + companyKey: CompanyTypes.behatsdaa, + companyName: 'בחצדעה', + logo: behatsdaaLogo } }, exporters: { diff --git a/src/ui/assets/logos/behatsdaa.png b/src/ui/assets/logos/behatsdaa.png new file mode 100644 index 0000000000000000000000000000000000000000..a151937fc52c47e1d0204d515315a28e03dd0223 GIT binary patch literal 19961 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

r%ch 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 Date: Thu, 1 Feb 2024 09:17:05 +0200 Subject: [PATCH 3/3] Add new CompanyType BEHATSDAA --- ui-react/src/accountMetadata.tsx | 123 +++++++++++++++++++------------ ui-react/src/types.tsx | 1 + 2 files changed, 75 insertions(+), 49 deletions(-) diff --git a/ui-react/src/accountMetadata.tsx b/ui-react/src/accountMetadata.tsx index f69cb3e8..ab2e9c55 100644 --- a/ui-react/src/accountMetadata.tsx +++ b/ui-react/src/accountMetadata.tsx @@ -1,43 +1,58 @@ import mapValues from 'lodash/mapValues'; import { - Account, AccountMetadata, AccountType, CompanyTypes, Exporter, ExporterResultType, - ExportResultMetadata, GoogleSheetsConfig, JsonConfig, OutputVendorName, YnabConfig, CsvConfig + Account, + AccountMetadata, + AccountType, + CompanyTypes, + Exporter, + ExporterResultType, + ExportResultMetadata, + GoogleSheetsConfig, + JsonConfig, + OutputVendorName, + YnabConfig, + CsvConfig, } from './types'; import { exporterIcons, importerIcons } from './assets'; const icons = { ...importerIcons, - ...exporterIcons + ...exporterIcons, }; -const accountIdToDisplayName: Record = { - [CompanyTypes.MAX]: 'Max', - [CompanyTypes.AMEX]: 'אמריקן אקספרס', - [CompanyTypes.BEINLEUMI]: 'הבינלאומי', - [CompanyTypes.HAPOALIM_BE_ONLINE]: 'הפועלים בי אונליין', - [CompanyTypes.ISRACARD]: 'ישראכרט', - [CompanyTypes.LEUMI_CARD]: 'לאומי קארד', - [CompanyTypes.OTSAR_HAHAYAL]: 'אוצר החייל', - [CompanyTypes.UNION]: 'איגוד', - [CompanyTypes.LEUMI]: 'לאומי', - [CompanyTypes.MIZRAHI]: 'מזרחי', - [CompanyTypes.HAPOALIM]: 'הפועלים', - [CompanyTypes.VISACAL]: 'ויזה כאל', - [CompanyTypes.DISCOUNT]: 'דיסקונט', - [CompanyTypes.YAHAV]: 'יהב', - [CompanyTypes.BEYAHAD_BISHVILHA]: 'ביחד בשבילך', - [CompanyTypes.MASSAD]: 'מסד', - [OutputVendorName.CSV]: 'אקסל', - [OutputVendorName.GOOGLE_SHEETS]: 'Google Sheets', - [OutputVendorName.YNAB]: 'Ynab', - [OutputVendorName.JSON]: 'Json', -}; +const accountIdToDisplayName: Record = + { + [CompanyTypes.MAX]: 'Max', + [CompanyTypes.AMEX]: 'אמריקן אקספרס', + [CompanyTypes.BEINLEUMI]: 'הבינלאומי', + [CompanyTypes.HAPOALIM_BE_ONLINE]: 'הפועלים בי אונליין', + [CompanyTypes.ISRACARD]: 'ישראכרט', + [CompanyTypes.LEUMI_CARD]: 'לאומי קארד', + [CompanyTypes.OTSAR_HAHAYAL]: 'אוצר החייל', + [CompanyTypes.UNION]: 'איגוד', + [CompanyTypes.LEUMI]: 'לאומי', + [CompanyTypes.MIZRAHI]: 'מזרחי', + [CompanyTypes.HAPOALIM]: 'הפועלים', + [CompanyTypes.VISACAL]: 'ויזה כאל', + [CompanyTypes.DISCOUNT]: 'דיסקונט', + [CompanyTypes.YAHAV]: 'יהב', + [CompanyTypes.BEYAHAD_BISHVILHA]: 'ביחד בשבילך', + [CompanyTypes.MASSAD]: 'מסד', + [CompanyTypes.BEHATSDAA]: 'בהצדעה', + [OutputVendorName.CSV]: 'אקסל', + [OutputVendorName.GOOGLE_SHEETS]: 'Google Sheets', + [OutputVendorName.YNAB]: 'Ynab', + [OutputVendorName.JSON]: 'Json', + }; -const accountMetadata: Record = mapValues(accountIdToDisplayName, (displayName, accountId) => { +const accountMetadata: Record< + CompanyTypes | OutputVendorName, + AccountMetadata +> = mapValues(accountIdToDisplayName, (displayName, accountId) => { return { companyId: accountId, companyName: displayName, - logo: icons[accountId] + logo: icons[accountId], }; }); @@ -65,7 +80,8 @@ export const IMPORTERS_LOGIN_FIELDS = { [CompanyTypes.BEINLEUMI]: [USERNAME_FIELD, PASSWORD_FIELD], [CompanyTypes.MASSAD]: [USERNAME_FIELD, PASSWORD_FIELD], [CompanyTypes.YAHAV]: [USERNAME_FIELD, PASSWORD_FIELD, NATIONAL_ID_FIELD], - [CompanyTypes.BEYAHAD_BISHVILHA]: [USERNAME_FIELD, PASSWORD_FIELD] + [CompanyTypes.BEYAHAD_BISHVILHA]: [USERNAME_FIELD, PASSWORD_FIELD], + [CompanyTypes.BEHATSDAA]: [ID_FIELD, PASSWORD_FIELD], }; export const LOGIN_FIELD_DISPLAY_NAMES = { @@ -88,46 +104,55 @@ export const LOGIN_FIELD_MIN_LENGTH = { [NATIONAL_ID_FIELD]: 9, }; -export const importers: Account[] = Object.values(CompanyTypes).map((importerName) => { - const { companyId, companyName, logo } = accountMetadata[importerName]; +export const importers: Account[] = Object.values(CompanyTypes).map( + (importerName) => { + const { companyId, companyName, logo } = accountMetadata[importerName]; - const importer: Account = { - id: importerName, - companyId, - displayName: companyName, - logo, - type: AccountType.IMPORTER, - active: true, - logs: [] - }; - return importer; -}); + const importer: Account = { + id: importerName, + companyId, + displayName: companyName, + logo, + type: AccountType.IMPORTER, + active: true, + logs: [], + }; + return importer; + }, +); -export const exporterUIHandlers : Record = { +export const exporterUIHandlers: Record< + OutputVendorName, + ExportResultMetadata +> = { [OutputVendorName.YNAB]: { resultType: ExporterResultType.WEBSITE_URL, getResultUri(exporter: Exporter): string { - return `https://app.youneedabudget.com/${(exporter as YnabConfig).options.budgetId}`; - } + return `https://app.youneedabudget.com/${ + (exporter as YnabConfig).options.budgetId + }`; + }, }, [OutputVendorName.GOOGLE_SHEETS]: { resultType: ExporterResultType.WEBSITE_URL, getResultUri(exporter: Exporter): string { - return `https://docs.google.com/spreadsheets/d/${(exporter as GoogleSheetsConfig).options.spreadsheetId}/edit`; - } + return `https://docs.google.com/spreadsheets/d/${ + (exporter as GoogleSheetsConfig).options.spreadsheetId + }/edit`; + }, }, [OutputVendorName.CSV]: { resultType: ExporterResultType.WEBSITE_URL, getResultUri(exporter: Exporter): string { return (exporter as CsvConfig).options.filePath; - } + }, }, [OutputVendorName.JSON]: { resultType: ExporterResultType.WEBSITE_URL, getResultUri(exporter: Exporter): string { return (exporter as JsonConfig).options.filePath; - } - } + }, + }, }; export default accountMetadata; diff --git a/ui-react/src/types.tsx b/ui-react/src/types.tsx index eed044e8..d4e93587 100644 --- a/ui-react/src/types.tsx +++ b/ui-react/src/types.tsx @@ -103,6 +103,7 @@ export enum CompanyTypes { MASSAD = 'massad', YAHAV = 'yahav', BEYAHAD_BISHVILHA = 'beyahadBishvilha', + BEHATSDAA = 'behatsdaa', } export enum AccountType {