Merge pull request #1341 from bbc/upstream/tidying

chore: some minor changes

Author: jstarpl

meteor/__mocks__/meteor.ts

@@ -195,9 +195,6 @@ export namespace MeteorMock {
 		// but it'll do for now:
 		return callAsync(methodName, ...args)
 	}
-	export function absoluteUrl(path?: string): string {
-		return path + '' // todo
-	}
 	export function setTimeout(fcn: () => void | Promise<void>, time: number): number {
 		return $.setTimeout(() => {
 			Promise.resolve()

meteor/server/migration/X_X_X.ts

@@ -199,43 +199,6 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 		},
 	},
 
-	{
-		id: `add studio settings allowHold & allowPieceDirectPlay`,
-		canBeRunAutomatically: true,
-		validate: async () => {
-			const studios = await Studios.findFetchAsync({
-				$or: [
-					{ 'settings.allowHold': { $exists: false } },
-					{ 'settings.allowPieceDirectPlay': { $exists: false } },
-				],
-			})
-
-			if (studios.length > 0) {
-				return 'studios must have settings.allowHold and settings.allowPieceDirectPlay defined'
-			}
-
-			return false
-		},
-		migrate: async () => {
-			const studios = await Studios.findFetchAsync({
-				$or: [
-					{ 'settings.allowHold': { $exists: false } },
-					{ 'settings.allowPieceDirectPlay': { $exists: false } },
-				],
-			})
-
-			for (const studio of studios) {
-				// Populate the settings to be backwards compatible
-				await Studios.updateAsync(studio._id, {
-					$set: {
-						'settings.allowHold': true,
-						'settings.allowPieceDirectPlay': true,
-					},
-				})
-			}
-		},
-	},
-
 	{
 		id: 'TriggeredActions.remove old systemwide',
 		canBeRunAutomatically: true,
@@ -353,6 +316,66 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 		},
 	},
 
+	{
+		id: 'Ensure CoreSystem.settingsWithOverrides is valid',
+		dependOnResultFrom: `convert CoreSystem.settingsWithOverrides`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const systems = await CoreSystem.findFetchAsync({
+				$or: [
+					{
+						'settingsWithOverrides.defaults': { $exists: false },
+					},
+					{
+						'settingsWithOverrides.overrides': { $exists: false },
+					},
+				],
+			})
+
+			if (systems.length > 0) {
+				return 'settings must be converted to an ObjectWithOverrides'
+			}
+
+			return false
+		},
+		migrate: async () => {
+			const systems = await CoreSystem.findFetchAsync({
+				$or: [
+					{
+						'settingsWithOverrides.defaults': { $exists: false },
+					},
+					{
+						'settingsWithOverrides.overrides': { $exists: false },
+					},
+				],
+			})
+
+			for (const system of systems) {
+				const newSettings = wrapDefaultObject<ICoreSystemSettings>({
+					cron: {
+						casparCGRestart: {
+							enabled: false,
+						},
+						storeRundownSnapshots: {
+							enabled: false,
+						},
+					},
+					support: { message: '' },
+					evaluationsMessage: { enabled: false, heading: '', message: '' },
+				})
+
+				await CoreSystem.updateAsync(system._id, {
+					$set: {
+						settingsWithOverrides: {
+							...newSettings,
+							...system.settingsWithOverrides,
+						},
+					},
+				})
+			}
+		},
+	},
+
 	{
 		id: `studios create peripheralDeviceSettings.deviceSettings`,
 		canBeRunAutomatically: true,

packages/webui/src/client/lib/uncaughtErrorHandler.ts

@@ -47,6 +47,9 @@ function uncaughtErrorHandler(errorObj: any, context: string) {
 		stringContent += stringifyError(errorObj)
 	}
 
+	// Ignore any react deprecation warnings, as they add a lot of noise
+	if (stringContent.includes('will be removed in the next major release')) return
+
 	const caughtErrorStack = new Error('')
 	if (caughtErrorStack.stack) {
 		stringContent += `\nCaught stack: ${caughtErrorStack.stack}`

packages/webui/src/meteor/meteor.js

@@ -234,78 +234,6 @@ Meteor.Error.prototype.clone = function () {
 	return new Meteor.Error(self.error, self.reason, self.details)
 }
 
-/**
- * @summary Generate an absolute URL pointing to the application. The server reads from the `ROOT_URL` environment variable to determine where it is running. This is taken care of automatically for apps deployed to Galaxy, but must be provided when using `meteor build`.
- * @locus Anywhere
- * @param {String} [path] A path to append to the root URL. Do not include a leading "`/`".
- * @param {Object} [options]
- * @param {Boolean} options.secure Create an HTTPS URL.
- * @param {Boolean} options.replaceLocalhost Replace localhost with 127.0.0.1. Useful for services that don't recognize localhost as a domain name.
- * @param {String} options.rootUrl Override the default ROOT_URL from the server environment. For example: "`http://foo.example.com`"
- */
-Meteor.absoluteUrl = function (path, options) {
-	// path is optional
-	if (!options && typeof path === 'object') {
-		options = path
-		path = undefined
-	}
-	// merge options with defaults
-	options = Object.assign({}, Meteor.absoluteUrl.defaultOptions, options || {})
-
-	var url = options.rootUrl
-	if (!url) throw new Error('Must pass options.rootUrl or set ROOT_URL in the server environment')
-
-	if (!/^http[s]?:\/\//i.test(url))
-		// url starts with 'http://' or 'https://'
-		url = 'http://' + url // we will later fix to https if options.secure is set
-
-	if (!url.endsWith('/')) {
-		url += '/'
-	}
-
-	if (path) {
-		// join url and path with a / separator
-		while (path.startsWith('/')) {
-			path = path.slice(1)
-		}
-		url += path
-	}
-
-	// turn http to https if secure option is set, and we're not talking
-	// to localhost.
-	if (
-		options.secure &&
-		/^http:/.test(url) && // url starts with 'http:'
-		!/http:\/\/localhost[:\/]/.test(url) && // doesn't match localhost
-		!/http:\/\/127\.0\.0\.1[:\/]/.test(url)
-	)
-		// or 127.0.0.1
-		url = url.replace(/^http:/, 'https:')
-
-	if (options.replaceLocalhost) url = url.replace(/^http:\/\/localhost([:\/].*)/, 'http://127.0.0.1$1')
-
-	return url
-}
-
-// allow later packages to override default options
-var defaultOptions = (Meteor.absoluteUrl.defaultOptions = {})
-
-// available only in a browser environment
-var location = typeof window === 'object' && window.location
-
-if (typeof window.__meteor_runtime_config__ === 'object' && window.__meteor_runtime_config__.ROOT_URL) {
-	defaultOptions.rootUrl = window.__meteor_runtime_config__.ROOT_URL
-} else if (location && location.protocol && location.host) {
-	defaultOptions.rootUrl = location.protocol + '//' + location.host
-}
-
-// Make absolute URLs use HTTPS by default if the current window.location
-// uses HTTPS. Since this is just a default, it can be overridden by
-// passing { secure: false } if necessary.
-if (location && location.protocol === 'https:') {
-	defaultOptions.secure = true
-}
-
 Meteor._relativeToSiteRootUrl = function (link) {
 	if (typeof window.__meteor_runtime_config__ === 'object' && link.substr(0, 1) === '/')
 		link = (window.__meteor_runtime_config__.ROOT_URL_PATH_PREFIX || '') + link

packages/webui/src/meteor/socket-stream-client/urls.js

@@ -12,10 +12,6 @@ function translateUrl(url, newSchemeBase, subPath) {
     newSchemeBase = 'http';
   }
 
-  if (subPath !== "sockjs" && url.startsWith("/")) {
-    url = Meteor.absoluteUrl(url.substr(1));
-  }
-
   var ddpUrlMatch = url.match(/^ddp(i?)\+sockjs:\/\//);
   var httpUrlMatch = url.match(/^http(s?):\/\//);
   var newScheme;