mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2025-05-25 04:24:43 -04:00
refactor(config): extract note config from app config
This commit separates the app config object from a new note config object. This was done to separate different concerns in different config files. Especially if the number of settings that are about notes increase, it is a good idea to keep them separate from the app config. Signed-off-by: Philip Molares <philip.molares@udo.edu>
This commit is contained in:
parent
baa6606729
commit
f4a580cf2a
30 changed files with 161 additions and 78 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -15,6 +15,7 @@ import { AuthToken } from '../../../auth/auth-token.entity';
|
|||
import { Author } from '../../../authors/author.entity';
|
||||
import appConfigMock from '../../../config/mock/app.config.mock';
|
||||
import mediaConfigMock from '../../../config/mock/media.config.mock';
|
||||
import noteConfigMock from '../../../config/mock/note.config.mock';
|
||||
import { Group } from '../../../groups/group.entity';
|
||||
import { GroupsModule } from '../../../groups/groups.module';
|
||||
import { HistoryEntry } from '../../../history/history-entry.entity';
|
||||
|
@ -75,7 +76,7 @@ describe('AliasController', () => {
|
|||
MediaModule,
|
||||
ConfigModule.forRoot({
|
||||
isGlobal: true,
|
||||
load: [appConfigMock, mediaConfigMock],
|
||||
load: [appConfigMock, noteConfigMock, mediaConfigMock],
|
||||
}),
|
||||
TypeOrmModule.forRoot(),
|
||||
],
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -10,6 +10,7 @@ import appConfigMock from '../../../config/mock/app.config.mock';
|
|||
import authConfigMock from '../../../config/mock/auth.config.mock';
|
||||
import customizationConfigMock from '../../../config/mock/customization.config.mock';
|
||||
import externalConfigMock from '../../../config/mock/external-services.config.mock';
|
||||
import noteConfigMock from '../../../config/mock/note.config.mock';
|
||||
import { FrontendConfigModule } from '../../../frontend-config/frontend-config.module';
|
||||
import { LoggerModule } from '../../../logger/logger.module';
|
||||
import { ConfigController } from './config.controller';
|
||||
|
@ -24,6 +25,7 @@ describe('ConfigController', () => {
|
|||
isGlobal: true,
|
||||
load: [
|
||||
appConfigMock,
|
||||
noteConfigMock,
|
||||
authConfigMock,
|
||||
customizationConfigMock,
|
||||
externalConfigMock,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -14,6 +14,7 @@ import {
|
|||
import { AuthToken } from '../../../../auth/auth-token.entity';
|
||||
import { Author } from '../../../../authors/author.entity';
|
||||
import appConfigMock from '../../../../config/mock/app.config.mock';
|
||||
import noteConfigMock from '../../../../config/mock/note.config.mock';
|
||||
import { Group } from '../../../../groups/group.entity';
|
||||
import { HistoryEntry } from '../../../../history/history-entry.entity';
|
||||
import { HistoryModule } from '../../../../history/history.module';
|
||||
|
@ -45,7 +46,7 @@ describe('HistoryController', () => {
|
|||
LoggerModule,
|
||||
ConfigModule.forRoot({
|
||||
isGlobal: true,
|
||||
load: [appConfigMock],
|
||||
load: [appConfigMock, noteConfigMock],
|
||||
}),
|
||||
TypeOrmModule.forRoot(),
|
||||
],
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -13,6 +13,7 @@ import authConfigMock from '../../../config/mock/auth.config.mock';
|
|||
import customizationConfigMock from '../../../config/mock/customization.config.mock';
|
||||
import externalServicesConfigMock from '../../../config/mock/external-services.config.mock';
|
||||
import mediaConfigMock from '../../../config/mock/media.config.mock';
|
||||
import noteConfigMock from '../../../config/mock/note.config.mock';
|
||||
import { Group } from '../../../groups/group.entity';
|
||||
import { Identity } from '../../../identity/identity.entity';
|
||||
import { LoggerModule } from '../../../logger/logger.module';
|
||||
|
@ -44,6 +45,7 @@ describe('MeController', () => {
|
|||
isGlobal: true,
|
||||
load: [
|
||||
appConfigMock,
|
||||
noteConfigMock,
|
||||
authConfigMock,
|
||||
mediaConfigMock,
|
||||
customizationConfigMock,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -14,6 +14,7 @@ import authConfigMock from '../../../config/mock/auth.config.mock';
|
|||
import customizationConfigMock from '../../../config/mock/customization.config.mock';
|
||||
import externalConfigMock from '../../../config/mock/external-services.config.mock';
|
||||
import mediaConfigMock from '../../../config/mock/media.config.mock';
|
||||
import noteConfigMock from '../../../config/mock/note.config.mock';
|
||||
import { Group } from '../../../groups/group.entity';
|
||||
import { Identity } from '../../../identity/identity.entity';
|
||||
import { LoggerModule } from '../../../logger/logger.module';
|
||||
|
@ -45,6 +46,7 @@ describe('MediaController', () => {
|
|||
isGlobal: true,
|
||||
load: [
|
||||
appConfigMock,
|
||||
noteConfigMock,
|
||||
mediaConfigMock,
|
||||
authConfigMock,
|
||||
customizationConfigMock,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -15,6 +15,7 @@ import { AuthToken } from '../../../auth/auth-token.entity';
|
|||
import { Author } from '../../../authors/author.entity';
|
||||
import appConfigMock from '../../../config/mock/app.config.mock';
|
||||
import mediaConfigMock from '../../../config/mock/media.config.mock';
|
||||
import noteConfigMock from '../../../config/mock/note.config.mock';
|
||||
import { Group } from '../../../groups/group.entity';
|
||||
import { GroupsModule } from '../../../groups/groups.module';
|
||||
import { HistoryEntry } from '../../../history/history-entry.entity';
|
||||
|
@ -73,7 +74,7 @@ describe('NotesController', () => {
|
|||
MediaModule,
|
||||
ConfigModule.forRoot({
|
||||
isGlobal: true,
|
||||
load: [appConfigMock, mediaConfigMock],
|
||||
load: [appConfigMock, noteConfigMock, mediaConfigMock],
|
||||
}),
|
||||
TypeOrmModule.forRoot(),
|
||||
],
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -15,6 +15,7 @@ import { AuthToken } from '../../../auth/auth-token.entity';
|
|||
import { Author } from '../../../authors/author.entity';
|
||||
import appConfigMock from '../../../config/mock/app.config.mock';
|
||||
import mediaConfigMock from '../../../config/mock/media.config.mock';
|
||||
import noteConfigMock from '../../../config/mock/note.config.mock';
|
||||
import { Group } from '../../../groups/group.entity';
|
||||
import { GroupsModule } from '../../../groups/groups.module';
|
||||
import { HistoryEntry } from '../../../history/history-entry.entity';
|
||||
|
@ -75,7 +76,7 @@ describe('AliasController', () => {
|
|||
MediaModule,
|
||||
ConfigModule.forRoot({
|
||||
isGlobal: true,
|
||||
load: [appConfigMock, mediaConfigMock],
|
||||
load: [appConfigMock, noteConfigMock, mediaConfigMock],
|
||||
}),
|
||||
TypeOrmModule.forRoot(),
|
||||
],
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -15,6 +15,7 @@ import { AuthToken } from '../../../auth/auth-token.entity';
|
|||
import { Author } from '../../../authors/author.entity';
|
||||
import appConfigMock from '../../../config/mock/app.config.mock';
|
||||
import mediaConfigMock from '../../../config/mock/media.config.mock';
|
||||
import noteConfigMock from '../../../config/mock/note.config.mock';
|
||||
import { Group } from '../../../groups/group.entity';
|
||||
import { HistoryEntry } from '../../../history/history-entry.entity';
|
||||
import { HistoryModule } from '../../../history/history.module';
|
||||
|
@ -44,7 +45,7 @@ describe('Me Controller', () => {
|
|||
imports: [
|
||||
ConfigModule.forRoot({
|
||||
isGlobal: true,
|
||||
load: [appConfigMock, mediaConfigMock],
|
||||
load: [appConfigMock, noteConfigMock, mediaConfigMock],
|
||||
}),
|
||||
UsersModule,
|
||||
HistoryModule,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -11,6 +11,7 @@ import { AuthToken } from '../../../auth/auth-token.entity';
|
|||
import { Author } from '../../../authors/author.entity';
|
||||
import appConfigMock from '../../../config/mock/app.config.mock';
|
||||
import mediaConfigMock from '../../../config/mock/media.config.mock';
|
||||
import noteConfigMock from '../../../config/mock/note.config.mock';
|
||||
import { Group } from '../../../groups/group.entity';
|
||||
import { Identity } from '../../../identity/identity.entity';
|
||||
import { LoggerModule } from '../../../logger/logger.module';
|
||||
|
@ -37,7 +38,7 @@ describe('Media Controller', () => {
|
|||
imports: [
|
||||
ConfigModule.forRoot({
|
||||
isGlobal: true,
|
||||
load: [appConfigMock, mediaConfigMock],
|
||||
load: [appConfigMock, noteConfigMock, mediaConfigMock],
|
||||
}),
|
||||
LoggerModule,
|
||||
MediaModule,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
|
||||
* SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
@ -15,6 +15,7 @@ import { AuthToken } from '../../../auth/auth-token.entity';
|
|||
import { Author } from '../../../authors/author.entity';
|
||||
import appConfigMock from '../../../config/mock/app.config.mock';
|
||||
import mediaConfigMock from '../../../config/mock/media.config.mock';
|
||||
import noteConfigMock from '../../../config/mock/note.config.mock';
|
||||
import { Group } from '../../../groups/group.entity';
|
||||
import { GroupsModule } from '../../../groups/groups.module';
|
||||
import { HistoryEntry } from '../../../history/history-entry.entity';
|
||||
|
@ -73,7 +74,7 @@ describe('Notes Controller', () => {
|
|||
MediaModule,
|
||||
ConfigModule.forRoot({
|
||||
isGlobal: true,
|
||||
load: [appConfigMock, mediaConfigMock],
|
||||
load: [appConfigMock, noteConfigMock, mediaConfigMock],
|
||||
}),
|
||||
TypeOrmModule.forRoot(),
|
||||
],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue