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.

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

feat: Allow shared calendars as appointment conflict calendars #6411

Merged
merged 1 commit into from
Nov 15, 2024

Conversation

SebastianKrupinski
Copy link
Contributor

Resolves: #3786
Requires: nextcloud/server#48621

Summary

Adjusted "Additional calendars to check for conflicts" selection logic to list all users calendars, personal and shared to be selectable for conflicts.

Copy link

codecov bot commented Oct 8, 2024

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 23.46%. Comparing base (9cc73fb) to head (c08f7d1).
Report is 23 commits behind head on main.

Files with missing lines Patch % Lines
src/components/AppointmentConfigModal.vue 0.00% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6411      +/-   ##
============================================
- Coverage     23.47%   23.46%   -0.02%     
  Complexity      453      453              
============================================
  Files           247      247              
  Lines         11722    11728       +6     
  Branches       2212     2212              
============================================
  Hits           2752     2752              
- Misses         8650     8656       +6     
  Partials        320      320              
Flag Coverage Δ
javascript 15.03% <0.00%> (-0.01%) ⬇️
php 59.37% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The app also works with 30, so a conditional logic for 30 vs 31 is necessary

Ref

<nextcloud min-version="30" max-version="31" />

@SebastianKrupinski SebastianKrupinski force-pushed the feat/issue-3786-allow-shared-calendars branch from 562e828 to 2182d38 Compare November 5, 2024 20:29
@SebastianKrupinski
Copy link
Contributor Author

The app also works with 30, so a conditional logic for 30 vs 31 is necessary

Ref

<nextcloud min-version="30" max-version="31" />

@ChristophWurst Done. Please have another look.

@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 6, 2024
@SebastianKrupinski SebastianKrupinski added the enhancement New feature request label Nov 8, 2024
@SebastianKrupinski SebastianKrupinski force-pushed the feat/issue-3786-allow-shared-calendars branch 2 times, most recently from 063e0ac to f6a614e Compare November 12, 2024 22:36
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good otherwise.

src/components/AppointmentConfigModal.vue Outdated Show resolved Hide resolved
src/components/AppointmentConfigModal.vue Outdated Show resolved Hide resolved
src/components/AppointmentConfigModal.vue Outdated Show resolved Hide resolved
Signed-off-by: SebastianKrupinski <[email protected]>
Signed-off-by: Richard Steinmetz <[email protected]>
@st3iny st3iny force-pushed the feat/issue-3786-allow-shared-calendars branch from 9f31f4d to c08f7d1 Compare November 15, 2024 06:04
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good and works. I reverted the system version initial state changes to expedite the process a bit.

The version of Nextcloud is already available int the frontend via window.OC.config.version and doesn't need to be provided via initial state.

@st3iny st3iny merged commit 3380d45 into main Nov 15, 2024
35 of 37 checks passed
@st3iny st3iny deleted the feat/issue-3786-allow-shared-calendars branch November 15, 2024 06:18
@SebastianKrupinski
Copy link
Contributor Author

The version of Nextcloud is already available in the frontend via window.OC.config.version and doesn't need to be provided via initial state.

I wish I knew this before all the changes I made! (face palm)... Learning moment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement New feature request
Projects
Status: ☑️ Done
Development

Successfully merging this pull request may close these issues.

Allow shared calendars as appointment conflict calendars
4 participants