mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
remove unused config params and related methods
This commit is contained in:
@@ -1,57 +0,0 @@
|
|||||||
import { HardRedirectService } from './hard-redirect.service';
|
|
||||||
import { environment } from '../../../environments/environment';
|
|
||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { Injectable } from '@angular/core';
|
|
||||||
|
|
||||||
const requestOrigin = 'http://dspace-angular-ui.dspace.com';
|
|
||||||
|
|
||||||
describe('HardRedirectService', () => {
|
|
||||||
let service: TestHardRedirectService;
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
TestBed.configureTestingModule({ providers: [TestHardRedirectService] });
|
|
||||||
service = TestBed.inject(TestHardRedirectService);
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('when calling rewriteDownloadURL', () => {
|
|
||||||
let originalValue;
|
|
||||||
const relativePath = '/test/url/path';
|
|
||||||
const testURL = environment.rest.baseUrl + relativePath;
|
|
||||||
beforeEach(() => {
|
|
||||||
originalValue = environment.rewriteDownloadUrls;
|
|
||||||
});
|
|
||||||
|
|
||||||
it('it should return the same url when rewriteDownloadURL is false', () => {
|
|
||||||
environment.rewriteDownloadUrls = false;
|
|
||||||
expect(service.rewriteDownloadURL(testURL)).toEqual(testURL);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('it should replace part of the url when rewriteDownloadURL is true', () => {
|
|
||||||
environment.rewriteDownloadUrls = true;
|
|
||||||
expect(service.rewriteDownloadURL(testURL)).toEqual(requestOrigin + environment.rest.nameSpace + relativePath);
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
environment.rewriteDownloadUrls = originalValue;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
class TestHardRedirectService extends HardRedirectService {
|
|
||||||
constructor() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
redirect(url: string) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
getCurrentRoute() {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
getRequestOrigin() {
|
|
||||||
return requestOrigin;
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,6 +1,4 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { environment } from '../../../environments/environment';
|
|
||||||
import { URLCombiner } from '../url-combiner/url-combiner';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service to take care of hard redirects
|
* Service to take care of hard redirects
|
||||||
@@ -26,15 +24,4 @@ export abstract class HardRedirectService {
|
|||||||
* Get the hostname of the request
|
* Get the hostname of the request
|
||||||
*/
|
*/
|
||||||
abstract getRequestOrigin();
|
abstract getRequestOrigin();
|
||||||
|
|
||||||
public rewriteDownloadURL(originalUrl: string): string {
|
|
||||||
if (environment.rewriteDownloadUrls) {
|
|
||||||
const hostName = this.getRequestOrigin();
|
|
||||||
const namespace = environment.rest.nameSpace;
|
|
||||||
const rewrittenUrl = new URLCombiner(hostName, namespace).toString();
|
|
||||||
return originalUrl.replace(environment.rest.baseUrl, rewrittenUrl);
|
|
||||||
} else {
|
|
||||||
return originalUrl;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -24,7 +24,6 @@ export interface GlobalConfig extends Config {
|
|||||||
notifications: INotificationBoardOptions;
|
notifications: INotificationBoardOptions;
|
||||||
submission: SubmissionConfig;
|
submission: SubmissionConfig;
|
||||||
universal: UniversalConfig;
|
universal: UniversalConfig;
|
||||||
logDirectory: string;
|
|
||||||
debug: boolean;
|
debug: boolean;
|
||||||
defaultLanguage: string;
|
defaultLanguage: string;
|
||||||
languages: LangConfig[];
|
languages: LangConfig[];
|
||||||
@@ -32,6 +31,5 @@ export interface GlobalConfig extends Config {
|
|||||||
item: ItemPageConfig;
|
item: ItemPageConfig;
|
||||||
collection: CollectionPageConfig;
|
collection: CollectionPageConfig;
|
||||||
themes: ThemeConfig[];
|
themes: ThemeConfig[];
|
||||||
rewriteDownloadUrls: boolean;
|
|
||||||
mediaViewer: MediaViewerConfig;
|
mediaViewer: MediaViewerConfig;
|
||||||
}
|
}
|
||||||
|
@@ -148,8 +148,6 @@ export const environment: GlobalConfig = {
|
|||||||
async: true,
|
async: true,
|
||||||
time: false
|
time: false
|
||||||
},
|
},
|
||||||
// Log directory
|
|
||||||
logDirectory: '.',
|
|
||||||
// NOTE: will log all redux actions and transfers in console
|
// NOTE: will log all redux actions and transfers in console
|
||||||
debug: false,
|
debug: false,
|
||||||
// Default Language in which the UI will be rendered if the user's browser language is not an active language
|
// Default Language in which the UI will be rendered if the user's browser language is not an active language
|
||||||
@@ -280,8 +278,6 @@ export const environment: GlobalConfig = {
|
|||||||
name: 'dspace'
|
name: 'dspace'
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
// Whether the UI should rewrite file download URLs to match its domain. Only necessary to enable when running UI and REST API on separate domains
|
|
||||||
rewriteDownloadUrls: false,
|
|
||||||
// Whether to enable media viewer for image and/or video Bitstreams (i.e. Bitstreams whose MIME type starts with "image" or "video").
|
// Whether to enable media viewer for image and/or video Bitstreams (i.e. Bitstreams whose MIME type starts with "image" or "video").
|
||||||
// For images, this enables a gallery viewer where you can zoom or page through images.
|
// For images, this enables a gallery viewer where you can zoom or page through images.
|
||||||
// For videos, this enables embedded video streaming
|
// For videos, this enables embedded video streaming
|
||||||
|
@@ -126,8 +126,6 @@ export const environment: Partial<GlobalConfig> = {
|
|||||||
async: true,
|
async: true,
|
||||||
time: false
|
time: false
|
||||||
},
|
},
|
||||||
// Log directory
|
|
||||||
logDirectory: '.',
|
|
||||||
// NOTE: will log all redux actions and transfers in console
|
// NOTE: will log all redux actions and transfers in console
|
||||||
debug: false,
|
debug: false,
|
||||||
// Default Language in which the UI will be rendered if the user's browser language is not an active language
|
// Default Language in which the UI will be rendered if the user's browser language is not an active language
|
||||||
|
Reference in New Issue
Block a user