Эх сурвалжийг харах

Merge pull request #18970 from overleaf/msm-clean-features-templates

[web] Cleanup `features.templates`

GitOrigin-RevId: 7c9f7bc827700e4255a5ba8a46de70318afdaae4
Miguel Serrano 2 жил өмнө
parent
commit
1697087425

+ 0 - 1
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,
   },
 }

+ 0 - 1
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,

+ 0 - 1
services/web/config/settings.defaults.js

@@ -383,7 +383,6 @@ module.exports = {
     compileTimeout: 180,
     compileGroup: 'standard',
     references: true,
-    templates: true,
     trackChanges: true,
   }),
 

+ 12 - 0
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 () => {}

+ 0 - 1
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,
     }
 

+ 0 - 4
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,

+ 0 - 2
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()
           }

+ 0 - 2
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,