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

Ensure 'copy slide' always makes new RAMP config #497

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ensure 'copy slide' always makes new RAMP config #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/components/editor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@
:slideIndex="slideIndex"
@slide-change="selectSlide"
@slides-updated="updateSlides"
@save-slides="saveChanges(false)"
:configFileStructure="configFileStructure"
:lang="configLang"
:sourceCounts="sourceCounts"
Expand Down Expand Up @@ -279,6 +280,7 @@
:slideIndex="slideIndex"
@slide-change="selectSlide"
@slides-updated="updateSlides"
@save-slides="saveChanges(false)"
:configFileStructure="configFileStructure"
:lang="configLang"
:sourceCounts="sourceCounts"
Expand Down Expand Up @@ -575,14 +577,16 @@ export default class EditorV extends Vue {
}, 5);
}

saveChanges(): void {
saveChanges(pushSaveEvent: boolean = true): void {
// save current slide final changes before generating config file
if (this.$refs.slide !== undefined) {
(this.$refs.slide as SlideEditorV).saveChanges();
}

// emit save changes event
this.$emit('save-changes');
if (pushSaveEvent) {
this.$emit('save-changes');
}
}

beforeWindowUnload(e: BeforeUnloadEvent): void {
Expand Down
94 changes: 87 additions & 7 deletions src/components/slide-toc.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,8 @@ import {
SlideshowPanel,
SourceCounts,
TextPanel,
VideoPanel
VideoPanel,
PanelType
} from '@/definitions';

import Message from 'vue-m-message';
Expand Down Expand Up @@ -652,12 +653,91 @@ export default class SlideTocV extends Vue {
* Copies an entire slide, creating a new identical slide at the next index.
* @param index Index of the slide to copy.
*/
copySlide(index: number): void {
this.slides.splice(index + 1, 0, cloneDeep(this.slides[index]));
this.$emit('slides-updated', this.slides);
this.selectSlide(index + 1, this.lang);
Message.success(this.$t('editor.slide.copy.success'));
this.scrollToElement(index + 1);
async copySlide(index: number): Promise<void> {
this.$emit('save-slides');

// Nested setTimeout calls may not be the best option. It works though.
// Maybe try replacing with promise chain?
setTimeout(async () => {
let copiedSlide = cloneDeep(this.slides[index]);

const getNumberOfMaps = (): number => {
let n = 0;
this.configFileStructure.rampConfig.forEach(() => {
n += 1;
});
return n;
};

// Handle special copy cases (MapPanels need new config, etc.)
copiedSlide = Object.fromEntries(
await Promise.all(
Object.entries(copiedSlide)
.filter(([lang, slide]) => slide !== undefined) // Filter out undefined slides
.map(async ([lang, slide]: [string, Slide]) => {
const slideWithNewMaps: Slide = JSON.parse(JSON.stringify(slide));

slideWithNewMaps.panel = await Promise.all(
slide.panel.map(async (panel: BasePanel) => {
if (panel.type === PanelType.Map) {
// Create new map config and copy the old one
const newPanel: MapPanel = JSON.parse(JSON.stringify(panel));
let currentJson = '';

const assetSrc = `${(panel as MapPanel).config.substring(
(panel as MapPanel).config.indexOf('/') + 1
)}`;
const configFile = this.configFileStructure.zip.file(assetSrc);

const origStrippedFileName =
(panel as MapPanel).config !== ''
? (panel as MapPanel).config.split('/')[2].split('.')[0] + '.json'
: '';
const unsavedConfigFile =
this.configFileStructure.zip.file(origStrippedFileName);

if (unsavedConfigFile) {
currentJson = await unsavedConfigFile.async('string');
currentJson = JSON.parse(currentJson);
} else if (configFile) {
currentJson = await configFile.async('string');
currentJson = JSON.parse(currentJson);
}

newPanel.config = `${this.configFileStructure.uuid}/ramp-config/${
this.configFileStructure.uuid
}-map-${getNumberOfMaps() + 1}.json`;

const strippedFileName = newPanel.config.split('/')[2].split('.')[0];

this.configFileStructure.rampConfig.file(
`${strippedFileName}.json`,
JSON.stringify(currentJson, null, 4)
);

return newPanel;
} else {
return panel;
}
})
);

return [lang, slideWithNewMaps];
})
)
);

// Insert the new slide at the next index and emit updates
this.slides.splice(index + 1, 0, copiedSlide);
this.$emit('slides-updated', this.slides);

// Delay changing slide for a bit so things update properly
setTimeout(() => {
this.selectSlide(index + 1, this.lang);
Message.success(this.$t('editor.slide.copy.success'));
this.scrollToElement(index + 1);
}, 10);
}, 20);
}

removeSlide(index: number): void {
Expand Down
Loading