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

Jump to bottom

#1253 Work In Progress - Clone Lines. #6911

Merged
merged 25 commits into from
Jul 8, 2020
Merged

#1253 Work In Progress - Clone Lines. #6911

merged 25 commits into from
Jul 8, 2020

Conversation

dragospodariu96
Copy link
Contributor

@dragospodariu96 dragospodariu96 changed the title #1253 Work In Progress - First commit. #1253 Work In Progress - Clone Lines. Jun 26, 2020
siemiatj and others added 22 commits June 30, 2020 12:49
@siemiatj
Revert "Revert bigbang (#6925)"
25f7de6 
This reverts commit 387aac1.
@petrican
4307 fix table collapse (#6927)
35b3d60 
* Fix collapsible table

* Remove redundant code

* Fix table tree

* Safety check to make sure is action is dispatched

Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com>
@dragospodariu96
Merge branch 'master' into gh1253_clone_lines
dfbc83f
@petrican @dragospodariu96
Cherry-Picked front-end par
2639d17 
Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com>
(cherry picked from commit 643fdb7)

backend/drsdf
zvc
zxvc
z
xcbnfdskj;bn g;dsa,,fda[piqwepity[poeriuyq

 `
 asfdasfafsddsaf
 fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/DataAdapter#
@petrican @dragospodariu96
Send selection on process creation (#6916)
94fff9f 
Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com>
(cherry picked from commit 643fdb7)
@petrican
Fix for actions dropdown remaining opened (#6930)
f1b72ff 
Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com>
@siemiatj
Fix refreshing table with attributes (#6928)
8b748ba 
* #6873 change how spinner works for tables with attributes

* #6873 don't deselect items manually on refresh of data as redux handles that

* - remove todo comments
@siemiatj
Fix shortcuts (#6936)
1f03def 
* #6873 fix open in new tab shortcut

* #6873 fix QuickActions shortcut
@siemiatj
Discard unsaved row when closing modal (#6939)
0a97fa0 
* #6873 merge `discard` new items functions into one

* #6873 remove unsaved table rows on closing modal
@siemiatj
Fix filtering data in tables (#6940)
5c552cc 
* #6873 add missing action creator to mapDispatchToProps
- log errors to the console
- add tableId prop to make debugging easier

* #6873 create AC for clearing table data
@petrican
Revert "Discard unsaved row when closing modal (#6939)" (#6941)
31b58ac 
This reverts commit 0a97fa0.
@siemiatj
Fix how we handle discarding rows (#6944)
332b801 
* Revert "Revert "Discard unsaved row when closing modal (#6939)" (#6941)"

This reverts commit 31b58ac.

* #6873 remove rows in table only when the modal is not saved
@siemiatj
#6873 don't create tab tables for advanced edit (#6948)
eeefc18
@petrican
Fix date picker (#6947)
6ec44dc 
* Fix date picker

* Fix linter errors

Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com>
@siemiatj
#6873 don't filter on WS event, fix quickactions (#6951)
05b1026
@siemiatj
- fixing e2e tests (#6952)
efa8c33
@petrican
Fix multiselect with ctrl/command key (#6955)
0718274 
Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com>
@teosarca
Merge branch 'master' into master-revert-revert
078474a
@dragospodariu96
Merge remote-tracking branch 'origin/master-revert-revert' into gh125…
c77b5e2 
…3_clone_lines
@dragospodariu96
#1253 Can now clone tab lines.
4901990
@dragospodariu96
Merge remote-tracking branch 'origin/master' into gh1253_clone_lines
0d5dcd9 
# Conflicts:
#	frontend/src/actions/TableActions.js
@dragospodariu96
#1253 Translated process to german.
b64daf5
metas-ts
metas-ts requested changes Jul 7, 2020
View reviewed changes
Copy link
Member

@metas-ts metas-ts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls check comments. also, wasn't there a frontend fix required for this?

backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/process/WEBUI_CloneLine.java Outdated Show resolved Hide resolved
backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/process/WEBUI_CloneLine.java Outdated Show resolved Hide resolved
backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/process/WEBUI_CloneLine.java Outdated Show resolved Hide resolved
backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/process/WEBUI_CloneLine.java Outdated Show resolved Hide resolved
backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/process/WEBUI_CloneLine.java Outdated Show resolved Hide resolved
...as.salescandidate.base/src/main/java/de/metas/ordercandidate/modelvalidator/C_OrderLine.java Show resolved Hide resolved
@dragospodariu96
Copy link
Contributor Author

dragospodariu96 commented Jul 8, 2020 •
edited
Loading

pls check comments. also, wasn't there a frontend fix required for this?

Discussed with Petrica regarding this, showed me what changes are needed which were done on another branch in some older commits and I've put those locally on my frontend repo.
However, the front-end changes are now on master since yesterday after the big-bang repo merger, as those were required there too.

@dragospodariu96 dragospodariu96 merged commit 1251c74 into master Jul 8, 2020
@dragospodariu96 dragospodariu96 deleted the gh1253_clone_lines branch July 8, 2020 15:33
@dragospodariu96 dragospodariu96 mentioned this pull request Jul 10, 2020
Merged
metas-ts added a commit that referenced this pull request Jul 10, 2020
@metas-ts
Improve clarity - i hope
24b6765 
#6911
dragospodariu96 added a commit that referenced this pull request Jul 10, 2020
@dragospodariu96 @metas-ts
#1253 No longer showing 'Clone Line' action when subtab's table is th…
2ee587c 
…e same as the document's. (#6996)

* #1253 No longer showing 'Clone Line' action when subtab's table is the same as the document's.

* Improve clarity - i hope

#6911

Co-authored-by: Tobias Schöneberg <metas-ts@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metas-ts metas-ts metas-ts approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dragospodariu96 @metas-ts @siemiatj @petrican @teosarca