Skip to content

Commit e4e56ac

Browse files
committed
Merge branch 'fix/performance-improvements' of https://github.com/nsemets/angular-osf into fix/performance-improvements
2 parents 413e32f + 608470a commit e4e56ac

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

src/app/features/moderation/components/moderators-list/moderators-list.component.spec.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ import { of } from 'rxjs';
55
import { ComponentFixture, TestBed } from '@angular/core/testing';
66
import { ActivatedRoute } from '@angular/router';
77

8+
import { ProviderSelectors } from '@core/store/provider';
89
import { UserSelectors } from '@core/store/user';
9-
import { ModeratorsTableComponent } from '@osf/features/moderation/components';
10+
import { SearchInputComponent } from '@osf/shared/components';
1011
import { ResourceType } from '@osf/shared/enums';
11-
import { SearchInputComponent } from '@shared/components';
1212
import { CustomConfirmationService, CustomDialogService } from '@shared/services';
1313

1414
import { ModeratorPermission } from '../../enums';
1515
import { ModeratorModel } from '../../models';
1616
import { ModeratorsSelectors } from '../../store/moderators';
17+
import { ModeratorsTableComponent } from '../moderators-table/moderators-table.component';
1718

1819
import { ModeratorsListComponent } from './moderators-list.component';
1920

@@ -71,6 +72,7 @@ describe('ModeratorsListComponent', () => {
7172
signals: [
7273
{ selector: UserSelectors.getCurrentUser, value: mockCurrentUser },
7374
{ selector: ModeratorsSelectors.getModerators, value: mockModerators },
75+
{ selector: ProviderSelectors.hasAdminAccess, value: false },
7476
{ selector: ModeratorsSelectors.isModeratorsLoading, value: false },
7577
],
7678
}),
@@ -110,7 +112,7 @@ describe('ModeratorsListComponent', () => {
110112

111113
fixture.detectChanges();
112114

113-
expect(component.isCurrentUserAdminModerator()).toBe(false);
115+
expect(component.hasAdminAccess()).toBe(false);
114116
});
115117

116118
it('should return false for admin moderator when user is not found', () => {
@@ -121,7 +123,7 @@ describe('ModeratorsListComponent', () => {
121123

122124
fixture.detectChanges();
123125

124-
expect(component.isCurrentUserAdminModerator()).toBe(false);
126+
expect(component.hasAdminAccess()).toBe(false);
125127
});
126128

127129
it('should load moderators on initialization', () => {

src/app/features/moderation/components/moderators-table/moderators-table.component.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('ModeratorsTableComponent', () => {
4444

4545
fixture.componentRef.setInput('tableParams', mockTableParams);
4646
fixture.componentRef.setInput('currentUserId', 'test-user-id');
47-
fixture.componentRef.setInput('isCurrentUserAdminModerator', false);
47+
fixture.componentRef.setInput('hasAdminAccess', false);
4848
});
4949

5050
it('should create', () => {
@@ -56,15 +56,15 @@ describe('ModeratorsTableComponent', () => {
5656
fixture.componentRef.setInput('items', mockModerators);
5757
fixture.componentRef.setInput('isLoading', true);
5858
fixture.componentRef.setInput('currentUserId', 'current-user-123');
59-
fixture.componentRef.setInput('isCurrentUserAdminModerator', true);
59+
fixture.componentRef.setInput('hasAdminAccess', true);
6060
fixture.componentRef.setInput('tableParams', mockTableParams);
6161

6262
fixture.detectChanges();
6363

6464
expect(component.items()).toEqual(mockModerators);
6565
expect(component.isLoading()).toBe(true);
6666
expect(component.currentUserId()).toBe('current-user-123');
67-
expect(component.isCurrentUserAdminModerator()).toBe(true);
67+
expect(component.hasAdminAccess()).toBe(true);
6868
expect(component.tableParams()).toEqual(mockTableParams);
6969
});
7070

@@ -118,7 +118,7 @@ describe('ModeratorsTableComponent', () => {
118118
fixture.componentRef.setInput('items', []);
119119
fixture.componentRef.setInput('tableParams', mockTableParams);
120120
fixture.componentRef.setInput('currentUserId', 'test-user-id');
121-
fixture.componentRef.setInput('isCurrentUserAdminModerator', false);
121+
fixture.componentRef.setInput('hasAdminAccess', false);
122122

123123
fixture.detectChanges();
124124

@@ -128,7 +128,7 @@ describe('ModeratorsTableComponent', () => {
128128
it('should handle undefined currentUserId', () => {
129129
fixture.componentRef.setInput('currentUserId', undefined);
130130
fixture.componentRef.setInput('tableParams', mockTableParams);
131-
fixture.componentRef.setInput('isCurrentUserAdminModerator', false);
131+
fixture.componentRef.setInput('hasAdminAccess', false);
132132

133133
fixture.detectChanges();
134134

src/app/features/profile/components/profile-information/profile-information.component.spec.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,6 @@ describe('ProfileInformationComponent', () => {
156156
expect(socials).toEqual([]);
157157
});
158158

159-
it('should not include profileWebsites in social links', () => {
160-
fixture.componentRef.setInput('currentUser', mockUser);
161-
fixture.detectChanges();
162-
163-
const socials = component.userSocials();
164-
const websites = socials.filter((s) => s.alt === 'settings.profileSettings.social.labels.profileWebsites');
165-
expect(websites.length).toBe(0);
166-
});
167-
168159
it('should emit editProfile event when called', (done) => {
169160
component.editProfile.subscribe(() => {
170161
expect(true).toBe(true);

0 commit comments

Comments
 (0)