Skip to content

Add MVP modal for applying inheritable metadata #4664

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
merged 12 commits into from
Aug 30, 2024
Merged

Add MVP modal for applying inheritable metadata #4664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
58da0a1
Add MVP modal for applying inheritable metadata
marcellamaki Aug 20, 2024
944a1cc
First pass data fetching, merging and comparison.
rtibbles Aug 21, 2024
4a8b492
Update inheritable metadata to handle saving preferences on a folder …
rtibbles Aug 26, 2024
893563d
Restrict publishing time metadata inheritance to cheffed channels.
rtibbles Aug 26, 2024
1850cde
CSS updates to modal for better alignment to spec
marcellamaki Aug 21, 2024
4069f69
Don't show modal if nothing to inherit
marcellamaki Aug 23, 2024
94937a6
Update the modal and manage the metadata keys and translation
marcellamaki Aug 23, 2024
fe60a09
Add missing non-conforming keys to metadata translation.
rtibbles Aug 27, 2024
7214b93
Update inheritance metadata labels.
rtibbles Aug 27, 2024
9013512
Centralize metadata inheritance for all appropriate moves and all cop…
rtibbles Aug 27, 2024
571ce63
Small cleanup on conditions, ensure action is properly imported
marcellamaki Aug 29, 2024
a301273
Update strings after discussions with Radina and Richard
marcellamaki Aug 29, 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
23 changes: 19 additions & 4 deletions contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
</VContent>
</template>
</Uploader>

</VCard>
<BottomBar v-if="!loading && !loadError && !showFileUploadDefault">
<VLayout row align-center fill-height class="px-2">
Expand All @@ -124,6 +125,10 @@
<AboutLicensesModal
v-if="isAboutLicensesModalOpen"
/>
<InheritAncestorMetadataModal
:parent="(createMode && detailNodeIds.length) ? parent : null"
@inherit="inheritMetadata"
/>
</VDialog>

<!-- Dialog for catching unsaved changes -->
Expand Down Expand Up @@ -185,6 +190,7 @@
import SavingIndicator from './SavingIndicator';
import EditView from './EditView';
import EditList from './EditList';
import InheritAncestorMetadataModal from './InheritAncestorMetadataModal';
import { ContentKindLearningActivityDefaults } from 'shared/leUtils/ContentKinds';
import { fileSizeMixin, routerMixin } from 'shared/mixins';
import FileStorage from 'shared/views/files/FileStorage';
Expand All @@ -210,6 +216,7 @@
EditView,
ResizableNavigationDrawer,
Uploader,
InheritAncestorMetadataModal,
FileStorage,
FileUploadDefault,
LoadingText,
Expand Down Expand Up @@ -270,11 +277,12 @@
uploadMode() {
return this.$route.name === RouteNames.UPLOAD_FILES;
},
/* eslint-disable kolibri/vue-no-unused-properties */
createExerciseMode() {
return this.$route.name === RouteNames.ADD_EXERCISE;
},
/* eslint-enable */
createMode() {
return this.addTopicsMode || this.uploadMode || this.createExerciseMode;
},
editMode() {
return this.$route.name === RouteNames.CONTENTNODE_DETAILS;
},
Expand Down Expand Up @@ -303,9 +311,11 @@
}
return this.$tr('editingDetailsHeader');
},
parent() {
return this.$route.params.nodeId && this.getContentNode(this.$route.params.nodeId);
},
parentTitle() {
const node = this.$route.params.nodeId && this.getContentNode(this.$route.params.nodeId);
return node ? node.title : '';
return this.parent ? this.parent.title : '';
},
invalidNodes() {
return this.nodeIds.filter(id => !this.getContentNodeIsValid(id));
Expand Down Expand Up @@ -525,6 +535,11 @@
eventLabel: 'Upload file',
});
},
inheritMetadata(metadata) {
for (const nodeId of this.nodeIds) {
this.updateContentNode({ id: nodeId, ...metadata, mergeMapFields: true });
}
},
},
$trs: {
editingDetailsHeader: 'Edit details',
Expand Down
Loading