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

745 add order parameter #790

Merged
merged 5 commits into from
Nov 30, 2023
Merged

745 add order parameter #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14eace4
#745 Add order parameter back to managament interface
CalamityC Oct 20, 2023
de725c3
#745 Add order parameter back to managament interface
CalamityC Oct 20, 2023
8c31431
* revert auto formatting
CalamityC Oct 28, 2023
5ae2e54
#745 Add order parameter back to managament interface
CalamityC Oct 30, 2023
f11bf6c
* fix indent
CalamityC Oct 30, 2023
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
17 changes: 12 additions & 5 deletions rdmo/management/assets/js/components/common/Links.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import classNames from 'classnames'
import isEmpty from 'lodash/isEmpty'
import isNil from 'lodash/isNil'
import isUndefined from 'lodash/isUndefined'

import Link from 'rdmo/core/assets/js/components/Link'
Expand Down Expand Up @@ -179,18 +180,24 @@ ExtendLink.propTypes = {
onClick: PropTypes.func.isRequired
}

const CodeLink = ({ className, uri, onClick }) => {
const CodeLink = ({ className, uri, onClick, order }) => {
return (
<Link onClick={onClick}>
<code className={className}>{uri}</code>
</Link>
<>
<Link onClick={onClick}>
<code className={className}>{uri}</code>
</Link>
{!isNil(order) ? (
<>{' '}<code className="code-order ng-binding">{order}</code></>
) : null}
</>
)
}

CodeLink.propTypes = {
className: PropTypes.string.isRequired,
uri: PropTypes.string.isRequired,
onClick: PropTypes.func.isRequired
onClick: PropTypes.func.isRequired,
order: PropTypes.number
}

const ErrorLink = ({ element, onClick }) => {
Expand Down
15 changes: 10 additions & 5 deletions rdmo/management/assets/js/components/element/Page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { ReadOnlyIcon } from '../common/Icons'
import { Drag, Drop } from '../common/DragAndDrop'

const Page = ({ config, page, configActions, elementActions, display='list', indent=0,
filter=false, filterEditors=false }) => {
filter=false, filterEditors=false, order }) => {

const showElement = filterElement(config, filter, false, filterEditors, page)
const showElements = get(config, `display.elements.pages.${page.id}`, true)
Expand Down Expand Up @@ -58,7 +58,7 @@ const Page = ({ config, page, configActions, elementActions, display='list', ind
</p>
{
get(config, 'display.uri.pages', true) && <p>
<CodeLink className="code-questions" uri={page.uri} onClick={() => fetchEdit()} />
<CodeLink className="code-questions" uri={page.uri} onClick={() => fetchEdit()} order={order} />
</p>
}
{
Expand Down Expand Up @@ -102,13 +102,17 @@ const Page = ({ config, page, configActions, elementActions, display='list', ind
{
showElements && page.elements.map((element, index) => {
if (element.model == 'questions.questionset') {
const questionSetInfo = page.questionsets.find(info => info.questionset === element.id)
const questionSetOrder = questionSetInfo ? questionSetInfo.order : undefined
return <QuestionSet key={index} config={config} questionset={element}
configActions={configActions} elementActions={elementActions}
display="nested" filter={filter} indent={indent + 1} />
display="nested" filter={filter} indent={indent + 1} order={questionSetOrder} />
} else {
const questionInfo = page.questions.find(info => info.question === element.id)
const questionOrder = questionInfo ? questionInfo.order : undefined
return <Question key={index} config={config} question={element}
configActions={configActions} elementActions={elementActions}
display="nested" filter={filter} indent={indent + 1} />
display="nested" filter={filter} indent={indent + 1} order={questionOrder} />
}
})
}
Expand All @@ -128,7 +132,8 @@ Page.propTypes = {
display: PropTypes.string,
indent: PropTypes.number,
filter: PropTypes.string,
filterEditors: PropTypes.bool
filterEditors: PropTypes.bool,
order: PropTypes.number
}

export default Page
7 changes: 4 additions & 3 deletions rdmo/management/assets/js/components/element/Question.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { ReadOnlyIcon } from '../common/Icons'
import { Drag, Drop } from '../common/DragAndDrop'

const Question = ({ config, question, elementActions, display='list', indent=0,
filter=false, filterEditors=false }) => {
filter=false, filterEditors=false, order }) => {

const showElement = filterElement(config, filter, false, filterEditors, question)

Expand Down Expand Up @@ -46,7 +46,7 @@ const Question = ({ config, question, elementActions, display='list', indent=0,
</p>
{
get(config, 'display.uri.questions', true) && <p>
<CodeLink className="code-questions" uri={question.uri} onClick={() => fetchEdit()} />
<CodeLink className="code-questions" uri={question.uri} onClick={() => fetchEdit()} order={order} />
</p>
}
{
Expand Down Expand Up @@ -106,7 +106,8 @@ Question.propTypes = {
display: PropTypes.string,
indent: PropTypes.number,
filter: PropTypes.string,
filterEditors: PropTypes.bool
filterEditors: PropTypes.bool,
order: PropTypes.number
}

export default Question
15 changes: 10 additions & 5 deletions rdmo/management/assets/js/components/element/QuestionSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { ReadOnlyIcon } from '../common/Icons'
import { Drag, Drop } from '../common/DragAndDrop'

const QuestionSet = ({ config, questionset, configActions, elementActions, display='list', indent=0,
filter=false, filterEditors=false }) => {
filter=false, filterEditors=false, order }) => {

const showElement = filterElement(config, filter, false, filterEditors, questionset)
const showElements = get(config, `display.elements.questionsets.${questionset.id}`, true)
Expand Down Expand Up @@ -57,7 +57,7 @@ const QuestionSet = ({ config, questionset, configActions, elementActions, displ
</p>
{
get(config, 'display.uri.questionsets', true) && <p>
<CodeLink className="code-questions" uri={questionset.uri} onClick={() => fetchEdit()} />
<CodeLink className="code-questions" uri={questionset.uri} onClick={() => fetchEdit()} order={order} />
</p>
}
{
Expand Down Expand Up @@ -101,13 +101,17 @@ const QuestionSet = ({ config, questionset, configActions, elementActions, displ
{
showElements && questionset.elements.map((element, index) => {
if (element.model == 'questions.questionset') {
const questionSetInfo = questionset.questionsets.find(info => info.questionset === element.id)
const questionSetOrder = questionSetInfo ? questionSetInfo.order : undefined
return <QuestionSet key={index} config={config} questionset={element}
configActions={configActions} elementActions={elementActions}
display="nested" filter={filter} indent={indent + 1} />
display="nested" filter={filter} indent={indent + 1} order={questionSetOrder} />
} else {
const questionInfo = questionset.questions.find(info => info.question === element.id)
const questionOrder = questionInfo ? questionInfo.order : undefined
return <Question key={index} config={config} question={element}
configActions={configActions} elementActions={elementActions}
display="nested" filter={filter} indent={indent + 1} />
display="nested" filter={filter} indent={indent + 1} order={questionOrder} />
}
})
}
Expand All @@ -127,7 +131,8 @@ QuestionSet.propTypes = {
display: PropTypes.string,
indent: PropTypes.number,
filter: PropTypes.string,
filterEditors: PropTypes.bool
filterEditors: PropTypes.bool,
order: PropTypes.number
}

export default QuestionSet
30 changes: 22 additions & 8 deletions rdmo/management/assets/js/components/element/Section.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { Drag, Drop } from '../common/DragAndDrop'


const Section = ({ config, section, configActions, elementActions, display='list', indent=0,
filter=false, filterEditors=false }) => {
filter=false, filterEditors=false, order }) => {

const showElement = filterElement(config, filter, false, filterEditors, section)
const showElements = get(config, `display.elements.sections.${section.id}`, true)
Expand Down Expand Up @@ -55,7 +55,7 @@ const Section = ({ config, section, configActions, elementActions, display='list
</p>
{
get(config, 'display.uri.sections', true) &&
<CodeLink className="code-questions" uri={section.uri} onClick={() => fetchEdit()} />
<CodeLink className="code-questions" uri={section.uri} onClick={() => fetchEdit()} order={order} />
}
<ElementErrors element={section} />
</div>
Expand Down Expand Up @@ -88,11 +88,24 @@ const Section = ({ config, section, configActions, elementActions, display='list
<Drop element={section.elements[0]} elementActions={elementActions} indent={indent + 1} mode="before" />
}
{
showElements && section.elements.map((page, index) => (
<Page key={index} config={config} page={page}
configActions={configActions} elementActions={elementActions}
display="nested" filter={filter} indent={indent + 1} />
))
showElements && section.elements.map((page, index) => {
const pageInfo = section.pages.find(info => info.page === page.id)
const pageOrder = pageInfo ? pageInfo.order : undefined

return (
<Page
key={index}
config={config}
page={page}
configActions={configActions}
elementActions={elementActions}
display="nested"
filter={filter}
indent={indent + 1}
order={pageOrder}
/>
)
})
}
<Drop element={section} elementActions={elementActions} indent={indent} mode="after" />
</>
Expand All @@ -110,7 +123,8 @@ Section.propTypes = {
display: PropTypes.string,
indent: PropTypes.number,
filter: PropTypes.string,
filterEditors: PropTypes.bool
filterEditors: PropTypes.bool,
order: PropTypes.number
}

export default Section
23 changes: 18 additions & 5 deletions rdmo/management/assets/js/components/nested/NestedCatalog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,25 @@ const NestedCatalog = ({ config, catalog, configActions, elementActions }) => {
<Drop element={catalog.elements[0]} elementActions={elementActions} indent={0} mode="before" />
}
{
catalog.elements.map((section, index) => (
<Section key={index} config={config} section={section}
configActions={configActions} elementActions={elementActions}
display="nested" filter="catalog" indent={0} />
))
catalog.elements.map((section, index) => {
const sectionInfo = catalog.sections.find(info => info.section === section.id)
const sectionOrder = sectionInfo ? sectionInfo.order : undefined

return (
<Section key={index}
config={config}
section={section}
configActions={configActions}
elementActions={elementActions}
display="nested"
filter="catalog"
indent={0}
order={sectionOrder}
/>
)
})
}

</>
)
}
Expand Down