Revert "Show icon for events with attendees" (2b07d97d) · Commits · e / infra / ecloud / nextcloud-apps / calendar

src/components/EventRender.vue

+1 −15

Original line number	Diff line number	Diff line
		@@ -32,23 +32,18 @@
		<Bell v-if="hasAlarms"
		class="icon-event-reminder"
		:size="14"
		:style="{ color: iconColor }" />
		<AccountMultiple v-if="hasAttendees"
		:size="14"
		:style="{ color: iconColor }" />
		:style="{ color: isDarkText ? 'var(--color-main-text)' : 'var(--fc-event-text-color)' }" />
		</div>
		</div>
		</div>
		</template>

		<script>
		import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
		import Bell from 'vue-material-design-icons/Bell.vue'

		export default {
		name: 'EventRender',
		components: {
		AccountMultiple,
		Bell,
		},
		props: {
		@@ -58,18 +53,12 @@ export default {
		},
		},
		computed: {
		iconColor() {
		return this.isDarkText ? 'var(--color-main-text)' : 'var(--fc-event-text-color)'
		},
		viewType() {
		return this.eventDetails?.view?.type
		},
		hasAlarms() {
		return this.eventDetails?.event?._def?.extendedProps?.hasAlarms
		},
		hasAttendees() {
		return this.eventDetails?.event?._def?.extendedProps?.hasAttendees
		},
		isDarkText() {
		return this.eventDetails?.event?._def?.extendedProps?.darkText
		},
		@@ -78,9 +67,6 @@ export default {
		</script>

		<style scoped>
		.fc-event-title.fc-sticky {
		flex-grow: 1;
		}
		.fc-event-main-frame--icons {
		display: flex;
		justify-content: space-between;

src/fullcalendar/eventSources/eventSourceFunction.js

+0 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@ export function eventSourceFunction(calendarObjects, calendar, start, end, timez
		location: object.location,
		description: object.description,
		hasAlarms,
		hasAttendees: object.hasProperty('ATTENDEE'),
		},
		}

tests/javascript/unit/fullcalendar/eventSources/freeBusyResourceEventSourceFunction.test.js

+0 −21

Original line number	Diff line number	Diff line
		@@ -80,7 +80,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		}, {
		name: 'VEVENT',
		id: '1-2',
		@@ -99,7 +98,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		title: 'Untitled\nmultiline\nevent',
		}, {
		name: 'VEVENT',
		@@ -119,7 +117,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(true),
		hasProperty: jest.fn().mockReturnValue(false),
		}]
		const eventComponentSet2 = [{
		name: 'VEVENT',
		@@ -139,7 +136,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		}]
		const eventComponentSet4 = [{
		name: 'VEVENT',
		@@ -159,7 +155,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		color: 'red',
		}]

		@@ -225,7 +220,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		objectType: 'VEVENT',
		percent: null,
		hasAlarms: false,
		hasAttendees: false,
		},
		},
		{
		@@ -247,7 +241,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		objectType: 'VEVENT',
		percent: null,
		hasAlarms: false,
		hasAttendees: false,
		},
		},
		{
		@@ -269,7 +262,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		objectType: 'VEVENT',
		percent: null,
		hasAlarms: true,
		hasAttendees: false,
		},
		},
		{
		@@ -291,7 +283,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		objectType: 'VEVENT',
		percent: null,
		hasAlarms: false,
		hasAttendees: false,
		},
		},
		{
		@@ -313,7 +304,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		objectType: 'VEVENT',
		percent: null,
		hasAlarms: false,
		hasAttendees: false,
		},
		backgroundColor: '#ff0000',
		borderColor: '#ff0000',
		@@ -476,7 +466,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		percent: null,
		}, {
		name: 'VTODO',
		@@ -496,7 +485,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		percent: null,
		}, {
		name: 'VTODO',
		@@ -516,7 +504,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		percent: 99,
		}, {
		name: 'VTODO',
		@@ -536,7 +523,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		title: 'This task has a title',
		percent: null,
		}, {
		@@ -557,7 +543,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		}),
		},
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		title: 'This task has a title and percent',
		percent: 99,
		}, {
		@@ -568,7 +553,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		getReferenceRecurrenceId: jest.fn().mockReturnValue({ unixTime: 123 }),
		canModifyAllDay: jest.fn().mockReturnValue(false),
		hasComponent: jest.fn().mockReturnValue(false),
		hasProperty: jest.fn().mockReturnValue(false),
		title: 'Task without Due',
		startDate: null,
		endDate: null,
		@@ -612,7 +596,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		percent: null,
		recurrenceId: 123,
		hasAlarms: false,
		hasAttendees: false,
		},
		id: '1###1',
		start: event1End,
		@@ -635,7 +618,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		percent: null,
		recurrenceId: 123,
		hasAlarms: false,
		hasAttendees: false,
		},
		id: '1###2',
		start: event2End,
		@@ -658,7 +640,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		percent: 99,
		recurrenceId: 123,
		hasAlarms: false,
		hasAttendees: false,
		},
		id: '1###3',
		start: event3End,
		@@ -681,7 +662,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		percent: null,
		recurrenceId: 123,
		hasAlarms: false,
		hasAttendees: false
		},
		id: '1###4',
		start: event4End,
		@@ -704,7 +684,6 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
		percent: 99,
		recurrenceId: 123,
		hasAlarms: false,
		hasAttendees: false,
		},
		id: '1###5',
		start: event5End,