Removing Merge button from Add New Company View #13679
Conversation
nishant-s7
changed the title
andersonjeccel
added
T1
| @@ -209,7 +209,7 @@ public function newAction(Request $request, $entity = null) | |||
| $leadFieldModel = $this->getModel('lead.field'); | |||
| \assert($leadFieldModel instanceof FieldModel); | |||
| $fields = $leadFieldModel->getPublishedFieldArrays('company'); | |||
| $form = $model->createForm($entity, $this->formFactory, $action, ['fields' => $fields, 'update_select' => $updateSelect]); | |||
| $form = $model->createForm($entity, $this->formFactory, $action, ['fields' => $fields, 'update_select' => $updateSelect, 'hide_extra_buttons' => true]); | |||
There was a problem hiding this comment.
- Let's call it what it really does.
- Let's avoid double negatives as those are hard to comprehend and break my brain (like hide = false)
| $form = $model->createForm($entity, $this->formFactory, $action, ['fields' => $fields, 'update_select' => $updateSelect, 'hide_extra_buttons' => true]); | |
| $form = $model->createForm($entity, $this->formFactory, $action, ['fields' => $fields, 'update_select' => $updateSelect, 'show_merge_button' => false]); |
Or, perhaps we could avoid this extra config option altogether if we'd base the condition if the company ID exists or not?
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## 5.x #13679 +/- ##
============================================
- Coverage 61.39% 61.30% -0.09%
+ Complexity 34034 34006 -28
============================================
Files 2240 2238 -2
Lines 101714 101652 -62
============================================
- Hits 62443 62318 -125
- Misses 39271 39334 +63
|
nishant-s7
force-pushed
the
hide-merge-for-new-company
branch
from
01a42f4
to
acc043a
Compare
There was a problem hiding this comment.
@nishant-s7 Please add PHPUnit tests for this change.
Ref: https://contribute.mautic.org/contributing-to-mautic/developer/code/pull-requests#writing-tests
| ] | ||
| ), | ||
|
|
||
| if (null === $options['data']->id) { |
There was a problem hiding this comment.
Are you sure this will work? On the line 117 I can see it's accessed as $options['data']->getId()
There was a problem hiding this comment.
It did work when I logged it, I also checked for the expected behavior and it worked fine. Should I change it to getId() to be on the safer side?
There was a problem hiding this comment.
There is some Twig magic where it looks if the property exists, if not it tries if getId() exists and if so it will use that. I'd prefer to use directly the entity method than the magic.
| if (null === $options['data']->id) { | |
| if (null === $options['data']->getId()) { |
LordRembo
added
pending-test-confirmation
Description:
This PR removes the redundant Merge button when creating a new company, which makes sure the incorrect modal with "New" button (as mentioned in the issue) is not displayed.
Steps to test this PR:
Companiesand click onNew.Mergebutton is not displayed when creating a new company, but, it is visible once the company is saved, showing the correct modal on clicking it.