Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
361 commits
Select commit Hold shift + click to select a range
217f94c
Feat(crm): Display my info show and edit + fix archived list
arimet Jul 23, 2024
95d77b7
Fix(crm): Improve overloading TS for dataProvider
arimet Jul 23, 2024
25b1a3a
Fix(crm): Improve code quality
jonathanarnault Jul 23, 2024
b55b85a
[no ci] [crm] Misc wording fixes
fzaninotto Jul 23, 2024
e1652ac
[no ci] [CRM] Improve contact sidebar
fzaninotto Jul 23, 2024
3df2de2
[no ci] [crm] Improve company aside look and feel
fzaninotto Jul 23, 2024
e3dc6f7
Feat(crm): Improve naming of lifecycle functions
arimet Jul 23, 2024
d71d645
Feat(crm): Change default state value for my info
arimet Jul 23, 2024
5053403
Fix(crm): Replace linkedin_url with linkedIn for harmonization
arimet Jul 23, 2024
b700713
[no ci] [crm] Fix input name in deal form
fzaninotto Jul 23, 2024
bf0fafd
[no ci] [crm] add tooltip on the last activity date
fzaninotto Jul 23, 2024
6092491
Merge pull request #10042 from marmelab/feat/crm-display-my-info-show
arimet Jul 23, 2024
8bcb32d
Merge pull request #10041 from marmelab/fix/crm-improve-technical-code
arimet Jul 23, 2024
635f5e0
Feat(crm): Add DealNote type
jonathanarnault Jul 23, 2024
5a02e7a
Fix(crm): Replace linkedinIn by linkedin_url
arimet Jul 23, 2024
4c9f398
Fix(crm): Apply suggestions from code review
arimet Jul 23, 2024
12d2013
Merge pull request #10045 from marmelab/feat/crm-eal-note-attachment
jonathanarnault Jul 23, 2024
2228c85
Merge pull request #10044 from marmelab/fix/crm-hamonize-linkedin
arimet Jul 23, 2024
11f1d6d
Feat(crm): Improve task edit
arimet Jul 23, 2024
a195ceb
Fix(crm): Add concordance between the empty components
arimet Jul 23, 2024
1e9ecb9
Merge branch 'atomic-crm' into feat/crm-customize-app
arimet Jul 23, 2024
2c38e4b
Fix(crm): Remove type from DealNote type
arimet Jul 23, 2024
fa5ad51
[Documentation] Remove v5 annoucement banner
erwanMarmelab Jul 23, 2024
8e8870e
Feat(crm): Manage the addition, update and deletion of multiple files…
arimet Jul 23, 2024
7615606
Feat(crm): Update design for edit task dialog
arimet Jul 23, 2024
0069cb8
Fix(crm): Change DealEmpty's gap size to the same as the other compon…
arimet Jul 23, 2024
1ab90ee
Feat(crm): Display total of each columns in DealList
arimet Jul 23, 2024
4fedfeb
Merge pull request #10036 from marmelab/feat/crm-customize-app
jonathanarnault Jul 24, 2024
fcbd22b
Merge branch 'atomic-crm' into feat/crm-sales
arimet Jul 24, 2024
831181c
Merge pull request #10037 from marmelab/feat/crm-sales
arimet Jul 24, 2024
1634fc8
Fix(crm): Improve spacing for empty components
arimet Jul 24, 2024
bcc6d2b
Merge branch 'atomic-crm' into feat/crm-handle-multiple-files-notes
arimet Jul 24, 2024
54d8f99
Merge branch 'atomic-crm' into feat/improve-edit-task
arimet Jul 24, 2024
20dfcfb
Feat(crm): Add ability to get back to show from deal edit and on save
jonathanarnault Jul 23, 2024
9c8ac62
Fix(crm): Improve deal modal UX
jonathanarnault Jul 23, 2024
0c3d726
Fix(crm): Fix import of Deal edit
jonathanarnault Jul 23, 2024
c1881b7
Fix(crm): It was not possible to create a deal anymore
jonathanarnault Jul 24, 2024
63e2639
Merge branch 'atomic-crm' into feat/crm-display-total-amount-deals
arimet Jul 24, 2024
881b92c
Feat(crm): Update css for notes paragraph
arimet Jul 24, 2024
b2086a6
Merge pull request #10051 from marmelab/fix/crm-empty-page
jonathanarnault Jul 24, 2024
2af777b
Merge pull request #10047 from marmelab/fix/crm-deal-dialog
jonathanarnault Jul 24, 2024
adea7bb
Fix(crm): Apply suggestions from code review
arimet Jul 24, 2024
e883b6c
Merge pull request #10056 from marmelab/feat/crm-handle-multiple-file…
arimet Jul 24, 2024
2e190b9
Merge branch 'atomic-crm' into feat/improve-edit-task
arimet Jul 24, 2024
3ca7360
Merge branch 'atomic-crm' into feat/crm-display-total-amount-deals
arimet Jul 24, 2024
c52b6c1
Merge pull request #10057 from marmelab/feat/crm-display-total-amount…
arimet Jul 24, 2024
91a854b
Merge branch 'atomic-crm' into feat/improve-edit-task
arimet Jul 24, 2024
cc760a9
Fix(crm): Ask for confirm when deleting a deal
jonathanarnault Jul 24, 2024
75df672
Merge pull request #10050 from marmelab/feat/improve-edit-task
jonathanarnault Jul 24, 2024
5f92605
Merge pull request #10059 from marmelab/fix/crm-deal-delete-confirm
arimet Jul 24, 2024
a86da7a
Fix(crm): Create a custom dataprovider for unarchive deal
arimet Jul 24, 2024
a0bb89a
Merge pull request #10060 from marmelab/fix/crm-kanban-order
jonathanarnault Jul 24, 2024
d0fd367
Feat(crm): Update redirect calls to disable scrolling to top for deal…
arimet Jul 24, 2024
e9a7f34
Feat(crm): Adds a redirection to home from the application logo
arimet Jul 24, 2024
4e7df66
Feat(crm): Harmonize application text size and improve UX for Note form
arimet Jul 24, 2024
641cd14
Feat(crm): Improve UI for contacts attached to a deal
arimet Jul 24, 2024
5a05a87
Merge pull request #10061 from marmelab/fix/crm-prevent-deal-scroll
fzaninotto Jul 25, 2024
b1652fa
Tweak look and feel of options link
fzaninotto Jul 25, 2024
5ed380e
Reduxce note heading font size, too
fzaninotto Jul 25, 2024
e0c6097
Merge pull request #10063 from marmelab/feat/crm-harmonise-text
fzaninotto Jul 25, 2024
e3248dc
Fix(crm): Set deal category insteaf of type
arimet Jul 25, 2024
3711cf5
Merge branch 'atomic-crm' into feat/crm-display-contact-deal
arimet Jul 25, 2024
e35843a
Feat(crm): Use router Link instead of onClick for Home redirection
arimet Jul 25, 2024
6fa555c
Merge pull request #10062 from marmelab/feat/crm-add-link-home-logo
arimet Jul 25, 2024
57e38cc
Merge pull request #10064 from marmelab/feat/crm-display-contact-deal
arimet Jul 25, 2024
33f013e
Feat(crm): Hamonize forms
arimet Jul 25, 2024
35e5131
Fix(crm): load activity log from rest endpoint instead of using hooks
jonathanarnault Jul 25, 2024
0dd865f
Fix(crm): Remove deal closing date future date validation
jonathanarnault Jul 25, 2024
6cbcae9
Feat(crm): Handle close dialog with buttons
arimet Jul 25, 2024
615a303
Merge pull request #10070 from marmelab/feat/crm-harmonize-form
jonathanarnault Jul 25, 2024
920530b
Merge remote-tracking branch 'origin/atomic-crm' into fix/deal-update…
jonathanarnault Jul 25, 2024
1c62237
Fix(crm): Show line break for company description and improve line-he…
arimet Jul 25, 2024
2b659b9
Merge pull request #10072 from marmelab/fix/deal-update-refresh
arimet Jul 25, 2024
83ee301
Fix(crm): Improve activity log code quality
jonathanarnault Jul 25, 2024
062f634
Feat(crm): Add activity log to dashboard
jonathanarnault Jul 25, 2024
24fcfc1
Merge pull request #10073 from marmelab/fix/crm-description-paragraph
jonathanarnault Jul 25, 2024
11bb286
Fix(crm): Prevent scroll to top when edit and save a Deal
arimet Jul 25, 2024
efe5509
Fix(crm): Add missing file for new dashboard
jonathanarnault Jul 25, 2024
bf187ef
Merge pull request #10075 from marmelab/fix/crm-deal-scroll-on-edit
arimet Jul 25, 2024
08d3045
Merge pull request #10071 from marmelab/fix/activity-log
jonathanarnault Jul 25, 2024
1a316bf
Fix(crm): Set edit and create dialog title for Deal as h6
arimet Jul 25, 2024
b6d57b2
Fix(crm): Use pessimistic update when saving a deal to avoid old data…
jonathanarnault Jul 25, 2024
12491dc
Fix(crm): Dashboard activity page size was too big
jonathanarnault Jul 25, 2024
b9329f0
Merge pull request #10077 from marmelab/fix/crm-deal-typography
jonathanarnault Jul 25, 2024
7fbf07e
Merge pull request #10078 from marmelab/fix/deal-edit-update
arimet Jul 25, 2024
28b3d75
Fix(crm): Typo for activity date
arimet Jul 25, 2024
6693e79
Merge pull request #10074 from marmelab/feat/dashboard
arimet Jul 25, 2024
330044d
Feat(crm): Set contact form into columns and regroup by categories
arimet Jul 25, 2024
717a638
Feat(crm): Set contact gender via a Radiobuttongroup
arimet Jul 25, 2024
3e002e8
Feat(crm): Display Company inputs by category in columns and improve …
arimet Jul 25, 2024
ed38e78
Feat(crm): Add a type for contact phone numbers
arimet Jul 25, 2024
7e57acf
Fix(crm): Make deals archive and unarchive buttons secondary
jonathanarnault Jul 26, 2024
9b132f4
Fix(crm): Rename company.taxe_identifier to company.tax_identifier
jonathanarnault Jul 26, 2024
5a32fae
Fix(crm): Apply suggestions from code review
arimet Jul 26, 2024
5b890f9
Fix(crm): Apply suggestions from code review
arimet Jul 26, 2024
370d810
Merge pull request #10081 from marmelab/fix/crm-deals-buttons
arimet Jul 26, 2024
8c4a161
Merge pull request #10080 from marmelab/feat/crm-improve-company-form
jonathanarnault Jul 26, 2024
f52c583
Merge pull request #10079 from marmelab/feat/crm-improve-contact-form
jonathanarnault Jul 26, 2024
dba9e37
Merge remote-tracking branch 'origin/atomic-crm' into fix/crm-tax-ide…
jonathanarnault Jul 26, 2024
71def36
Fix(crm): It was not possible ta save a company or a contact due to l…
jonathanarnault Jul 26, 2024
eaf7516
Fix(crm): It was not possible ta save a company or a contact due to l…
jonathanarnault Jul 26, 2024
3690327
Merge pull request #10082 from marmelab/fix/crm-tax-identifier
jonathanarnault Jul 26, 2024
0d2ce92
Fix(crm): Update wording for back to deal
arimet Jul 26, 2024
8e3f828
Fix(crm): Remove margin for Company SimpleFormIterator
arimet Jul 26, 2024
3197e18
Fix(crm): Send only if you want documents for notes
arimet Jul 26, 2024
ebb338a
Fix(crm): Replace see more button with a link in activity log
jonathanarnault Jul 26, 2024
0cc4fd7
Fix(crm): Set delete deal to undoable
arimet Jul 26, 2024
1badb89
Fix(crm): Deals category filter is now applied to the category field
jonathanarnault Jul 26, 2024
2eceb55
Fix(crm): Close archived dialog when unarchive deal
arimet Jul 26, 2024
3e99b58
Fix(crm): Deals category filter is now applied to the category field
jonathanarnault Jul 26, 2024
1d8989e
Merge pull request #10084 from marmelab/fix/crm-deals-category
arimet Jul 26, 2024
421494e
Fix(crm): Replace RA link by MUI Link in activity log
jonathanarnault Jul 26, 2024
00f6eae
Merge pull request #10085 from marmelab/fix/crm-improve-technical
jonathanarnault Jul 26, 2024
840b8b5
Merge pull request #10083 from marmelab/fix/crm-activity-log-wording
jonathanarnault Jul 26, 2024
a1dda3c
Fix(crm): Hide fields labels when empty in deals show
jonathanarnault Jul 26, 2024
41240d8
Fix(crm): sales is now required for contacts and companies
jonathanarnault Jul 26, 2024
78c3b38
Fix(crm): Company created_at was not set before create
jonathanarnault Jul 26, 2024
1bd1d8c
Feat(crm): Harmonize Sales Form and My Page Form with the others
arimet Jul 26, 2024
4dfb885
Merge pull request #10088 from marmelab/fix/crm-sales-required
arimet Jul 26, 2024
ad36a45
Merge pull request #10086 from marmelab/fix/crm-contact-import-sample
arimet Jul 26, 2024
dab0768
Fix(crm): Set close button to all dialog views
arimet Jul 26, 2024
3f676a4
Feat(crm): Improve sign-up page design
arimet Jul 26, 2024
bdafbf2
Feat(crm): Add padding for Company show description
arimet Jul 26, 2024
bd6ca45
Feat(crm): Set signup container to xs
arimet Jul 26, 2024
5538410
Fix(crm): Check if link exist before display for Company
arimet Jul 26, 2024
5670445
Fix(crm): Set default values for Contact gender and phone types
arimet Jul 26, 2024
8df44f2
Fix(crm): Remove start_at from deals as it is the same as created_at
jonathanarnault Jul 26, 2024
ad016d6
Feat(crm): Add tooltip for company context link
arimet Jul 26, 2024
8d168c1
Feat(crm): Set background dropzone files
arimet Jul 26, 2024
fc34902
Feat(crm): Replace Sale guy with Sale person
arimet Jul 26, 2024
08b2868
Fix(crm): Improve activity log wording
jonathanarnault Jul 26, 2024
ae9eff5
Fix(crm): Remove unnecessary log
jonathanarnault Jul 26, 2024
5beb3a0
Merge pull request #10091 from marmelab/fix/crm-sales
arimet Jul 26, 2024
86e2f57
Merge pull request #10087 from marmelab/fix/deals-typos
jonathanarnault Jul 26, 2024
6fb9c30
Merge branch 'atomic-crm' into fix/crm-ux
arimet Jul 26, 2024
bd21dc8
Merge pull request #10095 from marmelab/fix/activity-log-wording
jonathanarnault Jul 26, 2024
e763fae
Merge pull request #10094 from marmelab/fix/crm-ux
arimet Jul 26, 2024
91d02d0
Fix(crm): Add create contact button to company even if there is no co…
jonathanarnault Jul 26, 2024
dabf9a4
Fix(crm): Update contact count and deal count when deleting an entity
jonathanarnault Jul 26, 2024
635e43d
WIP(crm): work on a custom crop ImageField
arimet Jul 26, 2024
e9c3410
remove css and js
erwanMarmelab Jul 27, 2024
cf2d8c9
Feat(crm): Implement a component for cropping image
arimet Jul 28, 2024
a9c49e4
Fix wording
fzaninotto Jul 29, 2024
101cce7
Fix note date isn't localized
fzaninotto Jul 29, 2024
d2a2d0a
Feat(crm): Add circular preview for ImageCrop
arimet Jul 29, 2024
bf0dc47
Feat(crm): Add ImageEditorField for company logo
arimet Jul 29, 2024
53ceba0
Feat(crm): Add ImageCropField for Company
arimet Jul 29, 2024
2bf510e
Fix activity log look and feel
fzaninotto Jul 29, 2024
8f519a3
Improve activity logger
fzaninotto Jul 29, 2024
3fce842
Fix small avatar when no image
fzaninotto Jul 29, 2024
3927a52
Compactify
fzaninotto Jul 29, 2024
febacc6
Feat(crm): Apply url validation for website company
arimet Jul 29, 2024
659e524
Fix(crm): Disable redirection for logo company on Deal Card
arimet Jul 29, 2024
8077ff3
Fix(crm): Set date string to Date for Notes
arimet Jul 29, 2024
0968826
Merge pull request #10098 from marmelab/feat/crm-crop-avatar
jonathanarnault Jul 29, 2024
06849fc
Fix(crm): Date types
arimet Jul 29, 2024
5fb7022
Fix(crm): Factorize updateCompany in data provider
jonathanarnault Jul 29, 2024
7e2268f
Merge pull request #10099 from marmelab/fix/crm-update
jonathanarnault Jul 29, 2024
3c7298b
Merge remote-tracking branch 'origin/atomic-crm' into fix/crm-company…
jonathanarnault Jul 29, 2024
f8d615a
Merge pull request #10096 from marmelab/fix/crm-company-contacts
jonathanarnault Jul 29, 2024
3dfbf9f
Feat(crm): Display gender icon + newseletter info for Contact
arimet Jul 29, 2024
1914063
Fix `<Datagrid rowClick>` regression
djhi Jul 29, 2024
cdd1d7c
Feat(crm): Redirect on company page when deleting an user from company
arimet Jul 29, 2024
df8951b
Feat(crm): Allow quick task create from Dashboard
arimet Jul 29, 2024
31b17c7
Feat(crm): Display company name and title for Hot Contact
arimet Jul 29, 2024
d3b1931
Fix(crm): Remove client-side validation for the current password
arimet Jul 29, 2024
1b0585d
Merge pull request #10101 from marmelab/feat/crm-display-newsletter-a…
jonathanarnault Jul 30, 2024
79af843
Merge pull request #10105 from marmelab/feat/crm-hot-contact
jonathanarnault Jul 30, 2024
379a581
Fix(crm): Update AddTask wording
arimet Jul 30, 2024
164255b
Merge pull request #10103 from marmelab/feat/crm-redirect-deleting-co…
jonathanarnault Jul 30, 2024
0cece2e
Merge pull request #10104 from marmelab/feat/crm-create-quick-task
jonathanarnault Jul 30, 2024
6e723f1
Merge pull request #10106 from marmelab/fix/crm-passwords
jonathanarnault Jul 30, 2024
ecae535
Update company activity look and feel
fzaninotto Jul 30, 2024
4679e98
[no ci] Fix linkedin profile link in contact view
fzaninotto Jul 30, 2024
ddc2fe3
Correct wording of empty pages
fzaninotto Jul 30, 2024
202d57d
Use browser locale for the archived deals
fzaninotto Jul 30, 2024
a8712d9
[no ci] Make Sales management feature accessible by user menu
fzaninotto Jul 30, 2024
d1e382b
[no ci] Fix company sidebar does not reflect the company edit form
fzaninotto Jul 30, 2024
68d00c7
[no ci] Add context info to company
fzaninotto Jul 30, 2024
059ccf3
[no ci] [CRM] Contact aside UI tweaks
fzaninotto Jul 30, 2024
fc76d78
[no ci] [crm] More tweaks to activity log
fzaninotto Jul 30, 2024
0997eb0
[CRM] Fix broken types
fzaninotto Jul 30, 2024
a83086e
[no ci] Fix typo
fzaninotto Jul 30, 2024
f6736cb
Feat(crm): Display Forms at a glance
arimet Jul 30, 2024
c545adf
Fix(crm): Create note with iso date
arimet Jul 30, 2024
75ca773
Fix(crm): Set same font size for secondary information in HotContact
arimet Jul 30, 2024
5b6651e
Feat(crm): Update ImageEditorField title
arimet Jul 30, 2024
5dccc73
Feat(crm): Set Link right or bottom for update ImageEditorField
arimet Jul 30, 2024
a5065af
Fix(crm): Remove weird blank in dashboard
arimet Jul 30, 2024
a70508f
Fix(crm): Remove blank column in company list
arimet Jul 30, 2024
ea952d2
Feat(crm): Add onboarding for empty project
arimet Jul 30, 2024
ef265ba
Merge pull request #10108 from marmelab/feat/crm-display-form-at-a-gl…
fzaninotto Jul 31, 2024
01a5c79
Feat(crm): Display due date for Task dashboard
arimet Jul 31, 2024
17a1933
Feat(crm): Improve Upcoming task component
arimet Jul 31, 2024
35f51b1
Feat(crm): Remove transfor role + new password for sales
arimet Jul 31, 2024
10c4d2b
[no ci] [CRM] Fix activity log in dashboard
fzaninotto Jul 31, 2024
5cc4e00
Merge pull request #10109 from marmelab/fix/crm-improvement
jonathanarnault Jul 31, 2024
b01a992
Merge pull request #10110 from marmelab/feat/crm-empty-dashboard
jonathanarnault Jul 31, 2024
0c9c3c0
Feat(crm): Remove unused files and method
arimet Jul 31, 2024
951143a
Feat(crm): Keep company tab when changing page
arimet Jul 31, 2024
9da7338
[no ci] [CRM] Make notes look like activity log
fzaninotto Jul 31, 2024
eae881f
[no ci] [crm] Fix activity log loading margin
fzaninotto Jul 31, 2024
0db24f0
Feat(crm): Split TasksList component
arimet Jul 31, 2024
af5d45f
Fix apply order if defined
adguernier Jul 31, 2024
68f0475
Fix(crm): Remove margin for task edit
arimet Jul 31, 2024
7a3bc54
[no ci] [crm] Fix linter warnings
fzaninotto Jul 31, 2024
33e70c6
fix test
adguernier Jul 31, 2024
e90249d
Fix(crm): Apply suggestions from code review
arimet Jul 31, 2024
453ea8d
Merge pull request #10115 from marmelab/fix/crm-padding
jonathanarnault Jul 31, 2024
ca820b6
Merge branch 'atomic-crm' into fix/crm-sale-management
arimet Jul 31, 2024
082ed6a
Merge branch 'atomic-crm' into feat/crm-task-dates
arimet Jul 31, 2024
f429cb8
Merge pull request #10112 from marmelab/fix/crm-sale-management
arimet Jul 31, 2024
b371f20
Merge pull request #10111 from marmelab/feat/crm-task-dates
arimet Jul 31, 2024
a14d1e5
Feat(crm): Add Chip icon if deal expecting closing date is past
arimet Jul 31, 2024
866f33b
Fix(crm): add await for processCompanyLogo + remove image for ImageEd…
arimet Jul 31, 2024
4e37897
Fix(crm): Set BulkAction for ContactList
arimet Jul 31, 2024
de41a01
Feat(crm): harmonize the UI on the dashboard page
arimet Jul 31, 2024
a6d43d1
Merge pull request #10117 from marmelab/fix/reviews
fzaninotto Aug 1, 2024
c5ac326
[no ci] [crm] Compactify task list
fzaninotto Aug 1, 2024
018a20b
[no ci] [crm] Remove date in hot contacts
fzaninotto Aug 1, 2024
8cf83e9
[no ci] [crm] increase bar width in deals chart
fzaninotto Aug 1, 2024
c1160bf
Merge pull request #10055 from marmelab/doc/remove-v5-annoucement-banner
djhi Aug 1, 2024
44f406e
Feat(crm): Replace Company tabs by a TabbedShowLayout
arimet Aug 1, 2024
2c99589
Extract and rename useGetPathForRecordCallback
djhi Aug 1, 2024
7190ea6
Fix maergins
fzaninotto Aug 1, 2024
75f75a8
Merge pull request #10114 from marmelab/fix-apply-order-if-defined
fzaninotto Aug 1, 2024
8169864
Feat(crm): Supabase look alike upload file
arimet Aug 1, 2024
a13e25c
Merge branch 'atomic-crm' into feat/crm-keep-company-tab
arimet Aug 1, 2024
ac34fab
Merge pull request #10113 from marmelab/feat/crm-keep-company-tab
fzaninotto Aug 1, 2024
f7732ff
Fix(crm): Improve import speed via batching, add estimated remaining …
jonathanarnault Aug 1, 2024
f894eb7
Merge pull request #10118 from marmelab/fix/crm-be-supabase
jonathanarnault Aug 1, 2024
282a112
Fix types
jonathanarnault Aug 1, 2024
bd8655d
Fix(crm): Padding in DasboardStepper
arimet Aug 1, 2024
5995ffd
Merge pull request #10121 from marmelab/fix/crm-dashboard
jonathanarnault Aug 1, 2024
3ebd254
Fix(crm): Improve contact import modal
jonathanarnault Aug 1, 2024
eea91e5
Merge pull request #10119 from marmelab/fix/contact-import
jonathanarnault Aug 1, 2024
81e9ff6
[crm] [no ci] Tweak import dialog UI
fzaninotto Aug 1, 2024
7c85fe8
Feat(crm): Add possibility to disable Sale
arimet Aug 1, 2024
a2cabbf
Feat(crm): Clear Note form
arimet Aug 1, 2024
988a5fc
Merge pull request #10123 from marmelab/feat/crm-disable-sale
arimet Aug 1, 2024
5a148d0
Feat(crm): Update dataProvder for atomic-crm compliance
arimet Aug 1, 2024
73bbd6d
Feat(crm): Code modified to look more like Atomic Crm
arimet Aug 1, 2024
e7f5672
Merge pull request #10124 from marmelab/feat/crm-atomic
jonathanarnault Aug 2, 2024
639a0e5
fix #10107
plansoft-admin Aug 2, 2024
292a32c
Merge pull request #10120 from marmelab/atomic-crm
fzaninotto Aug 2, 2024
169f5f8
Merge pull request #10102 from marmelab/fix-datagrid-rowclick-regression
fzaninotto Aug 2, 2024
477a7f2
Merge pull request #10125 from glauff/master
djhi Aug 2, 2024
7361c69
Prepare changelog for v5.1.1
fzaninotto Aug 2, 2024
dfd8b8a
v5.1.1
fzaninotto Aug 2, 2024
4c8c3f0
Fix yarn.lock
fzaninotto Aug 2, 2024
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## v5.1.1

* Fix `<TranslatableInputs>` throws error when used with null value ([#10125](https://github.com/marmelab/react-admin/pull/10125)) ([glauff](https://github.com/glauff))
* Fix `ListContext.setSort` ignores the sort order when the chosen field is the current one ([#10114](https://github.com/marmelab/react-admin/pull/10114)) ([adguernier](https://github.com/adguernier))
* Fix `<Datagrid rowClick>` is called on mount ([#10102](https://github.com/marmelab/react-admin/pull/10102)) ([djhi](https://github.com/djhi))
* Fix `<SimpleFormIterator>` adds a left padding when there is no label ([#10092](https://github.com/marmelab/react-admin/pull/10092)) ([fzaninotto](https://github.com/fzaninotto))
* Fix `<DateInput>` and `<DateTimeInput>` do not handle partial values correctly on Firefox ([#9543](https://github.com/marmelab/react-admin/pull/9543)) ([arimet](https://github.com/arimet))

## v5.1.0

* Update `<SelectInput>` to support an array of strings as choices ([#10038](https://github.com/marmelab/react-admin/pull/10038)) ([fzaninotto](https://github.com/fzaninotto))
Expand Down
11 changes: 10 additions & 1 deletion docs/UrlField.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,20 @@ title: "The UrlField Component"

# `<UrlField>`


`<UrlField>` displays a url in a Material UI's `<Link href="" />` component.

```jsx
import { UrlField } from 'react-admin';

<UrlField source="site_url" />
```

## `content`

You can customize the content of the link by passing a string as the `content` prop.

```jsx
import { UrlField } from 'react-admin';

<UrlField source="site_url" content="Visit site" />
```
55 changes: 0 additions & 55 deletions docs/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,6 @@
font-family: 'Helvetica', sans-serif;
color: #c0ccda;
}

#closeBanner {
cursor: pointer;
}
@media screen and (max-width: 576px) {
#closeBanner {
display: none;
}
}
</style>
<link
rel="stylesheet"
Expand All @@ -113,37 +104,6 @@

<body>
<header>
<span
id="banner"
style="
background-color: #db2777;
padding: 3px;
text-align: center;
color: #fff;
display: flex;
justify-content: center;
align-items: center;
gap: 0.5rem;
padding: 0.75rem;
"
>
<span aria-hidden="true" id="randomEmoji"></span>
<span style="text-align: center">
📣 React-admin v5 is here! Read the
<a
style="text-decoration: underline; color: #fff"
href="https://marmelab.com/blog/2024/06/20/react-admin-v5.html"
>announcement blog post</a
>. 📣
</span>
<span
id="closeBanner"
aria-label="Close"
style="position: absolute; right: 10px"
>
<span aria-hidden="true">X</span>
</span>
</span>
{% include nav.html %}
<ul id="slide-out" class="sidenav sidenav-fixed">
<li class="logo">
Expand Down Expand Up @@ -238,20 +198,5 @@
defer
src="https://unpkg.com/prettier@2.8.8/parser-babel.js"
></script>
<script>
function hideBanner() {
const banner = document.getElementById('banner');
if (banner) {
banner.style.display = 'none';
}
}
const closeBanner = document.getElementById('closeBanner');
if (closeBanner) {
closeBanner.addEventListener('click', e => {
e.preventDefault();
hideBanner();
});
}
</script>
</body>
</html>
54 changes: 0 additions & 54 deletions docs/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,6 @@
font-family: 'Helvetica', sans-serif;
color: #c0ccda;
}
#closeBanner {
cursor: pointer;
}
@media screen and (max-width: 576px) {
#closeBanner {
display: none;
}
}
</style>
<link
rel="stylesheet"
Expand All @@ -105,37 +97,6 @@

<body>
<header>
<span
id="banner"
style="
background-color: #db2777;
padding: 3px;
text-align: center;
color: #fff;
display: flex;
justify-content: center;
align-items: center;
gap: 0.5rem;
padding: 0.75rem;
"
>
<span aria-hidden="true" id="randomEmoji"></span>
<span style="text-align: center">
📣 React-admin v5 is here! Read the
<a
style="text-decoration: underline; color: #fff"
href="https://marmelab.com/blog/2024/06/20/react-admin-v5.html"
>announcement blog post</a
>. 📣
</span>
<span
id="closeBanner"
aria-label="Close"
style="position: absolute; right: 10px"
>
<span aria-hidden="true">X</span>
</span>
</span>
{% include nav.html %}
<ul id="slide-out" class="sidenav sidenav-fixed">
<li class="logo">
Expand Down Expand Up @@ -391,20 +352,5 @@ <h2>Recipes</h2>
defer
src="https://unpkg.com/prettier@2.8.8/parser-babel.js"
></script>
<script>
function hideBanner() {
const banner = document.getElementById('banner');
if (banner) {
banner.style.display = 'none';
}
}
const closeBanner = document.getElementById('closeBanner');
if (closeBanner) {
closeBanner.addEventListener('click', e => {
e.preventDefault();
hideBanner();
});
}
</script>
</body>
</html>
122 changes: 121 additions & 1 deletion examples/crm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is a demo of the [react-admin](https://github.com/marmelab/react-admin) lib

https://user-images.githubusercontent.com/99944/116970434-4a926480-acb8-11eb-8ce2-0602c680e45e.mp4

React-admin usually requires a REST/GraphQL server to provide data. In this demo however, the API is simulated by the browser (using [FakeRest](https://github.com/marmelab/FakeRest)). The source data is generated at runtime by a package called [data-generator](https://github.com/marmelab/react-admin/tree/master/examples/data-generator).
React-admin usually requires a REST/GraphQL server to provide data. In this demo, however, the API is simulated by the browser (using [FakeRest](https://github.com/marmelab/FakeRest)). The source data is generated at runtime by a package called [data-generator](https://github.com/marmelab/react-admin/tree/master/examples/data-generator).

To explore the source code, start with [src/App.tsx](https://github.com/marmelab/react-admin/blob/master/examples/crm/src/App.tsx).

Expand Down Expand Up @@ -50,3 +50,123 @@ Your app is ready to be deployed!
### `npm run deploy`

Deploy the build to GitHub gh-pages.

## Customizing

You can customize the title, logo, theme, and domain of the CRM app by passing custom props to the `<CRM>` component:

```tsx
// App.tsx
import React from 'react';
import CRM from './CRM';

const App = () => (
<CRM
title="Custom CRM Title"
logo="custom-logo.png"
/>
);

export default App;
```

## Domain & Process

In addition to the design, you can easily customize various aspects relevant to your business domain. The behavior is the same as described above. You can modify the following:

| Props | Description | Type |
|-----------------------|-----------------------------------------------------------------------|-----------------|
| contactGender | The gender options for contacts used in the application. | ContactGender[] |
| companySectors | The list of company sectors used in the application. | string[] |
| darkTheme | The theme to use when the application is in dark mode. | RaThemeOptions |
| dealCategories | The categories of deals used in the application. | string[] |
| dealPipelineStatuses | The statuses of deals in the pipeline used in the application | string[] |
| dealStages | The stages of deals used in the application. | DealStage[] |
| lightTheme | The theme to use when the application is in light mode. | RaThemeOptions |
| logo | The logo used in the CRM application. | string |
| noteStatuses | The statuses of notes used in the application. | NoteStatus[] |
| taskTypes | The types of tasks used in the application. | string[] |
| title | The title of the CRM application. | string |

```tsx
import { CRM } from './root/CRM';
import { ThemeOptions } from '@mui/material/styles';

const lightTheme: ThemeOptions = {
palette: {
mode: 'light',
},
};

const darkTheme: ThemeOptions = {
palette: {
mode: 'dark',
},
};

const App = () => {
return (
<CRM
contactGender={[
{ value: 'male', label: 'He' },
{ value: 'female', label: 'She' },
]}
companySectors={['Technology', 'Finance']}
darkTheme={darkTheme}
dealCategories={['Copywriting', 'Design']}
dealPipelineStatuses={['won']}
dealStages={[
{ value: 'opportunity', label: 'Opportunity' },
{ value: 'proposal-sent', label: 'Proposal Sent' },
{ value: 'won', label: 'Won' },
{ value: 'lost', label: 'Lost' },
]}
lightTheme={lightTheme}
logo="https://example.com/logo.png"
noteStatuses={[
{ value: 'cold', label: 'Cold', color: '#7dbde8' },
{ value: 'warm', label: 'Warm', color: '#e8cb7d' },
{ value: 'hot', label: 'Hot', color: '#e88b7d' },
]}
taskTypes={['Call', 'Email', 'Meeting']}
title="CRM Dashboard"
/>
);
};

export default App;
```

## Adding Sales

To add a new sale to the CRM, you need to use an administrator account. By default, the first account created has this role. If you are starting fresh, a sign-up page will prompt you to create this admin account.

When logged in as an admin, an 'Account Manager' tab will be available. From this page, you can create sales and transfer the administrator role.

![Adding sales](./public/img/adding-sales.png "Adding sales")


## Customizing the Homepage

The first page of the application is managed by the `Dashboard.tsx` component. You can customize it by updating this file.

```jsx
// ./src/dashboard/Dashboard.tsx
import React from 'react';
import { Card, CardContent, Typography } from '@mui/material';

export const Dashboard = () => {
return (
<Card>
<CardContent>
<Typography variant="h5" component="div">
Welcome to the Custom Dashboard!
</Typography>
<Typography variant="body2" color="text.secondary">
This is a customized homepage for your application. You can add any components or content here to suit your needs.
</Typography>
</CardContent>
</Card>
);
};
```
3 changes: 3 additions & 0 deletions examples/crm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
"date-fns": "^3.6.0",
"faker": "~5.4.0",
"lodash": "~4.17.5",
"papaparse": "^5.4.1",
"ra-data-fakerest": "^5.0.0",
"react": "^18.3.1",
"react-admin": "^5.0.0",
"react-cropper": "^2.3.3",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.3",
"react-router": "^6.22.0",
Expand All @@ -29,6 +31,7 @@
"@types/jest": "^29.5.2",
"@types/jsonexport": "^3.0.5",
"@types/lodash": "~4.14.168",
"@types/papaparse": "^5",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.2.1",
Expand Down
Binary file added examples/crm/public/img/adding-sales.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading