Move Validator to common module (#2651)

src/common/Validator.test.js

@@ -5,7 +5,7 @@
 
 import * as Validator from './Validator';
 
-describe('main/Validator', () => {
+describe('common/Validator', () => {
     describe('validateV0ConfigData', () => {
         const config = {url: 'http://server-1.com'};
 

src/common/config/index.test.js

@@ -19,7 +19,7 @@ jest.mock('electron', () => ({
     },
 }));
 
-jest.mock('main/Validator', () => ({
+jest.mock('common/Validator', () => ({
     validateV0ConfigData: (configData) => (configData.version === 0 ? configData : null),
     validateV1ConfigData: (configData) => (configData.version === 1 ? configData : null),
     validateV2ConfigData: (configData) => (configData.version === 2 ? configData : null),

src/common/config/index.ts

@@ -21,12 +21,13 @@ import {
 } from 'types/config';
 
 import {UPDATE_TEAMS, GET_CONFIGURATION, UPDATE_CONFIGURATION, GET_LOCAL_CONFIGURATION, UPDATE_PATHS} from 'common/communication';
+import * as Validator from 'common/Validator';
 
-import {configPath} from 'main/constants';
-import * as Validator from 'main/Validator';
 import {getDefaultTeamWithTabsFromTeam} from 'common/tabs/TabView';
 import Utils from 'common/utils/util';
 
+import {configPath} from 'main/constants';
+
 import defaultPreferences, {getDefaultDownloadLocation} from './defaultPreferences';
 import upgradeConfigData from './upgradePreferences';
 import buildConfig from './buildConfig';

src/main/AppVersionManager.test.js

@@ -3,7 +3,7 @@
 
 import fs from 'fs';
 
-import * as Validator from 'main/Validator';
+import * as Validator from 'common/Validator';
 
 import {AppVersionManager} from './AppVersionManager';
 
@@ -18,7 +18,7 @@ jest.mock('fs', () => ({
     writeFile: jest.fn(),
 }));
 
-jest.mock('main/Validator', () => ({
+jest.mock('common/Validator', () => ({
     validateAppState: jest.fn(),
 }));
 

src/main/AppVersionManager.ts

@@ -8,11 +8,10 @@ import {AppState} from 'types/appState';
 
 import {UPDATE_PATHS} from 'common/communication';
 import JsonFileManager from 'common/JsonFileManager';
+import * as Validator from 'common/Validator';
 
 import {appVersionJson} from 'main/constants';
 
-import * as Validator from './Validator';
-
 export class AppVersionManager extends JsonFileManager<AppState> {
     constructor(file: string) {
         super(file);

src/main/ParseArgs.ts

@@ -7,7 +7,7 @@ import yargs from 'yargs';
 
 import {protocols} from '../../electron-builder.json';
 
-import * as Validator from './Validator';
+import * as Validator from 'common/Validator';
 
 export default function parse(args: string[]) {
     return validateArgs(parseArgs(triageArgs(args)));

src/main/allowProtocolDialog.test.js

@@ -38,7 +38,7 @@ jest.mock('common/config/buildConfig', () => ({
     ],
 }));
 
-jest.mock('./Validator', () => ({
+jest.mock('common/Validator', () => ({
     validateAllowedProtocols: (protocols) => protocols,
 }));
 

src/main/allowProtocolDialog.ts

@@ -11,8 +11,8 @@ import log from 'electron-log';
 import {localizeMessage} from 'main/i18nManager';
 
 import buildConfig from 'common/config/buildConfig';
+import * as Validator from 'common/Validator';
 
-import * as Validator from './Validator';
 import WindowManager from './windows/windowManager';
 import {allowedProtocolFile} from './constants';
 

src/main/certificateStore.test.js

@@ -4,7 +4,7 @@
 
 import fs from 'fs';
 
-import {validateCertificateStore} from './Validator';
+import {validateCertificateStore} from 'common/Validator';
 
 import {CertificateStore} from './certificateStore';
 
@@ -21,7 +21,7 @@ jest.mock('electron', () => ({
     },
 }));
 
-jest.mock('./Validator', () => ({
+jest.mock('common/Validator', () => ({
     validateCertificateStore: jest.fn(),
 }));
 

src/main/certificateStore.ts

@@ -12,8 +12,8 @@ import {ComparableCertificate} from 'types/certificate';
 
 import {UPDATE_PATHS} from 'common/communication';
 import urlUtils from 'common/utils/url';
+import * as Validator from 'common/Validator';
 
-import * as Validator from './Validator';
 import {certificateStorePath} from './constants';
 
 function comparableCertificate(certificate: Certificate, dontTrust = false): ComparableCertificate {

src/main/diagnostics/steps/step2.configValidation.ts

@@ -6,7 +6,7 @@ import {ElectronLog} from 'electron-log';
 import {DiagnosticStepResponse} from 'types/diagnostics';
 
 import Config from 'common/config';
-import * as Validator from 'main/Validator';
+import * as Validator from 'common/Validator';
 
 import DiagnosticsStep from '../DiagnosticStep';
 

src/main/downloadsManager.ts

@@ -28,6 +28,7 @@ import Config from 'common/config';
 import JsonFileManager from 'common/JsonFileManager';
 import {APP_UPDATE_KEY, UPDATE_DOWNLOAD_ITEM} from 'common/constants';
 import {DOWNLOADS_DROPDOWN_AUTOCLOSE_TIMEOUT, DOWNLOADS_DROPDOWN_MAX_ITEMS} from 'common/utils/constants';
+import * as Validator from 'common/Validator';
 import {localizeMessage} from 'main/i18nManager';
 import {displayDownloadCompleted} from 'main/notifications';
 import WindowManager from 'main/windows/windowManager';
@@ -35,7 +36,6 @@ import {doubleSecToMs, getPercentage, isStringWithLength, readFilenameFromConten
 
 import appVersionManager from './AppVersionManager';
 import {downloadsJson} from './constants';
-import * as Validator from './Validator';
 
 export enum DownloadItemTypeEnum {
     FILE = 'file',

src/main/trustedOrigins.ts

@@ -12,8 +12,8 @@ import {TrustedOrigin, PermissionType} from 'types/trustedOrigin';
 
 import {UPDATE_PATHS} from 'common/communication';
 import urlUtils from 'common/utils/url';
+import * as Validator from 'common/Validator';
 
-import * as Validator from './Validator';
 import {trustedOriginsStoreFile} from './constants';
 
 export class TrustedOriginsStore {

src/main/windows/mainWindow.test.js

@@ -12,7 +12,7 @@ import Config from 'common/config';
 import {DEFAULT_WINDOW_HEIGHT, DEFAULT_WINDOW_WIDTH} from 'common/utils/constants';
 
 import ContextMenu from '../contextMenu';
-import * as Validator from '../Validator';
+import * as Validator from 'common/Validator';
 
 import createMainWindow from './mainWindow';
 
@@ -58,7 +58,7 @@ jest.mock('fs', () => ({
     writeFileSync: jest.fn(),
 }));
 
-jest.mock('../Validator', () => ({
+jest.mock('common/Validator', () => ({
     validateBoundsInfo: jest.fn(),
 }));
 

src/main/windows/mainWindow.ts

@@ -14,11 +14,11 @@ import {SELECT_NEXT_TAB, SELECT_PREVIOUS_TAB, GET_FULL_SCREEN_STATUS} from 'comm
 import Config from 'common/config';
 import {DEFAULT_WINDOW_HEIGHT, DEFAULT_WINDOW_WIDTH, MINIMUM_WINDOW_HEIGHT, MINIMUM_WINDOW_WIDTH} from 'common/utils/constants';
 import Utils from 'common/utils/util';
+import * as Validator from 'common/Validator';
 
 import {boundsInfoPath} from 'main/constants';
 import {localizeMessage} from 'main/i18nManager';
 
-import * as Validator from '../Validator';
 import ContextMenu from '../contextMenu';
 import {getLocalPreload, getLocalURLString} from '../utils';