Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: fix enums naming convention in all project #448

Merged
merged 3 commits into from
Jan 30, 2023
+73 −73
Merged

Fix: fix enums naming convention in all project #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95e509c
fix enum naming convension in all project
ErezBiren Jan 18, 2023
b6b1464
Merge branch 'master' into erezb-fix_enum_naming_convension
ErezBiren Jan 26, 2023
612f622
Fix merge problems
ErezBiren Jan 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui-react/src/Store.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ describe('Store', () => {
test('addImporter', () => {
const accountToAdd: Importer = {
id: 'moshe',
companyId: CompanyTypes.hapoalim,
companyId: CompanyTypes.HAPOALIM,
displayName: 'פועלים',
loginFields: {
username: 'david'
Expand Down
64 changes: 32 additions & 32 deletions ui-react/src/accountMetadata.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ const icons = {
};

const accountIdToDisplayName: Record<CompanyTypes | OutputVendorName, string> = {
[CompanyTypes.max]: 'Max',
[CompanyTypes.amex]: 'אמריקן אקספרס',
[CompanyTypes.beinleumi]: 'הבינלאומי',
[CompanyTypes.hapoalimBeOnline]: 'הפועלים בי אונליין',
[CompanyTypes.isracard]: 'ישראכרט',
[CompanyTypes.leumiCard]: 'לאומי קארד',
[CompanyTypes.otsarHahayal]: 'אוצר החייל',
[CompanyTypes.union]: 'איגוד',
[CompanyTypes.leumi]: 'לאומי',
[CompanyTypes.mizrahi]: 'מזרחי',
[CompanyTypes.hapoalim]: 'הפועלים',
[CompanyTypes.visaCal]: 'ויזה כאל',
[CompanyTypes.discount]: 'דיסקונט',
[CompanyTypes.yahav]: 'יהב',
[CompanyTypes.beyahadBishvilha]: 'ביחד בשבילך',
[CompanyTypes.massad]: 'מסד',
[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',
Expand All @@ -50,22 +50,22 @@ const ID_FIELD = 'id';
const NATIONAL_ID_FIELD = 'nationalID';

export const IMPORTERS_LOGIN_FIELDS = {
[CompanyTypes.hapoalim]: [USERCODE_FIELD, PASSWORD_FIELD],
[CompanyTypes.hapoalimBeOnline]: [USERCODE_FIELD, PASSWORD_FIELD],
[CompanyTypes.leumi]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.mizrahi]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.discount]: [ID_FIELD, PASSWORD_FIELD, NUM_FIELD],
[CompanyTypes.otsarHahayal]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.leumiCard]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.max]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.visaCal]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.isracard]: [ID_FIELD, CARD_SIX_DIGITS_FIELD, PASSWORD_FIELD],
[CompanyTypes.amex]: [ID_FIELD, CARD_SIX_DIGITS_FIELD, PASSWORD_FIELD],
[CompanyTypes.union]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.beinleumi]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.massad]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.yahav]: [USERNAME_FIELD, PASSWORD_FIELD, NATIONAL_ID_FIELD],
[CompanyTypes.beyahadBishvilha]: [USERNAME_FIELD, PASSWORD_FIELD]
[CompanyTypes.HAPOALIM]: [USERCODE_FIELD, PASSWORD_FIELD],
[CompanyTypes.HAPOALIM_BE_ONLINE]: [USERCODE_FIELD, PASSWORD_FIELD],
[CompanyTypes.LEUMI]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.MIZRAHI]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.DISCOUNT]: [ID_FIELD, PASSWORD_FIELD, NUM_FIELD],
[CompanyTypes.OTSAR_HAHAYAL]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.LEUMI_CARD]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.MAX]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.VISACAL]: [USERNAME_FIELD, PASSWORD_FIELD],
[CompanyTypes.ISRACARD]: [ID_FIELD, CARD_SIX_DIGITS_FIELD, PASSWORD_FIELD],
[CompanyTypes.AMEX]: [ID_FIELD, CARD_SIX_DIGITS_FIELD, PASSWORD_FIELD],
[CompanyTypes.UNION]: [USERNAME_FIELD, PASSWORD_FIELD],
[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]
};

export const LOGIN_FIELD_DISPLAY_NAMES = {
Expand Down
22 changes: 11 additions & 11 deletions ui-react/src/components/Body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ const Body = ({ scrape }: BodyProps) => {
const store = useContext(StoreContext);
const { config } = store;
const { isScraping } = store;
const [modalStatus, setModalStatus] = useState<ModalStatus>(ModalStatus.Hidden);
const [modalStatus, setModalStatus] = useState<ModalStatus>(ModalStatus.HIDDEN);

const [currentAccount, setCurrentAccount] = useState<Account>();
const closeModal = () => setModalStatus(ModalStatus.Hidden);
const closeModal = () => setModalStatus(ModalStatus.HIDDEN);
const showModal = (account: Account, status: ModalStatus) => {
setCurrentAccount(account);
setModalStatus(status);
Expand All @@ -42,7 +42,7 @@ const Body = ({ scrape }: BodyProps) => {
const wideModal = shouldShowWideModal(modalStatus, currentAccount);

const newScraperClicked = () => {
setModalStatus(ModalStatus.NewScraper);
setModalStatus(ModalStatus.NEW_SCRAPER);
};

const createImporter = async (importer: Importer) => {
Expand Down Expand Up @@ -80,27 +80,27 @@ const Body = ({ scrape }: BodyProps) => {
}
</Stack>
</div>
<Modal show={modalStatus !== ModalStatus.Hidden} onHide={closeModal} dialogClassName={wideModal ? styles.modalWide : ''}>
<Modal show={modalStatus !== ModalStatus.HIDDEN} onHide={closeModal} dialogClassName={wideModal ? styles.modalWide : ''}>
<Modal.Header closeButton className={styles.modalHeader}>
</Modal.Header>
<Modal.Body>
{modalStatus === ModalStatus.Logs && currentAccount && <AccountLogs logs={currentAccount.logs} />}
{modalStatus === ModalStatus.LOGS && currentAccount && <AccountLogs logs={currentAccount.logs} />}
{
modalStatus === ModalStatus.ImporterSettings && currentAccount
modalStatus === ModalStatus.IMPORTER_SETTINGS && currentAccount
&& <EditImporter handleSave={updateImporter} importer={currentAccount} handleDelete={deleteImporter} />
}
{
modalStatus === ModalStatus.SettingsExporter && currentAccount
modalStatus === ModalStatus.EXPORTER_SETTINGS && currentAccount
&& <EditExporter handleSave={updateExporter} exporter={currentAccount} handleDelete={deleteImporter} />
}
{modalStatus === ModalStatus.NewScraper && <CreateImporter handleSave={createImporter} />}
{modalStatus === ModalStatus.GeneralSettings && <GeneralSettings />}
{modalStatus === ModalStatus.NEW_SCRAPER && <CreateImporter handleSave={createImporter} />}
{modalStatus === ModalStatus.GENERAL_SETTINGS && <GeneralSettings />}
</Modal.Body>
</Modal>
</Container>
<Container className={styles.buttonsContainer}>
<Button variant="dark" size="lg" className={styles.scrapeButton} onClick={scrape} disabled={store.isScraping}>הפעל</Button>
<Image src={settingsIcon} onClick={() => showModal(null, ModalStatus.GeneralSettings)} />
<Image src={settingsIcon} onClick={() => showModal(null, ModalStatus.GENERAL_SETTINGS)} />
<Form.Check
type="switch"
onClick={toggleUIVersion}
Expand All @@ -116,7 +116,7 @@ const Body = ({ scrape }: BodyProps) => {
};

function shouldShowWideModal(modalStatus: ModalStatus, currentAccount?: Account) {
return modalStatus === ModalStatus.SettingsExporter && currentAccount && currentAccount.companyId === OutputVendorName.YNAB;
return modalStatus === ModalStatus.EXPORTER_SETTINGS && currentAccount && currentAccount.companyId === OutputVendorName.YNAB;
}

export default observer(Body);
4 changes: 2 additions & 2 deletions ui-react/src/components/accounts/Importers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ function Importers({
export function getActionButtons(showModal, account: AccountType, isScraping): ActionButton[] {
const logsActionButton = {
icon: logsIcon,
clickHandler: () => showModal(account, ModalStatus.LOGS),
tooltipText: 'לוגים',
clickHandler: () => showModal(account, ModalStatus.Logs),
};

const store = useContext(StoreContext);

const accountSettingsActionButton = {
icon: settingsIcon,
clickHandler: () => showModal(account, account.type === TypeOfAccount.IMPORTER
? ModalStatus.ImporterSettings : ModalStatus.SettingsExporter),
? ModalStatus.IMPORTER_SETTINGS : ModalStatus.EXPORTER_SETTINGS),
tooltipText: 'הגדרות'
};

Expand Down
54 changes: 27 additions & 27 deletions ui-react/src/types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,34 +78,34 @@ export interface AccountToScrapeConfig {
}

export enum CompanyTypes {
hapoalim = 'hapoalim',
hapoalimBeOnline = 'hapoalimBeOnline',
beinleumi = 'beinleumi',
union = 'union',
amex = 'amex',
isracard = 'isracard',
visaCal = 'visaCal',
max = 'max',
leumiCard = 'leumiCard',
otsarHahayal = 'otsarHahayal',
discount = 'discount',
mizrahi = 'mizrahi',
leumi = 'leumi',
massad = 'massad',
yahav = 'yahav',
beyahadBishvilha = 'beyahadBishvilha',
HAPOALIM = 'hapoalim',
HAPOALIM_BE_ONLINE = 'hapoalimBeOnline',
BEINLEUMI = 'beinleumi',
UNION = 'union',
AMEX = 'amex',
ISRACARD = 'isracard',
VISACAL = 'visaCal',
MAX = 'max',
LEUMI_CARD = 'leumiCard',
OTSAR_HAHAYAL = 'otsarHahayal',
DISCOUNT = 'discount',
MIZRAHI = 'mizrahi',
LEUMI = 'leumi',
MASSAD = 'massad',
YAHAV = 'yahav',
BEYAHAD_BISHVILHA = 'beyahadBishvilha',
}

export enum AccountType {
IMPORTER = 'Importer', EXPORTER = 'Exporter'
}

export enum AccountStatus {
IDLE = 'IDLE',
PENDING = 'PENDING',
IN_PROGRESS = 'IN_PROGRESS',
DONE = 'DONE',
ERROR = 'ERROR'
IDLE = 'idle',
PENDING = 'pending',
IN_PROGRESS = 'inProgress',
DONE = 'done',
ERROR = 'error'
}

export type BudgetTrackingEvent = {
Expand Down Expand Up @@ -155,12 +155,12 @@ export type AccountMetadata = {
};

export enum ModalStatus {
ImporterSettings,
SettingsExporter,
Logs,
Hidden,
NewScraper,
GeneralSettings
IMPORTER_SETTINGS,
EXPORTER_SETTINGS,
LOGS,
HIDDEN,
NEW_SCRAPER,
GENERAL_SETTINGS
}

export enum ExporterResultType {
Expand Down