ryanmwangi/CalMerger
1
0
Fork 0
Code Issues Pull requests Releases Activity

feat(form): add global setting to keep event properties and update calendar handling

Browse source
This commit is contained in:
ryan 2025-07-23 15:08:55 +03:00
parent a841d51e30
commit 833398d921
3 changed files with 64 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
public/index.html
View file

@ -32,6 +32,14 @@
class="input-field">
</div>
<!-- Global Settings -->
<div class="input-group">
<div class="checkbox-group">
<input type="checkbox" id="global-keep-properties" checked>
<label for="global-keep-properties">Keep all event properties (location, description, etc.) for all calendars</label>
</div>
</div>
<div id="calendars">
<div class="calendar-entry">
<input type="url" id="url-0" placeholder="https://example.com/calendar.ics">
@ -40,6 +48,10 @@
<input type="checkbox" id="override-0">
<label for="override-0">Override</label>
</div>
<div class="checkbox-group">
<input type="checkbox" id="keep-properties-0" checked>
<label for="keep-properties-0">Keep properties</label>
</div>
<button type="button" class="remove-btn" title="Remove calendar"></button>
</div>
</div>

15
public/script.js
View file

@ -129,6 +129,10 @@ function loadCalendarConfig(config, calendarName) {
<input type="checkbox" id="override-${calendarIndex}" ${calendar.override ? 'checked' : ''}>
<label for="override-${calendarIndex}">Override</label>
</div>
<div class="checkbox-group">
<input type="checkbox" id="keep-properties-${calendarIndex}" ${calendar.keepProperties ? 'checked' : ''}>
<label for="keep-properties-${calendarIndex}">Keep properties</label>
</div>
<button type="button" class="remove-btn" title="Remove calendar"></button>
`;
calendars.appendChild(newCalendar);
@ -150,6 +154,10 @@ addCalendarButton.addEventListener('click', () => {
<input type="checkbox" id="override-${calendarIndex}">
<label for="override-${calendarIndex}">Override</label>
</div>
<div class="checkbox-group">
<input type="checkbox" id="keep-properties-${calendarIndex}" checked>
<label for="keep-properties-${calendarIndex}">Keep properties</label>
</div>
<button type="button" class="remove-btn" title="Remove calendar"></button>
`;
calendars.appendChild(newCalendar);
@ -159,6 +167,7 @@ addCalendarButton.addEventListener('click', () => {
// Event listener for form submission
form.addEventListener('submit', (event) => {
event.preventDefault();
const globalKeepProperties = document.getElementById('global-keep-properties').checked;
const linkGroupName = document.getElementById('link-group-name').value;
const calendarsData = [];
let valid = true; // Flag to track URL validity
@ -166,8 +175,9 @@ form.addEventListener('submit', (event) => {
for (let i = 0; i < calendarIndex; i++) {
const prefix = document.getElementById(`prefix-${i}`);
const override = document.getElementById(`override-${i}`);
const keepProperties = document.getElementById(`keep-properties-${i}`);
const url = document.getElementById(`url-${i}`);
if (prefix && override && url && url.value) {
if (prefix && override && keepProperties && url && url.value) {
// Validate the URL
if (url.value.startsWith('http') && !isValidUrl(url.value)) {
valid = false; // Set flag to false if any URL is invalid
@ -176,7 +186,8 @@ form.addEventListener('submit', (event) => {
calendarsData.push({
prefix: prefix.value,
override: override.checked,
url: url.value
url: url.value,
keepProperties: globalKeepProperties || keepProperties.checked
});
}
}

40
src/calendarUtil.js
View file

@ -47,7 +47,7 @@ export function addEventsToCalendar(newCalendar, calendars) {
calendars.forEach((calendarRaw) => {
try {
const { data, prefix, override } = calendarRaw; // Extract prefix and override
const { data, prefix, override, keepProperties = false } = calendarRaw; // Extract prefix, override and keepProperties
const calendar = new ICAL.Component(ICAL.parse(calendarRaw.data));
// Extract METHOD from the parsed data (if available)
@ -98,6 +98,44 @@ export function addEventsToCalendar(newCalendar, calendars) {
newEvent.summary = prefix || 'Busy';
} else {
newEvent.summary = prefix ? `${prefix} ${event.summary}` : event.summary;
}
// Handle all properties based on keepProperties setting
if (keepProperties) {
// Preserve all available properties
if (event.location) newEvent.location = event.location;
if (event.description) newEvent.description = event.description;
// Copy additional properties from the original component
const originalComponent = vevent;
// Preserve URL (for call links)
const url = originalComponent.getFirstPropertyValue('url');
if (url) newEvent.component.updatePropertyWithValue('url', url);
// Preserve attendees
const attendees = originalComponent.getAllProperties('attendee');
attendees.forEach(attendee => {
newEvent.component.addProperty(attendee);
});
// Preserve categories
const categories = originalComponent.getFirstPropertyValue('categories');
if (categories) newEvent.component.updatePropertyWithValue('categories', categories);
// Preserve organizer
const organizer = originalComponent.getFirstPropertyValue('organizer');
if (organizer) newEvent.component.updatePropertyWithValue('organizer', organizer);
// Preserve status
const status = originalComponent.getFirstPropertyValue('status');
if (status) newEvent.component.updatePropertyWithValue('status', status);
// Preserve class (privacy)
const eventClass = originalComponent.getFirstPropertyValue('class');
if (eventClass) newEvent.component.updatePropertyWithValue('class', eventClass);
} else if (!override) {
// Backward compatibility: only preserve location when not overriding
if (event.location) newEvent.location = event.location;
}