Skip to content

Don't overwrite extra_fields data on updateContentNode #2841

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

Merged
MisRob merged 2 commits into from
Jan 21, 2021
Merged

Don't overwrite extra_fields data on updateContentNode #2841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8b3eb8
Don't overwrite extra_fields data on updateContentNode
jayoshih Jan 20, 2021
04988c7
Always show M/N fields on their own row and use labels instead of hints
jayoshih Jan 20, 2021
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
16 changes: 15 additions & 1 deletion contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,22 @@ export function updateContentNode(context, { id, ...payload } = {}) {
throw ReferenceError('id must be defined to update a contentNode');
}
let contentNodeData = generateContentNodeData(payload);

const node = context.getters.getContentNode(id);

// Don't overwrite existing extra_fields data
if (contentNodeData.extra_fields) {
contentNodeData = {
...contentNodeData,
extra_fields: {
...(node.extra_fields || {}),
...(contentNodeData.extra_fields || {}),
},
};
}

const newNode = {
...context.getters.getContentNode(id),
...node,
...contentNodeData,
};
const complete = isNodeComplete({
Expand Down
157 changes: 75 additions & 82 deletions contentcuration/contentcuration/frontend/shared/views/MasteryDropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,85 +1,78 @@
<template>

<VLayout grid wrap alignTop>
<VFlex xs12 md5>
<VSelect
ref="masteryModel"
v-model="masteryModel"
:items="masteryCriteria"
:label="$tr('labelText')"
color="primary"
box
:placeholder="placeholder"
:required="required"
:readonly="readonly"
:disabled="disabled"
:rules="masteryRules"
menu-props="offsetY"
@focus="$emit('focus')"
>
<template #append-outer>
<InfoModal :header="$tr('exerciseHeader')" :items="masteryCriteria">
<p>{{ $tr('exerciseDescripiton') }}</p>
<p>{{ $tr('masteryDescripiton') }}</p>
<template #header="{ item }">
{{ translateConstant(item.value) }}
</template>
<template #description="{ item }">
{{ translateConstant(item.value + '_description') }}
</template>
</InfoModal>
</template>
</VSelect>
</VFlex>
<VFlex md1 />
<VFlex v-if="showMofN" xs12 md5 class="mofn-options">
<VLayout row>
<VFlex xs5>
<VTextField
ref="mValue"
v-model="mValue"
type="number"
singleLine
box
min="1"
:required="mRequired"
:placeholder="mPlaceholder"
:readonly="readonly"
:rules="mRules"
:disabled="disabled"
:hint="$tr('mHint')"
persistentHint
@keypress="isIntegerInput($event)"
@paste="isIntegerPaste($event)"
@focus="$emit('mFocus')"
/>
</VFlex>
<VFlex xs2 justifyCenter class="out-of">
/
</VFlex>
<VFlex xs5>
<VTextField
ref="nValue"
v-model="nValue"
type="number"
singleLine
box
min="1"
:hint="$tr('nHint')"
persistentHint
:required="nRequired"
:readonly="readonly"
:placeholder="nPlaceholder"
:rules="nRules"
:disabled="disabled"
@keypress="isIntegerInput($event)"
@paste="isIntegerPaste($event)"
@focus="$emit('nFocus')"
/>
</VFlex>
</VLayout>
</VFlex>
</VLayout>
<VFlex xs12 sm11 md10 lg9 xl8>
<VSelect
ref="masteryModel"
v-model="masteryModel"
:items="masteryCriteria"
:label="$tr('labelText')"
color="primary"
box
:placeholder="placeholder"
:required="required"
:readonly="readonly"
:disabled="disabled"
:rules="masteryRules"
menu-props="offsetY"
class="mb-2"
@focus="$emit('focus')"
>
<template #append-outer>
<InfoModal :header="$tr('exerciseHeader')" :items="masteryCriteria">
<p>{{ $tr('exerciseDescripiton') }}</p>
<p>{{ $tr('masteryDescripiton') }}</p>
<template #header="{ item }">
{{ translateConstant(item.value) }}
</template>
<template #description="{ item }">
{{ translateConstant(item.value + '_description') }}
</template>
</InfoModal>
</template>
</VSelect>

<VLayout v-if="showMofN" class="mofn-options" row>
<VFlex xs6>
<VTextField
ref="mValue"
v-model="mValue"
type="number"
box
min="1"
:label="$tr('mHint')"
:required="mRequired"
:placeholder="mPlaceholder"
:readonly="readonly"
:rules="mRules"
:disabled="disabled"
@keypress="isIntegerInput($event)"
@paste="isIntegerPaste($event)"
@focus="$emit('mFocus')"
/>
</VFlex>
<VFlex xs1 justifyCenter class="out-of">
/
</VFlex>
<VFlex xs5>
<VTextField
ref="nValue"
v-model="nValue"
type="number"
box
min="1"
:label="$tr('nHint')"
:required="nRequired"
:readonly="readonly"
:placeholder="nPlaceholder"
:rules="nRules"
:disabled="disabled"
@keypress="isIntegerInput($event)"
@paste="isIntegerPaste($event)"
@focus="$emit('nFocus')"
/>
</VFlex>
</VLayout>
</VFlex>

</template>

Expand Down Expand Up @@ -256,8 +249,8 @@
}

.out-of {
margin-top: 20px;
font-size: 16pt;
padding-top: 20px;
font-size: 18pt;
color: var(--v-grey-darken1);
text-align: center;
}
Expand Down