-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22 from eea/develop
Develop rename eprtr to industry
- Loading branch information
Showing
29 changed files
with
37,026 additions
and
938 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,6 @@ | ||
| { | ||
| "compilerOptions": { | ||
| "paths": { | ||
| "volto-datablocks": [ | ||
| "addons/volto-datablocks/src" | ||
| ], | ||
| "@eeacms/volto-datablocks": [ | ||
| "addons/volto-datablocks/src" | ||
| ] | ||
| }, | ||
| "paths": {}, | ||
| "baseUrl": "src" | ||
| } | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import React, { useState, useEffect } from 'react'; | ||
| import { connect } from 'react-redux'; | ||
| import { compose } from 'redux'; | ||
| import _uniqueId from 'lodash/uniqueId'; | ||
| import InlineForm from '@plone/volto/components/manage/Form/InlineForm'; | ||
| import { SidebarPortal } from '@plone/volto/components'; | ||
| import View from './ViewEdit'; | ||
| import config from '@plone/volto/registry'; | ||
| import { makeSchema } from './schema'; | ||
|
|
||
| const Edit = (props) => { | ||
| const [state, setState] = useState({ | ||
| schema: makeSchema({ ...props, providerUrl: config.settings.providerUrl }), | ||
| id: _uniqueId('block_'), | ||
| }); | ||
| useEffect(() => { | ||
| setState({ | ||
| ...state, | ||
| schema: makeSchema({ | ||
| ...props, | ||
| }), | ||
| }); | ||
| /* eslint-disable-next-line */ | ||
| }, [props.data.isExpandable]); | ||
| return ( | ||
| <div> | ||
| <SidebarPortal selected={props.selected}> | ||
| <InlineForm | ||
| schema={state.schema} | ||
| title={state.schema.title} | ||
| onChangeField={(field, data) => { | ||
| props.onChangeBlock(props.block, { | ||
| ...(props.data || {}), | ||
| [field]: data, | ||
| }); | ||
| }} | ||
| formData={props.data || {}} | ||
| block={props.block} | ||
| /> | ||
| </SidebarPortal> | ||
| <View {...props} id={state.id} mode="edit" /> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default compose( | ||
| connect((state, props) => ({ | ||
| pathname: state.router.location.pathname, | ||
| })), | ||
| )(Edit); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* REACT */ | ||
| import React, { useState } from 'react'; | ||
| import { compose } from 'redux'; | ||
| import { connect } from 'react-redux'; | ||
| import { Icon } from '@plone/volto/components'; | ||
| import DOMPurify from 'dompurify'; | ||
| import move from 'lodash-move'; | ||
| import cx from 'classnames'; | ||
| import dragSVG from '@plone/volto/icons/drag.svg'; | ||
| import './style.css'; | ||
| const View = ({ content, ...props }) => { | ||
| const [state, setState] = useState({ | ||
| activeItem: '', | ||
| }); | ||
| const isExpandable = props.data?.isExpandable; | ||
| const listItemTitleClassname = props.data?.listItemTitleClassname; | ||
| const listItemDescriptionClassname = props.data?.listItemDescriptionClassname; | ||
| const listClassname = props.data?.listClassname; | ||
| const items = props.data?.items || []; | ||
| const ordered = props.data?.ordered; | ||
|
|
||
| return ( | ||
| <div className={cx('expandable-list', listClassname)}> | ||
| {props.mode === 'edit' && !items.length ? <p>Expandable list</p> : ''} | ||
| {items | ||
| ? Object.entries(items).map(([key, value], index) => ( | ||
| <div className="list-item" key={`list-item-${key}`}> | ||
| <button | ||
| className={cx( | ||
| 'list-item-title', | ||
| listItemTitleClassname ? listItemTitleClassname : '', | ||
| isExpandable ? 'expandable' : 'no-expandable', | ||
| )} | ||
| onClick={() => { | ||
| if (isExpandable && state.activeItem === key) { | ||
| setState({ ...state, activeItem: '' }); | ||
| } else if (isExpandable) { | ||
| setState({ ...state, activeItem: key }); | ||
| } | ||
| }} | ||
| > | ||
| <span className="count">{ordered ? `${index + 1}. ` : ''}</span> | ||
| <span>{value.title}</span> | ||
| </button> | ||
| <div | ||
| className={cx( | ||
| 'list-item-description', | ||
| listItemDescriptionClassname | ||
| ? listItemDescriptionClassname | ||
| : '', | ||
| isExpandable | ||
| ? state.activeItem === key | ||
| ? 'show' | ||
| : 'hide' | ||
| : '', | ||
| )} | ||
| dangerouslySetInnerHTML={{ | ||
| __html: DOMPurify.sanitize(value.description), | ||
| }} | ||
| /> | ||
| </div> | ||
| )) | ||
| : ''} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default compose( | ||
| connect((state, props) => ({ | ||
| content: | ||
| state.prefetch?.[state.router.location.pathname] || state.content.data, | ||
| })), | ||
| )(View); |
133 changes: 133 additions & 0 deletions
133
src/components/manage/Blocks/ExpendableList/ViewEdit.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* REACT */ | ||
| import React, { useState } from 'react'; | ||
| import { compose } from 'redux'; | ||
| import { connect } from 'react-redux'; | ||
| import { Icon } from '@plone/volto/components'; | ||
| import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd'; | ||
| import DOMPurify from 'dompurify'; | ||
| import move from 'lodash-move'; | ||
| import cx from 'classnames'; | ||
| import dragSVG from '@plone/volto/icons/drag.svg'; | ||
| import './style.css'; | ||
| const View = ({ content, ...props }) => { | ||
| const [state, setState] = useState({ | ||
| activeItem: '', | ||
| }); | ||
| const isExpandable = props.data?.isExpandable; | ||
| const listItemTitleClassname = props.data?.listItemTitleClassname; | ||
| const listItemDescriptionClassname = props.data?.listItemDescriptionClassname; | ||
| const listClassname = props.data?.listClassname; | ||
| const items = props.data?.items || []; | ||
| const ordered = props.data?.ordered; | ||
|
|
||
| const onDragEnd = (result) => { | ||
| const { source, destination } = result; | ||
| if (!destination) { | ||
| return; | ||
| } | ||
| if (source.droppableId === destination.droppableId) { | ||
| props.onChangeBlock(props.block, { | ||
| ...props.data, | ||
| items: move(props.data.items, source.index, destination.index), | ||
| }); | ||
| } else { | ||
| // WIP | ||
| } | ||
| }; | ||
|
|
||
| return ( | ||
| <div className={cx('expandable-list', listClassname)}> | ||
| {props.mode === 'edit' && !items.length ? <p>Expandable list</p> : ''} | ||
| {items ? ( | ||
| <DragDropContext onDragEnd={onDragEnd}> | ||
| <Droppable droppableId="list-item"> | ||
| {(providedDroppable) => ( | ||
| <> | ||
| <div ref={providedDroppable.innerRef}> | ||
| {Object.entries(items).map(([key, value], index) => ( | ||
| <Draggable key={key} draggableId={key} index={index}> | ||
| {(providedItem) => ( | ||
| <div | ||
| ref={providedItem.innerRef} | ||
| {...providedItem.draggableProps} | ||
| > | ||
| <div | ||
| style={{ | ||
| position: 'relative', | ||
| height: '100%', | ||
| }} | ||
| > | ||
| <div | ||
| style={{ | ||
| visibility: 'visible', | ||
| display: 'inline-block', | ||
| }} | ||
| {...providedItem.dragHandleProps} | ||
| className="drag handle wrapper" | ||
| > | ||
| <Icon name={dragSVG} size="18px" /> | ||
| </div> | ||
| <div className="list-item" key={`list-item-${key}`}> | ||
| <button | ||
| className={cx( | ||
| 'list-item-title', | ||
| listItemTitleClassname | ||
| ? listItemTitleClassname | ||
| : '', | ||
| isExpandable ? 'expandable' : 'no-expandable', | ||
| )} | ||
| onClick={() => { | ||
| if ( | ||
| isExpandable && | ||
| state.activeItem === key | ||
| ) { | ||
| setState({ ...state, activeItem: '' }); | ||
| } else if (isExpandable) { | ||
| setState({ ...state, activeItem: key }); | ||
| } | ||
| }} | ||
| > | ||
| {ordered ? `${index + 1}. ` : ''} | ||
| {value.title} | ||
| </button> | ||
| <div | ||
| className={cx( | ||
| 'list-item-description', | ||
| listItemDescriptionClassname | ||
| ? listItemDescriptionClassname | ||
| : '', | ||
| isExpandable | ||
| ? state.activeItem === key | ||
| ? 'show' | ||
| : 'hide' | ||
| : '', | ||
| )} | ||
| dangerouslySetInnerHTML={{ | ||
| __html: DOMPurify.sanitize(value.description), | ||
| }} | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| )} | ||
| </Draggable> | ||
| ))} | ||
| </div> | ||
| {providedDroppable.placeholder} | ||
| </> | ||
| )} | ||
| </Droppable> | ||
| </DragDropContext> | ||
| ) : ( | ||
| '' | ||
| )} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default compose( | ||
| connect((state, props) => ({ | ||
| content: | ||
| state.prefetch?.[state.router.location.pathname] || state.content.data, | ||
| })), | ||
| )(View); |
Oops, something went wrong.