diff --git a/server-ce/config/settings.js b/server-ce/config/settings.js index d5aad069fd..36224f0750 100644 --- a/server-ce/config/settings.js +++ b/server-ce/config/settings.js @@ -288,7 +288,6 @@ const settings = { compileTimeout: parseIntOrFail(process.env.COMPILE_TIMEOUT || 180), compileGroup: 'standard', trackChanges: true, - templates: true, references: true, }, } diff --git a/services/web/app/src/models/User.js b/services/web/app/src/models/User.js index 503abf7fc5..12f9e6d675 100644 --- a/services/web/app/src/models/User.js +++ b/services/web/app/src/models/User.js @@ -107,7 +107,6 @@ const UserSchema = new Schema( type: String, default: Settings.defaultFeatures.compileGroup, }, - templates: { type: Boolean, default: Settings.defaultFeatures.templates }, references: { type: Boolean, default: Settings.defaultFeatures.references, diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js index e1566dfe6f..f685ea2328 100644 --- a/services/web/config/settings.defaults.js +++ b/services/web/config/settings.defaults.js @@ -383,7 +383,6 @@ module.exports = { compileTimeout: 180, compileGroup: 'standard', references: true, - templates: true, trackChanges: true, }), diff --git a/services/web/migrations/20240618125145_cleanup_user_features_templates.js b/services/web/migrations/20240618125145_cleanup_user_features_templates.js new file mode 100644 index 0000000000..728f3040dd --- /dev/null +++ b/services/web/migrations/20240618125145_cleanup_user_features_templates.js @@ -0,0 +1,12 @@ +const { batchedUpdate } = require('../scripts/helpers/batchedUpdate') +exports.tags = ['server-ce', 'server-pro', 'saas'] + +exports.migrate = async () => { + await batchedUpdate( + 'users', + { 'features.templates': { $exists: true } }, + { $unset: { 'features.templates': true } } + ) +} + +exports.rollback = async () => {} diff --git a/services/web/modules/server-ce-scripts/test/acceptance/src/ServerCEScriptsTests.js b/services/web/modules/server-ce-scripts/test/acceptance/src/ServerCEScriptsTests.js index a12ed31704..01641d8929 100644 --- a/services/web/modules/server-ce-scripts/test/acceptance/src/ServerCEScriptsTests.js +++ b/services/web/modules/server-ce-scripts/test/acceptance/src/ServerCEScriptsTests.js @@ -386,7 +386,6 @@ describe('ServerCEScripts', function () { compileTimeout: 180, compileGroup: 'standard', references: true, - templates: true, trackChanges: true, } diff --git a/services/web/test/acceptance/config/settings.test.defaults.js b/services/web/test/acceptance/config/settings.test.defaults.js index 9cd99e3950..15cafd7c7f 100644 --- a/services/web/test/acceptance/config/settings.test.defaults.js +++ b/services/web/test/acceptance/config/settings.test.defaults.js @@ -105,7 +105,6 @@ module.exports = { versioning: false, github: true, gitBridge: true, - templates: false, references: false, referencesSearch: false, mendeley: true, @@ -121,7 +120,6 @@ module.exports = { versioning: false, github: false, gitBridge: false, - templates: false, references: false, referencesSearch: false, mendeley: false, @@ -137,7 +135,6 @@ module.exports = { versioning: true, github: true, gitBridge: true, - templates: true, references: true, referencesSearch: true, mendeley: true, @@ -153,7 +150,6 @@ module.exports = { versioning: true, github: true, gitBridge: true, - templates: true, references: true, referencesSearch: true, mendeley: true, diff --git a/services/web/test/acceptance/src/ProjectFeaturesTests.js b/services/web/test/acceptance/src/ProjectFeaturesTests.js index af066b4c52..7d2f836ae3 100644 --- a/services/web/test/acceptance/src/ProjectFeaturesTests.js +++ b/services/web/test/acceptance/src/ProjectFeaturesTests.js @@ -64,7 +64,6 @@ describe('ProjectFeatures', function () { (error, response, body) => { expect(body.project.features.compileGroup).to.equal('priority') expect(body.project.features.versioning).to.equal(true) - expect(body.project.features.templates).to.equal(true) expect(body.project.features.dropbox).to.equal(true) return done() } @@ -87,7 +86,6 @@ describe('ProjectFeatures', function () { (error, response, body) => { expect(body.project.features.compileGroup).to.equal('standard') expect(body.project.features.versioning).to.equal(false) - expect(body.project.features.templates).to.equal(false) expect(body.project.features.dropbox).to.equal(false) return done() } diff --git a/services/web/test/acceptance/src/helpers/User.js b/services/web/test/acceptance/src/helpers/User.js index 42ceeaf188..f4d0cd0b8d 100644 --- a/services/web/test/acceptance/src/helpers/User.js +++ b/services/web/test/acceptance/src/helpers/User.js @@ -543,7 +543,6 @@ class User { dropbox: true, compileTimeout: 60, compileGroup: 'priority', - templates: true, references: true, trackChanges: true, trackChangesVisible: true, @@ -558,7 +557,6 @@ class User { dropbox: false, compileTimeout: 60, compileGroup: 'standard', - templates: false, references: false, trackChanges: false, trackChangesVisible: false,