Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@
"node_modules/ngx-markdown-editor/assets/highlight.js/highlight.min.js",
"node_modules/ngx-markdown-editor/assets/marked.min.js",
"src/assets/js/ace/snippetsMarkdown.js"
]
],
"server": "src/main.server.ts",
"outputMode": "server",
"ssr": {
"entry": "src/server.ts"
}
},
"configurations": {
"production": {
Expand Down
4 changes: 2 additions & 2 deletions src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ConfirmationService, MessageService } from 'primeng/api';
import { providePrimeNG } from 'primeng/config';
import { DialogService } from 'primeng/dynamicdialog';

import { provideHttpClient, withInterceptors } from '@angular/common/http';
import { provideHttpClient, withFetch, withInterceptors } from '@angular/common/http';
import { ApplicationConfig, ErrorHandler, importProvidersFrom, provideZoneChangeDetection } from '@angular/core';
import { provideClientHydration, withEventReplay } from '@angular/platform-browser';
import { provideAnimations } from '@angular/platform-browser/animations';
Expand Down Expand Up @@ -49,7 +49,7 @@ export const appConfig: ApplicationConfig = {
},
},
}),
provideHttpClient(withInterceptors([authInterceptor, viewOnlyInterceptor, errorInterceptor])),
provideHttpClient(withInterceptors([authInterceptor, viewOnlyInterceptor, errorInterceptor]), withFetch()),
provideRouter(routes, withInMemoryScrolling({ scrollPositionRestoration: 'top', anchorScrolling: 'enabled' })),
provideStore(STATES),
provideZoneChangeDetection({ eventCoalescing: true }),
Expand Down
122 changes: 107 additions & 15 deletions src/app/app.routes.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,39 @@ import { RenderMode, ServerRoute } from '@angular/ssr';
export const serverRoutes: ServerRoute[] = [
{
path: 'terms-of-use',
renderMode: RenderMode.Server,
renderMode: RenderMode.Prerender,
},
{
path: 'privacy-policy',
renderMode: RenderMode.Server,
renderMode: RenderMode.Prerender,
},
{
path: 'dashboard',
renderMode: RenderMode.Client,
},
{
path: 'my-projects',
renderMode: RenderMode.Client,
},
{
path: 'my-registrations',
renderMode: RenderMode.Client,
},
{
path: 'my-preprints',
renderMode: RenderMode.Client,
},
{
path: 'registries/drafts/**',
renderMode: RenderMode.Client,
},
{
path: 'registries/revisions/**',
renderMode: RenderMode.Client,
},
{
path: 'settings/**',
renderMode: RenderMode.Client,
},
{
path: 'forbidden',
Expand All @@ -21,42 +49,106 @@ export const serverRoutes: ServerRoute[] = [
path: 'not-found',
renderMode: RenderMode.Server,
},
{
path: 'search',
renderMode: RenderMode.Server,
},
{
path: 'preprints/:providerId/:id/pending-moderation',
renderMode: RenderMode.Server,
},
{
path: 'preprints/discover',
renderMode: RenderMode.Server,
},
{
path: 'preprints/:providerId',
renderMode: RenderMode.Server,
},
{
path: 'preprints/:providerId/discover',
renderMode: RenderMode.Server,
},
{
path: 'preprints/:providerId/:id',
renderMode: RenderMode.Server,
},
{
path: 'dashboard',
renderMode: RenderMode.Client,
path: 'registries/discover',
renderMode: RenderMode.Server,
},
{
path: 'my-projects',
renderMode: RenderMode.Client,
path: 'registries/:providerId',
renderMode: RenderMode.Server,
},
{
path: 'my-registrations',
renderMode: RenderMode.Client,
path: 'institutions',
renderMode: RenderMode.Server,
},
{
path: 'my-preprints',
renderMode: RenderMode.Client,
path: 'institutions/:institutionId',
renderMode: RenderMode.Server,
},
{
path: 'profile',
renderMode: RenderMode.Client,
path: 'collections/:providerId/discover',
renderMode: RenderMode.Server,
},
{
path: 'settings/**',
renderMode: RenderMode.Client,
path: 'meetings/**',
renderMode: RenderMode.Server,
},
{
path: ':id/overview',
path: 'user/:id',
renderMode: RenderMode.Server,
},
{
path: ':id/files/:provider/:fileId',
renderMode: RenderMode.Server,
},
{
path: 'project/:id/files/:provider/:fileId',
renderMode: RenderMode.Server,
},
{
path: 'project/:id/node/:nodeId/files/:provider/:fileId',
renderMode: RenderMode.Server,
},
{
path: ':id',
renderMode: RenderMode.Server,
},
{
path: ':id/overview',
renderMode: RenderMode.Server,
},
{
path: ':id/files/**',
renderMode: RenderMode.Server,
},
{
path: ':id/registrations',
renderMode: RenderMode.Server,
},
{
path: ':id/analytics',
renderMode: RenderMode.Server,
},
{
path: ':id/links',
renderMode: RenderMode.Server,
},
{
path: ':id/resources',
renderMode: RenderMode.Server,
},
{
path: ':id/components',
renderMode: RenderMode.Server,
},
{
path: ':id/recent-activity',
renderMode: RenderMode.Server,
},
{
path: '**',
renderMode: RenderMode.Client,
Expand Down
49 changes: 49 additions & 0 deletions src/app/core/guards/is-file-provider.guard.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { ParamMap, UrlSegment } from '@angular/router';

import { FileProvider } from '@osf/features/files/constants';

import { isFileProvider } from './is-file-provider.guard';

describe('isFileProvider', () => {
const createMockParamMap = (): ParamMap => ({
get: () => null,
getAll: () => [],
has: () => false,
keys: [],
});

const createMockSegment = (path: string): UrlSegment => ({
path,
parameters: {},
parameterMap: createMockParamMap(),
});

const createMockSegments = (path: string) => [createMockSegment(path)];

it('should return true when id matches a FileProvider value', () => {
Object.values(FileProvider).forEach((provider) => {
const result = isFileProvider({} as any, createMockSegments(provider));
expect(result).toBe(true);
});
});

it('should return false when id does not match any FileProvider value', () => {
const result = isFileProvider({} as any, createMockSegments('invalid-provider'));
expect(result).toBe(false);
});

it('should return false when segments array is empty', () => {
const result = isFileProvider({} as any, []);
expect(result).toBe(false);
});

it('should return false when first segment has no path', () => {
const result = isFileProvider({} as any, [createMockSegment('')]);
expect(result).toBe(false);
});

it('should return false when first segment is undefined', () => {
const result = isFileProvider({} as any, [undefined as any]);
expect(result).toBe(false);
});
});
47 changes: 11 additions & 36 deletions src/app/core/guards/is-file.guard.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { MockProvider } from 'ng-mocks';

import { of } from 'rxjs';

import { PLATFORM_ID, runInInjectionContext } from '@angular/core';
Expand Down Expand Up @@ -45,10 +47,7 @@ describe('isFileGuard', () => {
selectors: [],
actions: [],
}),
{
provide: Router,
useValue: RouterMockBuilder.create().withUrl('/test').build(),
},
MockProvider(Router, RouterMockBuilder.create().withUrl('/test').build()),
{
provide: PLATFORM_ID,
useValue: 'browser',
Expand Down Expand Up @@ -86,10 +85,7 @@ describe('isFileGuard', () => {
},
],
}),
{
provide: Router,
useValue: RouterMockBuilder.create().withUrl('/test').build(),
},
MockProvider(Router, RouterMockBuilder.create().withUrl('/test').build()),
{
provide: PLATFORM_ID,
useValue: 'browser',
Expand Down Expand Up @@ -135,10 +131,7 @@ describe('isFileGuard', () => {
},
],
}),
{
provide: Router,
useValue: RouterMockBuilder.create().withUrl('/test').build(),
},
MockProvider(Router, RouterMockBuilder.create().withUrl('/test').build()),
{
provide: PLATFORM_ID,
useValue: 'browser',
Expand Down Expand Up @@ -187,10 +180,7 @@ describe('isFileGuard', () => {
},
],
}),
{
provide: Router,
useValue: RouterMockBuilder.create().withUrl('/test').build(),
},
MockProvider(Router, RouterMockBuilder.create().withUrl('/test').build()),
{
provide: PLATFORM_ID,
useValue: 'browser',
Expand Down Expand Up @@ -240,10 +230,7 @@ describe('isFileGuard', () => {
},
],
}),
{
provide: Router,
useValue: RouterMockBuilder.create().withUrl('/test').build(),
},
MockProvider(Router, RouterMockBuilder.create().withUrl('/test').build()),
{
provide: PLATFORM_ID,
useValue: 'browser',
Expand Down Expand Up @@ -292,10 +279,7 @@ describe('isFileGuard', () => {
},
],
}),
{
provide: Router,
useValue: RouterMockBuilder.create().withUrl('/test').build(),
},
MockProvider(Router, RouterMockBuilder.create().withUrl('/test').build()),
{
provide: PLATFORM_ID,
useValue: 'browser',
Expand Down Expand Up @@ -344,10 +328,7 @@ describe('isFileGuard', () => {
},
],
}),
{
provide: Router,
useValue: RouterMockBuilder.create().withUrl('/test').build(),
},
MockProvider(Router, RouterMockBuilder.create().withUrl('/test').build()),
{
provide: PLATFORM_ID,
useValue: 'browser',
Expand Down Expand Up @@ -397,10 +378,7 @@ describe('isFileGuard', () => {
},
],
}),
{
provide: Router,
useValue: RouterMockBuilder.create().withUrl('/test?view_only=abc123').build(),
},
MockProvider(Router, RouterMockBuilder.create().withUrl('/test?view_only=abc123').build()),
{
provide: PLATFORM_ID,
useValue: 'server',
Expand Down Expand Up @@ -459,10 +437,7 @@ describe('isFileGuard', () => {
},
],
}),
{
provide: Router,
useValue: RouterMockBuilder.create().withUrl('/test').build(),
},
MockProvider(Router, RouterMockBuilder.create().withUrl('/test').build()),
{
provide: PLATFORM_ID,
useValue: 'browser',
Expand Down
Loading