@myclub_se/data-access 3.4.3 → 3.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/api-models/api-activity.mjs +1 -1
- package/esm2022/lib/api-models/api-open-activity.mjs +1 -1
- package/esm2022/lib/models/activity.mjs +4 -2
- package/esm2022/lib/models/auth/auth.mjs +4 -2
- package/esm2022/lib/models/open-activity.mjs +4 -2
- package/esm2022/lib/services/factories/activity-factory.mjs +2 -2
- package/esm2022/lib/services/factories/auth-factory.mjs +2 -2
- package/esm2022/lib/services/factories/open-activity-factory.mjs +2 -2
- package/esm2022/lib/store/effects/auth.effects.mjs +2 -2
- package/esm2022/lib/store/operators/ensure-auths.mjs +4 -4
- package/esm2022/lib/store/operators/ensure-current-user.mjs +4 -4
- package/esm2022/lib/store/reducers/auth.reducer.mjs +18 -5
- package/esm2022/lib/store/reducers/calendar.reducer.mjs +2 -2
- package/esm2022/lib/store/reducers/public.reducer.mjs +2 -2
- package/fesm2022/myclub_se-data-access.mjs +37 -18
- package/fesm2022/myclub_se-data-access.mjs.map +1 -1
- package/lib/api-models/api-activity.d.ts +1 -0
- package/lib/api-models/api-open-activity.d.ts +1 -0
- package/lib/models/activity.d.ts +2 -1
- package/lib/models/auth/auth.d.ts +2 -1
- package/lib/models/open-activity.d.ts +2 -1
- package/package.json +1 -1
|
@@ -1444,6 +1444,7 @@ class Activity {
|
|
|
1444
1444
|
meet_up_place;
|
|
1445
1445
|
meet_up_time;
|
|
1446
1446
|
meet_up_time_display;
|
|
1447
|
+
member_ids;
|
|
1447
1448
|
open_activity;
|
|
1448
1449
|
qr_code;
|
|
1449
1450
|
qr_code_enabled;
|
|
@@ -1498,7 +1499,7 @@ class Activity {
|
|
|
1498
1499
|
update_repeating: new FormControl(typeof activity?.update_repeating !== 'undefined' ? activity?.update_repeating : false)
|
|
1499
1500
|
});
|
|
1500
1501
|
}
|
|
1501
|
-
constructor(id, activity_group_id, activity_type_id, club_id, location_id, team_id, activity_location, activity_type_name, allow_maybe, calendar_name, created, current_num_attendants, day, description, end_time, file, invitation_text, invite_first_days, invite_groups, invite_hide_before_sent, invite_last_response_date, invite_remind, invite_remind_receivers, invite_second_days, invite_settings, invited_members, last_response_date, max_num_attendants, max_num_attendants_type, meet_up_place, meet_up_time, meet_up_time_display, open_activity, qr_code, qr_code_enabled, repeat, repeat_num, repeat_to_day, repeat_type, show_other_invited, start_time, title, updated, use_invite, update_repeating) {
|
|
1502
|
+
constructor(id, activity_group_id, activity_type_id, club_id, location_id, team_id, activity_location, activity_type_name, allow_maybe, calendar_name, created, current_num_attendants, day, description, end_time, file, invitation_text, invite_first_days, invite_groups, invite_hide_before_sent, invite_last_response_date, invite_remind, invite_remind_receivers, invite_second_days, invite_settings, invited_members, last_response_date, max_num_attendants, max_num_attendants_type, meet_up_place, meet_up_time, meet_up_time_display, member_ids, open_activity, qr_code, qr_code_enabled, repeat, repeat_num, repeat_to_day, repeat_type, show_other_invited, start_time, title, updated, use_invite, update_repeating) {
|
|
1502
1503
|
this.id = id;
|
|
1503
1504
|
this.activity_group_id = activity_group_id;
|
|
1504
1505
|
this.activity_type_id = activity_type_id;
|
|
@@ -1531,6 +1532,7 @@ class Activity {
|
|
|
1531
1532
|
this.meet_up_place = meet_up_place;
|
|
1532
1533
|
this.meet_up_time = meet_up_time;
|
|
1533
1534
|
this.meet_up_time_display = meet_up_time_display;
|
|
1535
|
+
this.member_ids = member_ids;
|
|
1534
1536
|
this.open_activity = open_activity;
|
|
1535
1537
|
this.qr_code = qr_code;
|
|
1536
1538
|
this.qr_code_enabled = qr_code_enabled;
|
|
@@ -1797,12 +1799,13 @@ class Auth {
|
|
|
1797
1799
|
sections;
|
|
1798
1800
|
siteEnabled;
|
|
1799
1801
|
teams;
|
|
1802
|
+
teamsLoaded;
|
|
1800
1803
|
user_name;
|
|
1801
1804
|
clubAdmin2faRequired;
|
|
1802
1805
|
sectionAdmin2faRequired;
|
|
1803
1806
|
teamAdmin2faRequired;
|
|
1804
1807
|
memberAdmin2faRequired;
|
|
1805
|
-
constructor(id, name, clubAdmin, isSectionClub, members, registrationEnabled, sections, siteEnabled, teams, user_name, clubAdmin2faRequired, sectionAdmin2faRequired, teamAdmin2faRequired, memberAdmin2faRequired) {
|
|
1808
|
+
constructor(id, name, clubAdmin, isSectionClub, members, registrationEnabled, sections, siteEnabled, teams, teamsLoaded, user_name, clubAdmin2faRequired, sectionAdmin2faRequired, teamAdmin2faRequired, memberAdmin2faRequired) {
|
|
1806
1809
|
this.id = id;
|
|
1807
1810
|
this.name = name;
|
|
1808
1811
|
this.clubAdmin = clubAdmin;
|
|
@@ -1812,6 +1815,7 @@ class Auth {
|
|
|
1812
1815
|
this.sections = sections;
|
|
1813
1816
|
this.siteEnabled = siteEnabled;
|
|
1814
1817
|
this.teams = teams;
|
|
1818
|
+
this.teamsLoaded = teamsLoaded;
|
|
1815
1819
|
this.user_name = user_name;
|
|
1816
1820
|
this.clubAdmin2faRequired = clubAdmin2faRequired;
|
|
1817
1821
|
this.sectionAdmin2faRequired = sectionAdmin2faRequired;
|
|
@@ -3969,6 +3973,7 @@ class OpenActivity {
|
|
|
3969
3973
|
meet_up_time;
|
|
3970
3974
|
meet_up_time_display;
|
|
3971
3975
|
meet_up_time_show;
|
|
3976
|
+
member_ids;
|
|
3972
3977
|
member_invoice;
|
|
3973
3978
|
member_name;
|
|
3974
3979
|
open_activity;
|
|
@@ -3989,7 +3994,7 @@ class OpenActivity {
|
|
|
3989
3994
|
update_repeating;
|
|
3990
3995
|
qr_code = null;
|
|
3991
3996
|
qr_code_enabled = false;
|
|
3992
|
-
constructor(id, activity_group_id, activity_type_id, club_id, location_id, member_id, team_id, activity_location, activity_type_name, allow_maybe, calendar_name, created, current_num_attendants, day, default_fee, description, end, end_time, file, invitation_text, invite_first_days, invite_groups, invite_hide_before_sent, invite_last_response_date, invite_remind, invite_remind_receivers, invite_second_days, invite_settings, invited_members, last_response_date, location_name, max_num_attendants, max_num_attendants_type, meet_up_place, meet_up_time, meet_up_time_display, meet_up_time_show, member_invoice, member_name, open_activity, optional_fees, optional_fee_required, optional_fee_type, repeat, repeat_num, repeat_to_day, repeat_type, show_other_invited, start, start_time, status, title, updated, use_invite, update_repeating) {
|
|
3997
|
+
constructor(id, activity_group_id, activity_type_id, club_id, location_id, member_id, team_id, activity_location, activity_type_name, allow_maybe, calendar_name, created, current_num_attendants, day, default_fee, description, end, end_time, file, invitation_text, invite_first_days, invite_groups, invite_hide_before_sent, invite_last_response_date, invite_remind, invite_remind_receivers, invite_second_days, invite_settings, invited_members, last_response_date, location_name, max_num_attendants, max_num_attendants_type, meet_up_place, meet_up_time, meet_up_time_display, meet_up_time_show, member_ids, member_invoice, member_name, open_activity, optional_fees, optional_fee_required, optional_fee_type, repeat, repeat_num, repeat_to_day, repeat_type, show_other_invited, start, start_time, status, title, updated, use_invite, update_repeating) {
|
|
3993
3998
|
this.id = id;
|
|
3994
3999
|
this.activity_group_id = activity_group_id;
|
|
3995
4000
|
this.activity_type_id = activity_type_id;
|
|
@@ -4027,6 +4032,7 @@ class OpenActivity {
|
|
|
4027
4032
|
this.meet_up_time = meet_up_time;
|
|
4028
4033
|
this.meet_up_time_display = meet_up_time_display;
|
|
4029
4034
|
this.meet_up_time_show = meet_up_time_show;
|
|
4035
|
+
this.member_ids = member_ids;
|
|
4030
4036
|
this.member_invoice = member_invoice;
|
|
4031
4037
|
this.member_name = member_name;
|
|
4032
4038
|
this.open_activity = open_activity;
|
|
@@ -4316,7 +4322,7 @@ const activityExtraMemberFactory = (apiActivityExtraMember) => new ActivityExtra
|
|
|
4316
4322
|
|
|
4317
4323
|
const memberActivityInviteFactory = (invitedMember) => new MemberActivityInvite(invitedMember.id, invitedMember.comment, invitedMember.current_num_attendants, invitedMember.last_invite, invitedMember.leader, invitedMember.member_email, invitedMember.member_id, invitedMember.member_name, invitedMember.next_invite, invitedMember.response_date, invitedMember.status);
|
|
4318
4324
|
|
|
4319
|
-
const activityFactory = (apiActivity) => new Activity(apiActivity.id, apiActivity.activity_group_id, apiActivity.activity_type_id, apiActivity.club_id, apiActivity.location_id, apiActivity.team_id, apiActivity.activity_location, apiActivity.activity_type_name, apiActivity.allow_maybe, apiActivity.calendar_name, apiActivity.created, apiActivity.current_num_attendants, apiActivity.day, apiActivity.description, apiActivity.end_time, apiActivity.file, apiActivity.invitation_text, apiActivity.invite_first_days, [], apiActivity.invite_hide_before_sent, apiActivity.invite_last_response_date, apiActivity.invite_remind, apiActivity.invite_remind_receivers, apiActivity.invite_second_days, 'same_as_last', (apiActivity.invited_members && apiActivity.invited_members.length) ? apiActivity.invited_members.map((invitedMember) => memberActivityInviteFactory(invitedMember)) : [], apiActivity.last_response_date, apiActivity.max_num_attendants, apiActivity.max_num_attendants_type, apiActivity.meet_up_place, apiActivity.meet_up_time, apiActivity.meet_up_time_display, apiActivity.open_activity, apiActivity.qr_code, apiActivity.qr_code_enabled, 'none', 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until', apiActivity.show_other_invited, apiActivity.start_time, apiActivity.title, apiActivity.updated, apiActivity.use_invite, false);
|
|
4325
|
+
const activityFactory = (apiActivity) => new Activity(apiActivity.id, apiActivity.activity_group_id, apiActivity.activity_type_id, apiActivity.club_id, apiActivity.location_id, apiActivity.team_id, apiActivity.activity_location, apiActivity.activity_type_name, apiActivity.allow_maybe, apiActivity.calendar_name, apiActivity.created, apiActivity.current_num_attendants, apiActivity.day, apiActivity.description, apiActivity.end_time, apiActivity.file, apiActivity.invitation_text, apiActivity.invite_first_days, [], apiActivity.invite_hide_before_sent, apiActivity.invite_last_response_date, apiActivity.invite_remind, apiActivity.invite_remind_receivers, apiActivity.invite_second_days, 'same_as_last', (apiActivity.invited_members && apiActivity.invited_members.length) ? apiActivity.invited_members.map((invitedMember) => memberActivityInviteFactory(invitedMember)) : [], apiActivity.last_response_date, apiActivity.max_num_attendants, apiActivity.max_num_attendants_type, apiActivity.meet_up_place, apiActivity.meet_up_time, apiActivity.meet_up_time_display, apiActivity.member_ids, apiActivity.open_activity, apiActivity.qr_code, apiActivity.qr_code_enabled, 'none', 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until', apiActivity.show_other_invited, apiActivity.start_time, apiActivity.title, apiActivity.updated, apiActivity.use_invite, false);
|
|
4320
4326
|
|
|
4321
4327
|
const unpaidInvoiceFactory = (apiUnpaidInvoice) => new UnpaidMemberInvoice(apiUnpaidInvoice.id, apiUnpaidInvoice.club_bill_id, apiUnpaidInvoice.member_id, apiUnpaidInvoice.token);
|
|
4322
4328
|
|
|
@@ -4350,7 +4356,7 @@ const authTeamSectionFactory = (apiAuthTeamSection) => new AuthTeamSection(apiAu
|
|
|
4350
4356
|
|
|
4351
4357
|
const authTeamFactory = (apiAuthTeam) => new AuthTeam(apiAuthTeam.id, apiAuthTeam.calendar_url, apiAuthTeam.name, apiAuthTeam.section ? authTeamSectionFactory(apiAuthTeam.section) : null, apiAuthTeam.team_admin_2fa_required);
|
|
4352
4358
|
|
|
4353
|
-
const authFactory = (apiAuth) => new Auth(apiAuth.id, apiAuth.name, apiAuth.club_admin, apiAuth.is_section_club, apiAuth.members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.registration_enabled, apiAuth.sections.map((apiAuthSection) => authSectionFactory(apiAuthSection)), apiAuth.site_enabled, apiAuth.teams.map((apiAuthTeam) => authTeamFactory(apiAuthTeam)), apiAuth.user_name, apiAuth.club_admin_2fa_required, apiAuth.section_admin_2fa_required, apiAuth.team_admin_2fa_required, apiAuth.member_admin_2fa_required);
|
|
4359
|
+
const authFactory = (apiAuth) => new Auth(apiAuth.id, apiAuth.name, apiAuth.club_admin, apiAuth.is_section_club, apiAuth.members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.registration_enabled, apiAuth.sections.map((apiAuthSection) => authSectionFactory(apiAuthSection)), apiAuth.site_enabled, apiAuth.teams.map((apiAuthTeam) => authTeamFactory(apiAuthTeam)), apiAuth.teams.length > 0, apiAuth.user_name, apiAuth.club_admin_2fa_required, apiAuth.section_admin_2fa_required, apiAuth.team_admin_2fa_required, apiAuth.member_admin_2fa_required);
|
|
4354
4360
|
|
|
4355
4361
|
const bookablePartFactory = (apiBookablePart) => {
|
|
4356
4362
|
return new BookablePart(apiBookablePart.id, apiBookablePart.name);
|
|
@@ -4479,7 +4485,7 @@ const newsFactory = (apiNews) => new News(apiNews.id, apiNews.club_id, apiNews.c
|
|
|
4479
4485
|
|
|
4480
4486
|
const optionalFeeFactory = (apiOptionalFee) => new OptionalFee(apiOptionalFee.id, apiOptionalFee.activity_id, apiOptionalFee.fee_id, apiOptionalFee.amount, apiOptionalFee.text);
|
|
4481
4487
|
|
|
4482
|
-
const openActivityFactory = (apiOpenActivity) => new OpenActivity(apiOpenActivity.id, apiOpenActivity.activity_group_id, apiOpenActivity.activity_type_id, apiOpenActivity.club_id, apiOpenActivity.location_id, apiOpenActivity.member_id, apiOpenActivity.team_id, apiOpenActivity.activity_location, apiOpenActivity.activity_type_name, apiOpenActivity.allow_maybe, apiOpenActivity.calendar_name, apiOpenActivity.created, apiOpenActivity.current_num_attendants, apiOpenActivity.day, apiOpenActivity.default_fee, apiOpenActivity.description, apiOpenActivity.end, apiOpenActivity.end_time, apiOpenActivity.file, apiOpenActivity.invitation_text, apiOpenActivity.invite_first_days, [], apiOpenActivity.invite_hide_before_sent, apiOpenActivity.invite_last_response_date, apiOpenActivity.invite_remind, apiOpenActivity.invite_remind_receivers, apiOpenActivity.invite_second_days, 'same_as_last', (apiOpenActivity.invited_members && apiOpenActivity.invited_members.length) ? apiOpenActivity.invited_members.map((invitedMember) => memberActivityInviteFactory(invitedMember)) : [], apiOpenActivity.last_response_date, apiOpenActivity.location_name, apiOpenActivity.max_num_attendants, apiOpenActivity.max_num_attendants_type, apiOpenActivity.meet_up_place, apiOpenActivity.meet_up_time, apiOpenActivity.meet_up_time_display, apiOpenActivity.meet_up_time_show, apiOpenActivity.member_invoice, apiOpenActivity.member_name, apiOpenActivity.open_activity, (apiOpenActivity.optional_fees && apiOpenActivity.optional_fees.length) ? apiOpenActivity.optional_fees.map((fee) => optionalFeeFactory(fee)) : [], apiOpenActivity.optional_fee_required, apiOpenActivity.optional_fee_type, 'none', 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until', apiOpenActivity.show_other_invited, apiOpenActivity.start, apiOpenActivity.start_time, apiOpenActivity.status, apiOpenActivity.title, apiOpenActivity.updated, apiOpenActivity.use_invite, false);
|
|
4488
|
+
const openActivityFactory = (apiOpenActivity) => new OpenActivity(apiOpenActivity.id, apiOpenActivity.activity_group_id, apiOpenActivity.activity_type_id, apiOpenActivity.club_id, apiOpenActivity.location_id, apiOpenActivity.member_id, apiOpenActivity.team_id, apiOpenActivity.activity_location, apiOpenActivity.activity_type_name, apiOpenActivity.allow_maybe, apiOpenActivity.calendar_name, apiOpenActivity.created, apiOpenActivity.current_num_attendants, apiOpenActivity.day, apiOpenActivity.default_fee, apiOpenActivity.description, apiOpenActivity.end, apiOpenActivity.end_time, apiOpenActivity.file, apiOpenActivity.invitation_text, apiOpenActivity.invite_first_days, [], apiOpenActivity.invite_hide_before_sent, apiOpenActivity.invite_last_response_date, apiOpenActivity.invite_remind, apiOpenActivity.invite_remind_receivers, apiOpenActivity.invite_second_days, 'same_as_last', (apiOpenActivity.invited_members && apiOpenActivity.invited_members.length) ? apiOpenActivity.invited_members.map((invitedMember) => memberActivityInviteFactory(invitedMember)) : [], apiOpenActivity.last_response_date, apiOpenActivity.location_name, apiOpenActivity.max_num_attendants, apiOpenActivity.max_num_attendants_type, apiOpenActivity.meet_up_place, apiOpenActivity.meet_up_time, apiOpenActivity.meet_up_time_display, apiOpenActivity.meet_up_time_show, [], apiOpenActivity.member_invoice, apiOpenActivity.member_name, apiOpenActivity.open_activity, (apiOpenActivity.optional_fees && apiOpenActivity.optional_fees.length) ? apiOpenActivity.optional_fees.map((fee) => optionalFeeFactory(fee)) : [], apiOpenActivity.optional_fee_required, apiOpenActivity.optional_fee_type, 'none', 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until', apiOpenActivity.show_other_invited, apiOpenActivity.start, apiOpenActivity.start_time, apiOpenActivity.status, apiOpenActivity.title, apiOpenActivity.updated, apiOpenActivity.use_invite, false);
|
|
4483
4489
|
|
|
4484
4490
|
const overbookedBookableItemFactory = (apiOverbookedBookableItem) => new OverbookedBookableItem(apiOverbookedBookableItem.start_time, apiOverbookedBookableItem.end_time, apiOverbookedBookableItem.day, apiOverbookedBookableItem.bookable_name, apiOverbookedBookableItem.session_names);
|
|
4485
4491
|
|
|
@@ -8163,7 +8169,7 @@ class AuthEffects {
|
|
|
8163
8169
|
.pipe(ofType(listAuthAction), exhaustMap(({ payload }) => this.authService.getAuths(payload)
|
|
8164
8170
|
.pipe(map((auths) => listAuthSuccessAction({ payload: auths.toArray() })), catchError((error) => of(listAuthFailureAction({ payload: error })))))));
|
|
8165
8171
|
listAuthTeams$ = createEffect(() => this.actions$
|
|
8166
|
-
.pipe(ofType(listAuthTeamsAction),
|
|
8172
|
+
.pipe(ofType(listAuthTeamsAction), mergeMap(({ payload }) => {
|
|
8167
8173
|
if (payload.clubAdmin) {
|
|
8168
8174
|
return this.teamService.getClubTeams(payload.id)
|
|
8169
8175
|
.pipe(map((searchTeams) => {
|
|
@@ -9648,11 +9654,11 @@ function ensureOpenActivityTypeLoadingDone() {
|
|
|
9648
9654
|
* @return {Observable<ListResultInterface<Auth>>} An observable that emits only when authentication data is present.
|
|
9649
9655
|
*/
|
|
9650
9656
|
function ensureAuths(store) {
|
|
9651
|
-
return (source) => source.pipe(tap$1((
|
|
9652
|
-
if (!
|
|
9657
|
+
return (source) => source.pipe(tap$1((state) => {
|
|
9658
|
+
if (!state) {
|
|
9653
9659
|
store.dispatch(listAuthAction());
|
|
9654
9660
|
}
|
|
9655
|
-
}), filter((
|
|
9661
|
+
}), filter((state) => !!state && !state.loading));
|
|
9656
9662
|
}
|
|
9657
9663
|
|
|
9658
9664
|
/**
|
|
@@ -9719,11 +9725,11 @@ function ensureCurrentAuth(store) {
|
|
|
9719
9725
|
* @return {Observable<RetrieveResultInterface<User>>} An observable that emits only valid user results.
|
|
9720
9726
|
*/
|
|
9721
9727
|
function ensureCurrentUser(store) {
|
|
9722
|
-
return (source) => source.pipe(tap((
|
|
9723
|
-
if (!
|
|
9728
|
+
return (source) => source.pipe(tap((state) => {
|
|
9729
|
+
if (!state) {
|
|
9724
9730
|
store.dispatch(getCurrentUserAction());
|
|
9725
9731
|
}
|
|
9726
|
-
}), filter$1((
|
|
9732
|
+
}), filter$1((state) => !!state && !state.loading));
|
|
9727
9733
|
}
|
|
9728
9734
|
|
|
9729
9735
|
/**
|
|
@@ -9998,7 +10004,8 @@ function updateAuthTeams(state, payload) {
|
|
|
9998
10004
|
...state.auths.results.slice(0, index),
|
|
9999
10005
|
{
|
|
10000
10006
|
...state.auths.results[index],
|
|
10001
|
-
teams: payload.teams
|
|
10007
|
+
teams: payload.teams,
|
|
10008
|
+
teamsLoaded: true
|
|
10002
10009
|
},
|
|
10003
10010
|
...state.auths.results.slice(index + 1)
|
|
10004
10011
|
];
|
|
@@ -10006,12 +10013,21 @@ function updateAuthTeams(state, payload) {
|
|
|
10006
10013
|
...state,
|
|
10007
10014
|
auths: {
|
|
10008
10015
|
...state.auths,
|
|
10009
|
-
results: updatedResult
|
|
10016
|
+
results: updatedResult,
|
|
10017
|
+
lastLoaded: new Date(),
|
|
10018
|
+
loading: false
|
|
10010
10019
|
}
|
|
10011
10020
|
};
|
|
10012
10021
|
}
|
|
10013
10022
|
}
|
|
10014
|
-
return
|
|
10023
|
+
return {
|
|
10024
|
+
...state,
|
|
10025
|
+
auths: {
|
|
10026
|
+
...state.auths,
|
|
10027
|
+
lastLoaded: new Date(),
|
|
10028
|
+
loading: false
|
|
10029
|
+
}
|
|
10030
|
+
};
|
|
10015
10031
|
}
|
|
10016
10032
|
const authReducer = createReducer(initialAuthState, on(clearAuthenticationSuccessAction, clearCurrentAuthSuccessAction, state => ({
|
|
10017
10033
|
...state,
|
|
@@ -10035,6 +10051,9 @@ const authReducer = createReducer(initialAuthState, on(clearAuthenticationSucces
|
|
|
10035
10051
|
})), on(listAuthTeamsAction, state => ({
|
|
10036
10052
|
...state,
|
|
10037
10053
|
auths: { ...state.auths || listStartLoading(), loading: true }
|
|
10054
|
+
})), on(listAuthTeamsFailureAction, (state, { payload }) => ({
|
|
10055
|
+
...state,
|
|
10056
|
+
auths: { ...state.auths || listLoadFailure(payload) }
|
|
10038
10057
|
})), on(listAuthTeamsSuccessAction, (state, { payload }) => updateAuthTeams(state, payload)));
|
|
10039
10058
|
|
|
10040
10059
|
// --- Helper Functions ---
|
|
@@ -10451,7 +10470,7 @@ on(removeMemberOpenActivityAction, (state, { payload }) => {
|
|
|
10451
10470
|
if (existingOpenActivities) {
|
|
10452
10471
|
const updatedOpenActivities = existingOpenActivities.map((openActivity) => {
|
|
10453
10472
|
if (openActivity.id === payload.activityId && openActivity.member_id === payload.memberId) {
|
|
10454
|
-
return new OpenActivity(openActivity.id, openActivity.activity_group_id, openActivity.activity_type_id, openActivity.club_id, openActivity.location_id, openActivity.member_id, openActivity.team_id, openActivity.activity_location, openActivity.activity_type_name, openActivity.allow_maybe, openActivity.calendar_name, openActivity.created, openActivity.current_num_attendants, openActivity.day, openActivity.default_fee, openActivity.description, openActivity.end, openActivity.end_time, openActivity.file, openActivity.invitation_text, openActivity.invite_first_days, openActivity.invite_groups, openActivity.invite_hide_before_sent, openActivity.invite_last_response_date, openActivity.invite_remind, openActivity.invite_remind_receivers, openActivity.invite_second_days, openActivity.invite_settings, openActivity.invited_members.filter((invite) => invite.member_id !== payload.memberId), openActivity.last_response_date, openActivity.location_name, openActivity.max_num_attendants, openActivity.max_num_attendants_type, openActivity.meet_up_place, openActivity.meet_up_time, openActivity.meet_up_time_display, openActivity.meet_up_time_show, openActivity.member_invoice, openActivity.member_name, openActivity.open_activity, openActivity.optional_fees, openActivity.optional_fee_required, openActivity.optional_fee_type, openActivity.repeat, openActivity.repeat_num, openActivity.repeat_to_day, openActivity.repeat_type, openActivity.show_other_invited, openActivity.start, openActivity.start_time, 'waiting', openActivity.title, openActivity.updated, openActivity.use_invite, openActivity.update_repeating);
|
|
10473
|
+
return new OpenActivity(openActivity.id, openActivity.activity_group_id, openActivity.activity_type_id, openActivity.club_id, openActivity.location_id, openActivity.member_id, openActivity.team_id, openActivity.activity_location, openActivity.activity_type_name, openActivity.allow_maybe, openActivity.calendar_name, openActivity.created, openActivity.current_num_attendants, openActivity.day, openActivity.default_fee, openActivity.description, openActivity.end, openActivity.end_time, openActivity.file, openActivity.invitation_text, openActivity.invite_first_days, openActivity.invite_groups, openActivity.invite_hide_before_sent, openActivity.invite_last_response_date, openActivity.invite_remind, openActivity.invite_remind_receivers, openActivity.invite_second_days, openActivity.invite_settings, openActivity.invited_members.filter((invite) => invite.member_id !== payload.memberId), openActivity.last_response_date, openActivity.location_name, openActivity.max_num_attendants, openActivity.max_num_attendants_type, openActivity.meet_up_place, openActivity.meet_up_time, openActivity.meet_up_time_display, openActivity.meet_up_time_show, openActivity.member_ids, openActivity.member_invoice, openActivity.member_name, openActivity.open_activity, openActivity.optional_fees, openActivity.optional_fee_required, openActivity.optional_fee_type, openActivity.repeat, openActivity.repeat_num, openActivity.repeat_to_day, openActivity.repeat_type, openActivity.show_other_invited, openActivity.start, openActivity.start_time, 'waiting', openActivity.title, openActivity.updated, openActivity.use_invite, openActivity.update_repeating);
|
|
10455
10474
|
}
|
|
10456
10475
|
return openActivity;
|
|
10457
10476
|
});
|
|
@@ -11106,7 +11125,7 @@ const publicReducer = createReducer(initialPublicState, on(clearStoreAction, ()
|
|
|
11106
11125
|
error: null,
|
|
11107
11126
|
results: [...currentState.publicOpenActivities.value.results].map((openActivity) => {
|
|
11108
11127
|
if (openActivity.id === payload) {
|
|
11109
|
-
return new OpenActivity(openActivity.id, openActivity.activity_group_id, openActivity.activity_type_id, openActivity.club_id, openActivity.location_id, openActivity.member_id, openActivity.team_id, openActivity.activity_location, openActivity.activity_type_name, openActivity.allow_maybe, openActivity.calendar_name, openActivity.created, openActivity.current_num_attendants, openActivity.day, openActivity.default_fee, openActivity.description, openActivity.end, openActivity.end_time, openActivity.file, openActivity.invitation_text, openActivity.invite_first_days, openActivity.invite_groups, openActivity.invite_hide_before_sent, openActivity.invite_last_response_date, openActivity.invite_remind, openActivity.invite_remind_receivers, openActivity.invite_second_days, openActivity.invite_settings, openActivity.invited_members.filter((invite) => invite.member_id !== openActivity.member_id), openActivity.last_response_date, openActivity.location_name, openActivity.max_num_attendants, openActivity.max_num_attendants_type, openActivity.meet_up_place, openActivity.meet_up_time, openActivity.meet_up_time_display, openActivity.meet_up_time_show, openActivity.member_invoice, openActivity.member_name, openActivity.open_activity, openActivity.optional_fees, openActivity.optional_fee_required, openActivity.optional_fee_type, openActivity.repeat, openActivity.repeat_num, openActivity.repeat_to_day, openActivity.repeat_type, openActivity.show_other_invited, openActivity.start, openActivity.start_time, 'waiting', openActivity.title, openActivity.updated, openActivity.use_invite, openActivity.update_repeating);
|
|
11128
|
+
return new OpenActivity(openActivity.id, openActivity.activity_group_id, openActivity.activity_type_id, openActivity.club_id, openActivity.location_id, openActivity.member_id, openActivity.team_id, openActivity.activity_location, openActivity.activity_type_name, openActivity.allow_maybe, openActivity.calendar_name, openActivity.created, openActivity.current_num_attendants, openActivity.day, openActivity.default_fee, openActivity.description, openActivity.end, openActivity.end_time, openActivity.file, openActivity.invitation_text, openActivity.invite_first_days, openActivity.invite_groups, openActivity.invite_hide_before_sent, openActivity.invite_last_response_date, openActivity.invite_remind, openActivity.invite_remind_receivers, openActivity.invite_second_days, openActivity.invite_settings, openActivity.invited_members.filter((invite) => invite.member_id !== openActivity.member_id), openActivity.last_response_date, openActivity.location_name, openActivity.max_num_attendants, openActivity.max_num_attendants_type, openActivity.meet_up_place, openActivity.meet_up_time, openActivity.meet_up_time_display, openActivity.meet_up_time_show, openActivity.member_ids, openActivity.member_invoice, openActivity.member_name, openActivity.open_activity, openActivity.optional_fees, openActivity.optional_fee_required, openActivity.optional_fee_type, openActivity.repeat, openActivity.repeat_num, openActivity.repeat_to_day, openActivity.repeat_type, openActivity.show_other_invited, openActivity.start, openActivity.start_time, 'waiting', openActivity.title, openActivity.updated, openActivity.use_invite, openActivity.update_repeating);
|
|
11110
11129
|
}
|
|
11111
11130
|
return openActivity;
|
|
11112
11131
|
})
|