Mathijs den Burger pushed to branch feature/CC-CHANNELMGR-1520 at cms-community / hippo-addon-channel-manager
Commits: cd072e29 by Arent-Jan Banck at 2018-01-23T21:16:00+01:00 CHANNELMGR-254 Update copyright year of NOTICE file to 2018 - - - - - 07fc13fa by Ariel Weinberger at 2018-01-24T15:27:01+01:00 CHANNELMGR-1686 Add "disabled" class styling for disabled fab-options dial button - - - - - 47c18299 by Ariel Weinberger at 2018-01-24T15:58:57+01:00 CHANNELMGR-1686 Merge branch 'feature/create-content' into feature/CC-CHANNELMGR-1686 - - - - - 3cc6cc07 by Arthur Bogaart at 2018-01-25T12:00:09+01:00 CHANNELMGR-1657 Disable document-location widget for non-existing path the REST endpoint for "folders" returns a new field "exists" which describes whether a folder exists or not. This is used by the frontend to render a disabled or enabled document-location widget. This means the picker can not be opened for non-existing folders. - - - - - 55a7e41f by Arent-Jan Banck at 2018-01-25T12:22:55+01:00 CHANNELMGR-1660 Remove version override - - - - - c293cb87 by Ariel Weinberger at 2018-01-25T17:56:12+01:00 CHANNELMGR-1686 Disable main and speed-dial buttons in necessary scenarios. Implement disabled style mixin to be re-used in both cases. Click events were disabled as well. - - - - - 1448e650 by Ariel Weinberger at 2018-01-25T17:56:51+01:00 CHANNELMGR-1686 FIx sasslint errors - - - - - bbd02789 by Ariel Weinberger at 2018-01-25T18:06:42+01:00 CHANNELMGR-1686 Fix unit tests and remove a scenario which is unused anymore (hiding main buttons) - - - - - 514b9c81 by Arthur Bogaart at 2018-01-26T10:51:47+01:00 CHANNELMGR-1692 Delete draft of open document when channel is closed - - - - - df2c6045 by Arthur Bogaart at 2018-01-26T10:51:56+01:00 CHANNELMGR-1692 Fixed lint errors - - - - - e3860e3c by Arthur Bogaart at 2018-01-26T13:50:50+01:00 CHANNELMGR-1657 Merge feature/create-content changes - - - - - ac4ed2de by Michael Metternich at 2018-01-26T14:44:07+01:00 CHANNELMGR-1535 Add usage statistics - - - - - 5f874258 by Mathijs den Burger at 2018-01-26T14:58:43+01:00 CHANNELMGR-1694 Remove unused variable from OverlayService test - - - - - 888f108b by Arthur Bogaart at 2018-01-26T16:02:10+01:00 CHANNELMGR-1657 Add text-disabled color - - - - - 631151b3 by Arthur Bogaart at 2018-01-26T16:03:56+01:00 CHANNELMGR-1657 Add style difference between existing and non-existing folders To simplify the layout, I overlayed the current widget with a <div> that contains the styled path. - - - - - a23bee55 by Mathijs den Burger at 2018-01-26T16:14:47+01:00 CHANNELMGR-1694 Don't delete document of other editor when exiting step2 Opening the other editor for a document kills the content editor in the right side-panel for that document. This used to be controller only by the edit-content state. However, create-content-step-2 now also shows a content editor, so it has to monitor the 'kill editor' event separately. The step2 controller used to always delete the document when step2 state was left without clicking 'save'. That also deleted the document when the other editor opened it, which crashed the CMS once it was reloaded. The logic to delete a document now moved into the content editor. When the content editor is killed, the document is not deleted (similar to the deleteDraft() behavior). The create content service kills the editor of step 2 when the other editor opens it. Together, the content editor is killed (but the document is not deleted) when the other editor opens it. - - - - - d93c0c39 by Bert Leunis at 2018-01-26T16:28:36+01:00 CHANNELMGR-1488 Merge master changes in feature/create-content - - - - - 36d5c0c9 by Mathijs den Burger at 2018-01-26T16:59:31+01:00 CHANNELMGR-1515 Update component path parameter of the rendered variant - - - - - d0c4171a by Arthur Bogaart at 2018-01-26T23:19:04+01:00 CHANNELMGR-1647 Show full truncated path + search icon Refactored the controller while removing the constraints of a) MAX folders shown and b) show at most 1 folder of the rootPath. Updated the specs. The overlay element is truncated at a calculated width to leave space for the search icon. - - - - - fe391cc4 by Michael Metternich at 2018-01-27T23:02:04+01:00 CHANNELMGR-1657 Merge feature/create-content changes - - - - - c3c1c17f by Michael Metternich at 2018-01-27T23:04:50+01:00 CHANNELMGR-1657 Reintegrate feature/CC-CHANNELMGR-1657 - - - - - a6604789 by Ariel Weinberger at 2018-01-29T10:38:04+01:00 CHANNELMGR-1686 Rename "config.isDisabled" to "config.isLockedByOtherUser" and simplify disabled button logic. Instead of removing the on-click callback in a function (_disableButton), the callback won't be set from the beginning if the button is disabled. Class name is also added explicitly for each button's case, so the _disabledButton function is removed. - - - - - 20e78399 by Ariel Weinberger at 2018-01-29T10:40:32+01:00 CHANNELMGR-1686 Extract ".disabled" selector from the "disable-fab-button" mixin and use it explicitly in each fab button (main and options) logic for better understanding and readability. - - - - - 8a5668e4 by Bert Leunis at 2018-01-29T10:52:45+01:00 CHANNELMGR-1535 merge master changes in feature/CC-CHANNELMGR-1535 - - - - - eecf5b64 by Mathijs den Burger at 2018-01-29T10:57:05+01:00 CHANNELMGR-1539 Don't save component parameter when it's not specified The save-component-parameter-after-creating-content logic used to be "if we're located inside a component, update the component parameter". That wrong, since a 'create content' button can also be placed inside a component yet without a component parameter. The typical example is a generic "+" button to create new content inside a query-based component, e.g. a news list. The fix is to check whether there's a component parameter specified, and only then update that parameter. - - - - - 4c029b4a by Michael Metternich at 2018-01-29T12:25:55+01:00 CHANNELMGR-1535 Fixed usage statistics for cancel and component param - - - - - 3fe0acdd by Michael Metternich at 2018-01-29T12:57:54+01:00 CHANNELMGR-1647 Merge feature/create-content changes - - - - - 51c082c3 by Bert Leunis at 2018-01-30T10:26:55+01:00 CHANNELMGR-1535 Merge feature/create-content changes in feature/CC-CHANNELMGR-1535 - - - - - 18ea01b2 by Bert Leunis at 2018-01-30T10:27:08+01:00 CHANNELMGR-1535 Merge feature/create-content changes in feature/CC-CHANNELMGR-1535 - - - - - 9d6f6000 by Bert Leunis at 2018-01-30T11:51:19+01:00 CHANNELMGR-1535 fix merge/layout errors - - - - - d7104b15 by Bert Leunis at 2018-01-30T12:06:38+01:00 CHANNELMGR-1535 Merge feature/create-content changes in feature/CC-CHANNELMGR-1535 - - - - - d1548fbf by Bert Leunis at 2018-01-30T13:05:07+01:00 CHANNELMGR-1535 fix unsolved merge conflict - - - - - 1643c2be by Bert Leunis at 2018-01-30T13:09:52+01:00 CHANNELMGR-1535 Reintegrate feature/CC-CHANNELMGR-1535 - - - - - bf525775 by Mathijs den Burger at 2018-01-30T13:35:04+01:00 CHANNELMGR-1515 Merge feature/create-content changes into feature/CC-CHANNELMGR-1515 - - - - - 161ad8a4 by Bert Leunis at 2018-01-30T16:28:27+01:00 CHANNELMGR-1690 added does_not_exist entry to error map - - - - - b87ef24d by Bert Leunis at 2018-01-30T16:47:44+01:00 CHANNELMGR-1686 Merge feature/create-content changes in feature/CC-CHANNELMGR-1686 - - - - - 316e4317 by Bert Leunis at 2018-01-30T16:51:30+01:00 CHANNELMGR-1686 Reintegrate feature/CC-CHANNELMGR-1686 - - - - - b6c8c0ec by Mathijs den Burger at 2018-01-31T12:21:58+01:00 CHANNELMGR-1515 Use correct render variant to update component parameter The code used to save the component parameter for the render variant of the whole page. That's not correct: a component may not have a variant for the render variant of the page. The render variant of a component is now available as meta-data of a component in the property HST-Render-Variant. When not present or an empty string, the default variant is used ('hippo-default'). Since a variant can contain fancy characters, it has to be URI-encoded before being used in the path of a REST call. Fixing this generically in the HST service (i.e. always URI-encoding all path parameters) is tricky since those path elements are corrected for leading and trailing slashes and leading and trailing spaces in those parameters. Those would be wrongly URI-encoded. Only URI-encoding the variant seemed safer. The first six manage-content buttons in the overlay fixture were located in a container instead of in a component. That's conceptually wrong, since those buttons will always be located inside a component or not inside anything, but never directly inside a container. It also broke the code, since a container did not have a getRenderVariant method. So those buttons moved inside 'component B' (which did not break any tests). One manage content button has been added to the overlay fixture to capture the pick-path logic for a button inside a component with a non-default render variant. It's located inside the 'component-with-experiment', which now got a different rendering variant in its meta-data. To keep the numbered manage-content button scenarios in order, this new button got scenario number 7 and the numbers of the remaining scenario's increased by one (both in the fixture and in the tests). - - - - - b642976b by Mathijs den Burger at 2018-01-31T12:33:14+01:00 CHANNELMGR-1690 Reintegrate bugfix/CC-CHANNELMGR-1690 - - - - - 1f6cabe2 by Ariel Weinberger at 2018-02-01T10:27:15+01:00 CHANNELMGR-1686 Add translations for tooltips when container is locked, and apply those in dial buttons - - - - - 5f3f788d by Ariel Weinberger at 2018-02-01T10:30:07+01:00 CHANNELMGR-1686 Merge branch 'feature/CC-CHANNELMGR-1686' into feature/create-content # Conflicts: # frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js - - - - - 9a0e1b3e by Ariel Weinberger at 2018-02-01T10:58:37+01:00 CHANNELMGR-1686 Fix failing unit tests (pickPath should be private) - - - - - 99ba1ae3 by Bert Leunis at 2018-02-01T11:25:34+01:00 CHANNELMGR-1515 Merge feature/create-content changes in feature/CC-CHANNELMGR-1515 - - - - - 38424c50 by Bert Leunis at 2018-02-01T11:27:56+01:00 CHANNELMGR-1515 Reintegrate feature/CC-CHANNELMGR-1515 - - - - - cef65557 by Michael Metternich at 2018-02-01T13:53:57+01:00 CHANNELMGR-1488 Reintegrate feature/create-content - - - - - fff996dc by Michael Metternich at 2018-02-01T13:58:46+01:00 CHANNELMGR-1488 Reintegrate feature/create-content - - - - - e5b3d357 by Michael Metternich at 2018-02-01T14:01:08+01:00 CHANNELMGR-1488 Remove create-content dependencies - - - - - 2a43052c by Michael Metternich at 2018-02-01T15:20:24+01:00 CHANNELMGR-1488 Downgrade frontend build - - - - - 0d4ea076 by Mathijs den Burger at 2018-02-02T10:22:10+01:00 CHANNELMGR-1520 Merge master changes into feature/CC-CHANNELMGR-1520 - - - - - 30 changed files: - NOTICE - content-service/pom.xml - content-service/src/main/java/org/onehippo/cms/channelmanager/content/folder/Folder.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/folder/FoldersServiceImpl.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/folder/FoldersServiceTest.java - frontend-api/pom.xml - + frontend-ng/npm-shrinkwrap.json - − frontend-ng/package-lock.json - frontend-ng/package.json - frontend-ng/pom.xml - frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.iframe.fixture.html - frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js - frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js - frontend-ng/src/app/channel/page/element/componentElement.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.service.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.service.spec.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/createContent.service.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/createContent.service.spec.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.spec.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.scss - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step1/step1.controller.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step1/step1.controller.spec.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step2/step2.controller.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step2/step2.controller.spec.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step2/step2.service.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step2/step2.service.spec.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContent.service.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContent.service.spec.js The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/19269b18f2801cbe3bffff30bd5b315cfcf71108...0d4ea076ce139a28ed6250cb9d30aa03df8c5932 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/19269b18f2801cbe3bffff30bd5b315cfcf71108...0d4ea076ce139a28ed6250cb9d30aa03df8c5932 You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
