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.

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

FEATURE: Make MultiSelectBox drag&drop sorting feature optional #3827

Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
5478f0a
BUGFIX: fix specific cases where the requested croparea would be larg…
patricekaufmann Jul 11, 2023
994b0b1
Fix #3520 SelectBox invalid values
Mar 12, 2024
f81b14e
ADD english translation
Mar 13, 2024
4bf2ae6
increase onChange debounce time and trigger onChange on FocusLos
Mar 14, 2024
b961e03
Update packages/neos-ui-ckeditor5-bindings/src/ckEditorApi.js
ahaeslich Apr 10, 2024
a1e44f2
TASK: Fix e2e
mhsdesign May 14, 2024
d243a1a
Followup #3776 set version field to empty string so it can be bumped
mhsdesign May 14, 2024
228d78f
TASK: Translated using Weblate (Dutch)
May 14, 2024
378c409
TASK: Translated using Weblate (Spanish)
gallegonovato May 18, 2024
d6c8c15
BUGFIX: findNodeToEdit() checks if the found node belongs to the corr…
bbehrendt-mm Jun 1, 2024
44f19d6
BUGFIX: `LinkEditor` placeholder now uses the custom placeholder corr…
dr-format-d Jun 1, 2024
d81e9a7
BUGFIX: `LinkEditor` placeholder now also displays default placeholde…
dr-format-d Jun 3, 2024
055ca5d
TASK: Translated using Weblate (German)
alexandergirod Jun 2, 2024
f7eb451
Merge pull request #3799 from dr-format-d/8.3
Sebobo Jun 4, 2024
1f7fcaa
Remove outdated comment
mhsdesign Jun 5, 2024
2e7587c
TASK: Update translation files
weblate Jun 7, 2024
c4ef7b1
Update Classes/Controller/BackendController.php
bbehrendt-mm Jun 19, 2024
9badb26
Merge pull request #3796 from bbehrendt-mm/8.3
mhsdesign Jun 19, 2024
c3fd3d5
Merge remote-tracking branch 'origin/8.3' into SelectBoxInvalidValues
mhsdesign Jun 20, 2024
d10fe3f
WIP: Add processing of invalid values to `processSelectBoxOptions` to…
mhsdesign Jun 20, 2024
b2cff86
TASK: Simplify and improve `processSelectBoxOptions`
mhsdesign Jun 20, 2024
6322dd9
BUGFIX: Let document tree searchbox scale with sidebar width
Sebobo Jun 21, 2024
484e6fd
TASK: Rename SelectBoxHelpers.js and refactor to typescript
mhsdesign Jun 24, 2024
e20d05e
TASK: Add tests for `processSelectBoxOptions`
mhsdesign Jun 24, 2024
004646e
TASK: Add further tests for `processSelectBoxOptions` to test edgecas…
mhsdesign Jun 24, 2024
2b5d9d2
Merge pull request #3809 from neos/bugfix/searchbox-width
Sebobo Jun 26, 2024
026bd63
BUGFIX: Handle empty string as empty value and dont generate selexbox…
mhsdesign Jun 26, 2024
cbf0306
BUGFIX: Fix sorting in multi selectbox if a value doesnt exist
mhsdesign Jun 27, 2024
f5804ee
TASK: Improve comment regarding `isNil` in selectbox
mhsdesign Jun 27, 2024
66b2ea3
TASK: Update selectBox snapshot to fix CI
Jun 28, 2024
1d7a9e9
Merge pull request #3745 from 73nici/SelectBoxInvalidValues
Sebobo Jul 2, 2024
c829cb9
TASK: Make tree node drop targets discoverable in E2E tests
grebaldi Jul 2, 2024
57aa6b6
TASK: Make document tree filter toggle button discoverable in E2E tests
grebaldi Jul 2, 2024
f68e70d
TASK: Make node tree filter select box reset button discoverable in E…
grebaldi Jul 2, 2024
71300ec
TASK: Make document tree search reset button discoverable in E2E tests
grebaldi Jul 2, 2024
fd5c917
TASK: Translated using Weblate (Spanish)
gallegonovato Jul 2, 2024
6063625
TASK: Add mechanism that allows to alter Settings during E2E test
grebaldi Jul 2, 2024
9f3e833
TASK: Add E2E tests for node tree presets
grebaldi Jul 2, 2024
324a4bf
TASK: Add failing E2E test for #3816
grebaldi Jul 3, 2024
65b66c8
TASK: Add failing E2E test for #2583
grebaldi Jul 3, 2024
56a884c
TASK: Add failing E2E test for #2800
grebaldi Jul 3, 2024
df03f85
BUGFIX: Allow-List nodes in document tree when filters are active
grebaldi Jul 4, 2024
78c9719
BUGFIX fix neos ui version label
mhsdesign Jul 4, 2024
b710da7
PATCH: Anticipate `visibleContextPaths` being `undefined` when in con…
grebaldi Jul 4, 2024
e3336a3
BUGFIX: Add `baseNodeType` to move change when multiple nodes are dro…
grebaldi Jul 4, 2024
244a7b2
TASK: Deprecate all singular node operations
grebaldi Jul 4, 2024
457fe91
TASK: Add failing test for #2800 Part II
grebaldi Jul 4, 2024
0195ad5
BUGFIX: Track `visible` state in tree also when context paths are upd…
grebaldi Jul 4, 2024
71bd100
TASK: Add failing E2E test that shows broken page reload with active …
grebaldi Jul 4, 2024
c0e725f
BUGFIX: Perform search on `RELOAD_STATE` when node type filter or sea…
grebaldi Jul 4, 2024
53edaac
TASK: Add failing E2E test that show superfluous toggle handle
grebaldi Jul 4, 2024
479f9df
BUGFIX: Ensure that filtered nodes provide no info about children tha…
grebaldi Jul 4, 2024
738d53d
TASK: Decouple `build-production` from `build-subpackages`
mhsdesign Jul 5, 2024
5356f07
TASK: Increase wait times for text changes in E2E tests
grebaldi Jul 8, 2024
edd3098
Merge pull request #3751 from Alvadda/bugfix/increaseDebounceTimeOnCK…
grebaldi Jul 8, 2024
6bc407d
Merge pull request #3825 from neos/bugfix/3781-fix-neos-ui-version-label
Sebobo Jul 8, 2024
9e83031
TASK: Distribute prefixed ids across DropDown* components used by Sel…
grebaldi Jul 11, 2024
5a395d6
TASK: introduce allowDragging prop on MultiSelectBox
laurahaenel Jul 12, 2024
be8de2f
TASK: Translated using Weblate (Portuguese (Portugal))
Jul 13, 2024
3d69b3f
TASK: Translated using Weblate (Portuguese (Portugal))
Jul 13, 2024
41b2c2d
Merge remote-tracking branch 'origin/8.3' into 8.4
mhsdesign Jul 16, 2024
77d0a78
TASK: Translated using Weblate (Portuguese (Portugal))
juanlira Jul 16, 2024
5f3ebc4
TASK: Translated using Weblate (Portuguese (Portugal))
weblate Jul 16, 2024
c956fb7
TASK: Translated using Weblate (Portuguese (Portugal))
juanlira Jul 16, 2024
352243c
TASK: Translated using Weblate (Portuguese (Portugal))
juanlira Jul 16, 2024
180906d
BUGFIX: Prevent unneccessary server calls when inline editor is uncha…
grebaldi Jul 17, 2024
80801c1
TASK: Translated using Weblate (Spanish)
gallegonovato Jul 17, 2024
fa4f3f7
TASK: Translated using Weblate (Spanish)
gallegonovato Jul 17, 2024
fda27d7
Merge pull request #3833 from grebaldi/bugfix/3832/prevent-remote-cal…
grebaldi Jul 18, 2024
0248331
TASK: set default value for allowDragging
laurahaenel Jul 22, 2024
bc789ca
Merge pull request #3822 from neos/bugfix/node-tree-presets-inconsist…
Sebobo Jul 23, 2024
736269a
TASK: update snapshot
laurahaenel Jul 29, 2024
6d04033
Merge pull request #3578 from patricekaufmann/bugfix/pixelsnapping-cr…
mhsdesign Aug 2, 2024
b56135a
BUGFIX: Improve loading performance of UI and remove script tag with …
Sebobo Apr 24, 2024
9d41d58
TASK: Cache user locale
Sebobo Apr 24, 2024
397fd51
TASK: Don’t render nodedata to content and just load on initialisation
Sebobo Apr 24, 2024
c3edb04
TASK: Optimise node context resolution from flow query
Sebobo May 6, 2024
d7a81e1
Update packages/neos-ui-guest-frame/src/initializeGuestFrame.js
Sebobo Jun 13, 2024
43a9b07
TASK: Load full nodes from content tree and skip them from loading fo…
Sebobo Jun 18, 2024
95bcbb9
TASK: Filter node duplicates in UI flow queries
Sebobo Jun 19, 2024
93de40c
TASK: Don’t merge existing nodes back into the store
Sebobo Jun 27, 2024
9c2ae22
TASK: Minimal cosmetically cleanup in `UserLocaleService`
mhsdesign Jul 15, 2024
b82dc84
TASK: Dont pass `nodes` explicitly to `initializeContentDomNode` but …
mhsdesign Jul 15, 2024
7314497
TASK: Add comment that we deduplicate the passed nodes to the flowque…
mhsdesign Jul 15, 2024
0d39c2e
TASK: Fix styleci issue
Sebobo Jul 23, 2024
f4520af
BUGFIX: Make sure to have the latest content when switching pages
Sebobo Aug 8, 2024
22cd1c6
Merge remote-tracking branch 'origin/8.3' into 8.4
mhsdesign Aug 8, 2024
306fd17
BUGFIX: Always bundle custom svgs instead of using `resource://` paths
mhsdesign Aug 8, 2024
239a645
BUGFIX: Hide preview central group if empty
Sebobo Aug 9, 2024
ece6ece
Merge pull request #3770 from neos/bugfix/remove-ui-script-tag
mhsdesign Aug 12, 2024
be38470
Merge pull request #3837 from neos/bugfix/hide-empty-preview-central
Sebobo Aug 12, 2024
dc6cfbc
BUGFIX: Include the image editors dummy image in the bundle
mhsdesign Aug 12, 2024
5b32b0d
TASK: Optimize Neos logo.svg
mhsdesign Aug 19, 2024
26b1893
Merge remote-tracking branch 'origin/8.3' into 8.4
mhsdesign Aug 23, 2024
acffbc3
Merge pull request #3836 from neos/bugfix/3616-bundle-custom-icons-in…
mhsdesign Sep 2, 2024
26013a3
Revert "BUGFIX: Prevent unneccessary server calls when inline editor …
mhsdesign Sep 5, 2024
9c85cef
BUGFIX: 3839 & 3832 only issue changes if ckeditor is dirty
mhsdesign Sep 5, 2024
1711617
BUGFIX: 3839 & 3832 simplify change persistence by using .flush();
mhsdesign Sep 5, 2024
0b6c97e
BUGFIX: Remove duplicate focus ckeditor border
mhsdesign Sep 9, 2024
f1959b2
BUGFIX: Remove required flag from showResetButton prop on selectbox
Sebobo Sep 9, 2024
a8edb2d
Merge pull request #3848 from neos/bugfix/proptypes-warning-showreset…
mhsdesign Sep 9, 2024
8db53a3
Merge pull request #3846 from neos/bugfix/3839-ckeditor-only-save-cha…
mhsdesign Sep 9, 2024
99b107e
Merge pull request #3847 from neos/bugfix/remove-ckeditor-focus-outli…
mhsdesign Sep 9, 2024
86af581
TASK: TestCafe Update
skurfuerst Sep 13, 2024
2df7e1f
BUGFIX: ensure DB in Docker TestCafe Setup boots up again
skurfuerst Sep 13, 2024
44a8060
BUGFIX: fix TestCafe Testcases (part 1)
skurfuerst Sep 13, 2024
b164710
BUGFIX: change some errors / warnings during TestCafe run
skurfuerst Sep 13, 2024
ca22cbe
BUGFIX: fix TestCafe Testcases (part 2)
skurfuerst Sep 13, 2024
38bd6a1
BUGFIX: fix TestCafe Testcases (part 3)
skurfuerst Sep 13, 2024
28bf36c
BUGFIX: make setState handling more robust in ImageEditor to prevent …
skurfuerst Sep 13, 2024
7528bb9
Merge pull request #3850 from neos/84-fix-e2e-tests
skurfuerst Sep 16, 2024
686c4af
TASK: Use saucectl with configuration
markusguenther Sep 17, 2024
7500a0b
TASK: Adds missing API version
markusguenther Sep 17, 2024
0567adf
TASK: Adjust test suite pathes
markusguenther Sep 17, 2024
22bb4af
TASK: Test test config per dimensions
markusguenther Sep 17, 2024
e99ddcd
TASK: Adds Sauce Connect Proxy 5 to CircleCI
markusguenther Sep 18, 2024
0f743fd
BUGIX: Adds missing region
markusguenther Sep 18, 2024
5e3a427
BUGFIX: Move tunnel config
markusguenther Sep 18, 2024
4a89fe2
TASK: Add .sauceignore file and move tunnel start
markusguenther Sep 18, 2024
8a3b267
BUGFIX: Add missing npm dependencies
markusguenther Sep 18, 2024
0d9ff89
TASK: Adjust .sauceignore and remove node module
markusguenther Sep 18, 2024
fa168a0
BUGFIX: Allow localhost proxy
markusguenther Sep 18, 2024
5a18396
TASK: Show console.logs
markusguenther Sep 18, 2024
dbf89a2
TASK: Tests 1 dimensional tests on Mac and Windows 10
markusguenther Sep 18, 2024
ed2fdde
TASK: Limit how many suites are executed at the same time.
markusguenther Sep 18, 2024
6a29783
TASK: Add screenResolution as tests on mac could not resize
markusguenther Sep 19, 2024
b9cb524
TASK: Change MacOS screen size
markusguenther Sep 19, 2024
af71bd0
TASK: Enable smart retries when a test failed
markusguenther Sep 19, 2024
6a65d87
BUGFIX: Neos logo icon width
mhsdesign Sep 19, 2024
fceb8f4
TASK: Followup to #3825
mhsdesign Sep 19, 2024
948429b
TASK: Change reporting config and fix dimension path
markusguenther Sep 19, 2024
d5b9dba
TASK: Remove feature to comment PR
markusguenther Sep 19, 2024
a48f01c
TASK: Add more files to artifact download
markusguenther Sep 19, 2024
537b1a2
Merge pull request #3852 from neos/bugfix/neos-logo-icon-width
Sebobo Sep 19, 2024
5000f74
TASK: Fetch target branch and use it as saucelabs tag
markusguenther Sep 19, 2024
8905c2e
TASK: Install newer version of GitHub CLI
markusguenther Sep 19, 2024
863412f
TASK: Passthru the target branch
markusguenther Sep 19, 2024
278d0dc
Merge pull request #3851 from neos/task/use-saucectl
skurfuerst Sep 20, 2024
9bbea2a
BUGFIX: Use CIRCLE_BRANCH when we are not triggered by a PR (#3854)
markusguenther Sep 20, 2024
ecdcc72
Merge pull request #3850 from neos/84-fix-e2e-tests
skurfuerst Sep 16, 2024
76b9064
Merge pull request #3851 from neos/task/use-saucectl
skurfuerst Sep 20, 2024
b950976
BUGFIX: Use CIRCLE_BRANCH when we are not triggered by a PR (#3854)
markusguenther Sep 20, 2024
28ababa
TASK: Refactor script to functions
markusguenther Sep 24, 2024
fa3023f
TASK: Unify shell scripts for local and saucelabs testing
markusguenther Sep 24, 2024
0b964bd
BUGFIX: Prevent augmenter from applying data of multiple nodes into t…
Sebobo Sep 25, 2024
00d94b6
Merge pull request #3856 from neos/bugfix/enforce-dom-node-for-augmen…
kitsunet Sep 25, 2024
6c619b2
TASK: Run tests also on chrome in ci
mhsdesign Sep 26, 2024
e5d48fe
BUGFIX: Stabilise test locally to have deterministic inspector groups…
mhsdesign Sep 26, 2024
20dfb5a
WIP attempt to fix screen size for mac e2e tests
mhsdesign Sep 26, 2024
490d7dd
TASK: Cleanup bash script
mhsdesign Sep 26, 2024
ae48b7f
TASK: Add exit 1 handling in case of failed test suite
mhsdesign Sep 26, 2024
99e989f
wip try a valid screen size
mhsdesign Sep 26, 2024
7635925
TASK: remove retry for now in e2e
mhsdesign Sep 27, 2024
f06551e
wip reset screen size
mhsdesign Sep 27, 2024
e3d4425
wip revert test resize hack `resizeWindow` as mac os on e2e will fail
mhsdesign Sep 27, 2024
33c3400
Fix: Sizing of alert buttons
pKallert Sep 27, 2024
9aaa70f
give up
mhsdesign Sep 27, 2024
cb36295
Merge pull request #3855 from neos/backport-e2e-tests
mhsdesign Sep 27, 2024
c4a3b3b
Merge remote-tracking branch 'origin/8.3' into 8.4
mhsdesign Sep 27, 2024
1835451
Merge pull request #3861 from pKallert/fix-icons-flashmessage
mhsdesign Sep 27, 2024
d81cb4c
TASK: Add docs for contribution getting started (#3798)
JamesAlias Sep 30, 2024
c2e63a9
BUGFIX: Trim leading and tailing whitespaces
markusguenther Sep 26, 2024
553dcb9
BUGFIX: Prevent potential js error
markusguenther Sep 26, 2024
71a4710
TASK: Assign trimmed value to the searchTerm
markusguenther Oct 8, 2024
6a51ee5
TASK: just trim the leading part of a string
markusguenther Oct 8, 2024
130f259
TASK: Trim search term on manuall apply for
markusguenther Oct 8, 2024
177af72
BUGFIX: Restore old Placeholder behavior to keep shown when focused (…
mhsdesign Oct 14, 2024
a645cba
TASK: introduce allowDragging prop on MultiSelectBox
laurahaenel Jul 12, 2024
38a218a
TASK: set default value for allowDragging
laurahaenel Jul 22, 2024
f4b31fc
Merge remote-tracking branch 'refs/remotes/fork/feature/3715-Make-Mul…
laurahaenel Oct 21, 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
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ class MultiSelectBox extends PureComponent {
*/
disabled: PropTypes.bool,

/**
* Allows dragging.
*/
allowDragging: PropTypes.bool,
mhsdesign marked this conversation as resolved.
Show resolved Hide resolved

/**
* Additional className wich will be applied
*/
Expand Down Expand Up @@ -165,6 +170,7 @@ class MultiSelectBox extends PureComponent {
optionValueField: 'value',
dndType: 'multiselect-box-value',
allowEmpty: true,
allowDragging: true,
ListPreviewElement: SelectBox_Option_SingleLine
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default class MultiSelectBox_ListPreviewSortable extends PureComponent {
values: PropTypes.arrayOf(PropTypes.string),
onValuesChange: PropTypes.func.isRequired,
ListPreviewElement: PropTypes.any.isRequired,
allowDragging: PropTypes.bool,

// API with MultiSelectBox
optionValueAccessor: PropTypes.func.isRequired
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ const spec = {
index: props.index
};
},
canDrag({values, disabled}) {
return !disabled && (values && values.length > 1);
canDrag({values, disabled, allowDragging}) {
return allowDragging && !disabled && (values && values.length > 1);
}
}, (connect, monitor) => ({
connectDragSource: connect.dragSource(),
Expand All @@ -65,6 +65,7 @@ export default class MultiSelectBox_ListPreviewSortable_DraggableListPreviewElem
}),
values: PropTypes.arrayOf(PropTypes.string),
disabled: PropTypes.bool,
allowDragging: PropTypes.bool,

// Drag&Drop specific propTypes
dndType: PropTypes.string.isRequired,
Expand Down Expand Up @@ -103,6 +104,7 @@ export default class MultiSelectBox_ListPreviewSortable_DraggableListPreviewElem
const {
option,
disabled,
allowDragging,
connectDragSource,
connectDropTarget,
isDragging,
Expand All @@ -117,7 +119,7 @@ export default class MultiSelectBox_ListPreviewSortable_DraggableListPreviewElem

// TODO Loading State: const {icon, label} = option || {label: `[Loading ${value}]`};

const isDraggable = !disabled && (values && values.length > 1);
const isDraggable = allowDragging && !disabled && (values && values.length > 1);

const finalClassNames = mergeClassNames({
[theme.selectedOptions__item]: true,
Expand Down
Loading