chore: exported interfaces

cypress/e2e/videoconference.cy.ts

@@ -6,7 +6,7 @@ import {
 	mockWebSocket,
 	startWebSocketServer
 } from '../support/websocket';
-import { AppointmentsDataInterface } from '../../src/globalState/interfaces/AppointmentsDataInterface';
+import { AppointmentsDataInterface } from '../../src/globalState/interfaces';
 
 class FakeJitsiMeetExternalAPI {
 	private _handler: {

cypress/support/commands.ts

@@ -6,7 +6,7 @@ import './commands/mockApi';
 import './commands/socket';
 
 import { LoginArgs } from './commands/login';
-import { AppointmentsDataInterface } from '../../src/globalState/interfaces/AppointmentsDataInterface';
+import { AppointmentsDataInterface } from '../../src/globalState/interfaces';
 
 declare global {
 	namespace Cypress {

cypress/support/commands/appointments.ts

@@ -1,6 +1,6 @@
 import { v4 as uuid } from 'uuid';
 import { deepMerge } from '../helpers';
-import { AppointmentsDataInterface } from '../../../src/globalState/interfaces/AppointmentsDataInterface';
+import { AppointmentsDataInterface } from '../../../src/globalState/interfaces';
 
 export let appointments: AppointmentsDataInterface[] = [];
 
@@ -31,7 +31,7 @@ export const updateAppointment = (
 Cypress.Commands.add(
 	'appointments',
 	(props?: { [key: string]: any }, index?: number) =>
-		new Promise((resolve) => {
+		new Cypress.Promise((resolve) => {
 			let appointment = undefined;
 			if (!props) {
 				setAppointments([]);

cypress/support/commands/askerSessions.ts

@@ -20,7 +20,7 @@ export const updateAskerSession = (
 Cypress.Commands.add(
 	'askerSession',
 	(props: { [key: string]: any } = {}, index?: number) =>
-		new Promise((resolve) => {
+		new Cypress.Promise((resolve) => {
 			updateAskerSession(props, index);
 			resolve(undefined);
 		})

cypress/support/commands/consultantSessions.ts

@@ -26,7 +26,7 @@ export const updateConsultantSession = (
 Cypress.Commands.add(
 	'consultantSession',
 	(props: { [key: string]: any } = {}, index?: number) =>
-		new Promise((resolve) => {
+		new Cypress.Promise((resolve) => {
 			updateConsultantSession(props, index);
 			resolve(undefined);
 		})

cypress/support/commands/login.ts

@@ -1,4 +1,4 @@
-import { UserDataInterface } from '../../../src/globalState';
+import { UserDataInterface } from '../../../src/globalState/interfaces';
 import { CyHttpMessages, RouteHandler } from 'cypress/types/net-stubbing';
 
 export const USER_ASKER = 'asker';

cypress/support/commands/messages.ts

@@ -35,7 +35,7 @@ export const addMessage = (
 Cypress.Commands.add(
 	'addMessage',
 	(props: { [key: string]: any } = {}, index?: number) =>
-		new Promise((resolve) => {
+		new Cypress.Promise((resolve) => {
 			addMessage(props, index);
 			resolve(undefined);
 		})

cypress/support/index.d.ts

@@ -0,0 +1,45 @@
+/// <reference types="cypress" />
+
+import { LoginArgs } from './commands/login';
+import { AppointmentsDataInterface } from '../../src/globalState/interfaces';
+import * as Bluebird from 'cypress/types/bluebird';
+
+declare global {
+	namespace Cypress {
+		interface Chainable {
+			login(args?: LoginArgs): Chainable<Element>;
+
+			fastLogin(args?: LoginArgs): Chainable<Element>;
+
+			appointments(
+				args?: Partial<AppointmentsDataInterface>,
+				index?: number
+			): Bluebird<unknown>;
+
+			askerSession(
+				args?: { [key: string]: any },
+				index?: number
+			): Bluebird<unknown>;
+
+			consultantSession(
+				args?: { [key: string]: any },
+				index?: number
+			): Bluebird<unknown>;
+
+			addMessage(
+				props?: { [key: string]: any },
+				index?: number
+			): Bluebird<unknown>;
+
+			mockApi(): Chainable<Element>;
+
+			willReturn(name: string, data: any): Chainable<Element>;
+
+			emitDirectMessage(index?: number): Chainable<Element>;
+
+			emitVideoCallRequest(): Chainable<Element>;
+
+			waitForSubscriptions(events: string[]): Chainable<Element>;
+		}
+	}
+}

cypress/support/sessions.ts

@@ -1,6 +1,6 @@
 import { v4 as uuid } from 'uuid';
 import { SESSION_LIST_TYPES } from '../../src/components/session/sessionHelpers';
-import { SessionUserDataInterface } from '../../src/globalState';
+import { SessionUserDataInterface } from '../../src/globalState/interfaces';
 
 export const generateConsultantSession = ({
 	type,

package.json

@@ -174,8 +174,8 @@
 		"dev": "node scripts/start.js",
 		"dev:server": "nodemon",
 		"build": "node scripts/build.js",
-		"test": "cross-env BROWSER=none REACT_APP_API_URL=http://127.0.0.1:9001 HTTPS=0 PORT=9001 WDS_SOCKET_PORT=9001 concurrently --kill-others --success first \"npm run dev\" \"wait-on http://127.0.0.1:9001 && cypress run\"",
-		"test:build": "cross-env BROWSER=none PORT=9001 CYPRESS_WS_URL=http://127.0.0.1:9002 REACT_APP_API_URL=http://127.0.0.1:9001 concurrently --kill-others --success first \"npm run start\" \"wait-on http://127.0.0.1:9001 && cypress run\"",
+		"test": "cross-env FAST_REFRESH=false BROWSER=none REACT_APP_API_URL=http://127.0.0.1:9001 HTTPS=0 PORT=9001 WDS_SOCKET_PORT=9001 concurrently --kill-others --success first \"npm run dev\" \"wait-on http://127.0.0.1:9001 && cypress run\"",
+		"test:build": "cross-env FAST_REFRESH=false BROWSER=none PORT=9001 CYPRESS_WS_URL=http://127.0.0.1:9002 REACT_APP_API_URL=http://127.0.0.1:9001 concurrently --kill-others --success first \"npm run start\" \"wait-on http://127.0.0.1:9001 && cypress run\"",
 		"release": "standard-version",
 		"lint": "npm run lint:scripts && npm run lint:style",
 		"lint:scripts": "eslint src && tsc",

src/api/apiAgencyLanguages.ts

@@ -1,7 +1,7 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_SUCCESS } from './fetchData';
 
-import { AgencyLanguagesInterface } from '../globalState';
+import { AgencyLanguagesInterface } from '../globalState/interfaces';
 
 export const apiAgencyLanguages = async (
 	agencyId: number,

src/api/apiAgencySelection.ts

@@ -1,7 +1,7 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './fetchData';
 import { VALID_POSTCODE_LENGTH } from '../components/agencySelection/agencySelectionHelpers';
-import { AgencyDataInterface } from '../globalState';
+import { AgencyDataInterface } from '../globalState/interfaces';
 
 export const apiAgencySelection = async (
 	params: {

src/api/apiFrontendSettings.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS } from './fetchData';
-import { AppConfigInterface } from '../globalState';
+import { AppConfigInterface } from '../globalState/interfaces';
 
 export const apiFrontendSettings = async (): Promise<AppConfigInterface> =>
 	fetchData({

src/api/apiGetAgencyId.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './fetchData';
-import { AgencyDataInterface } from '../globalState';
+import { AgencyDataInterface } from '../globalState/interfaces';
 
 export const apiGetAgencyById = async (
 	agencyId: any

src/api/apiGetAppointmentsServiceBookingEventsByUserId.ts

@@ -1,4 +1,4 @@
-import { BookingEventsInterface } from '../globalState/interfaces/BookingsInterface';
+import { BookingEventsInterface } from '../globalState/interfaces';
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS } from './fetchData';
 

src/api/apiGetChatRoomById.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './fetchData';
-import { ListItemInterface } from '../globalState';
+import { ListItemInterface } from '../globalState/interfaces';
 
 export const apiGetChatRoomById = async (
 	chatId: number,

src/api/apiGetConsultant.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './fetchData';
-import { ConsultantDataInterface } from '../globalState';
+import { ConsultantDataInterface } from '../globalState/interfaces';
 import { apiGetConsultingType } from './apiGetConsultingType';
 import { apiGetConsultingTypes } from './apiGetConsultingTypes';
 

src/api/apiGetConsultantAppointments.ts

@@ -1,4 +1,4 @@
-import { BookingEventsInterface } from '../globalState/interfaces/BookingsInterface';
+import { BookingEventsInterface } from '../globalState/interfaces';
 import { endpoints } from '../resources/scripts/endpoints';
 import { BookingsStatus } from '../utils/consultant';
 import { fetchData, FETCH_METHODS } from './fetchData';

src/api/apiGetConsultantSessionList.ts

@@ -4,7 +4,7 @@ import {
 	SESSION_LIST_TAB_ARCHIVE,
 	SESSION_LIST_TYPES
 } from '../components/session/sessionHelpers';
-import { ListItemsResponseInterface } from '../globalState';
+import { ListItemsResponseInterface } from '../globalState/interfaces';
 import { FETCH_ERRORS, FETCH_METHODS, fetchData } from './fetchData';
 
 export const INITIAL_FILTER: string = 'all';

src/api/apiGetConsultingType.ts

@@ -1,4 +1,4 @@
-import { ConsultingTypeInterface } from '../globalState';
+import { ConsultingTypeInterface } from '../globalState/interfaces';
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_ERRORS, FETCH_METHODS } from './fetchData';
 

src/api/apiGetConsultingTypes.ts

@@ -1,4 +1,4 @@
-import { ConsultingTypeBasicInterface } from '../globalState';
+import { ConsultingTypeBasicInterface } from '../globalState/interfaces';
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS } from './fetchData';
 

src/api/apiGetSessionRooms.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './fetchData';
-import { ListItemInterface } from '../globalState';
+import { ListItemInterface } from '../globalState/interfaces';
 
 export const apiGetSessionRoomsByGroupIds = async (
 	rcGroupIds: string[],

src/api/apiGetTenantTheming.ts

@@ -1,6 +1,6 @@
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './fetchData';
 import { endpoints } from '../resources/scripts/endpoints';
-import { TenantDataInterface } from '../globalState/interfaces/TenantDataInterface';
+import { TenantDataInterface } from '../globalState/interfaces';
 
 export const apiGetTenantTheming = async (): Promise<TenantDataInterface> => {
 	return fetchData({

src/api/apiGetTools.ts

@@ -1,4 +1,4 @@
-import { APIToolsInterface } from '../globalState/interfaces/ToolsInterface';
+import { APIToolsInterface } from '../globalState/interfaces';
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_ERRORS, FETCH_METHODS } from './fetchData';
 

src/api/apiGetTopicId.ts

@@ -1,4 +1,4 @@
-import { TopicsDataInterface } from '../globalState/interfaces/TopicsDataInterface';
+import { TopicsDataInterface } from '../globalState/interfaces';
 import { apiGetTopicsData } from './apiGetTopicsData';
 
 export const apiGetTopicById = async (

src/api/apiGetTopicsData.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_ERRORS, FETCH_METHODS } from './fetchData';
-import { TopicsDataInterface } from '../globalState/interfaces/TopicsDataInterface';
+import { TopicsDataInterface } from '../globalState/interfaces';
 
 export const apiGetTopicsData = async (): Promise<TopicsDataInterface[]> => {
 	const url = endpoints.topicsData;

src/api/apiGetUserData.ts

@@ -1,5 +1,5 @@
 import { endpoints } from '../resources/scripts/endpoints';
-import { UserDataInterface } from '../globalState';
+import { UserDataInterface } from '../globalState/interfaces';
 import { fetchData, FETCH_METHODS } from './fetchData';
 
 export const apiGetUserData = async (

src/api/apiGetUserDataBySessionId.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './fetchData';
-import { ConsultingSessionDataInterface } from '../globalState';
+import { ConsultingSessionDataInterface } from '../globalState/interfaces';
 
 export const apiGetUserDataBySessionId = async (
 	sessionId: number

src/api/apiPostRegistration.ts

@@ -1,6 +1,6 @@
 import { autoLogin } from '../components/registration/autoLogin';
 import { removeAllCookies } from '../components/sessionCookie/accessSessionCookie';
-import { TenantDataInterface } from '../globalState/interfaces/TenantDataInterface';
+import { TenantDataInterface } from '../globalState/interfaces';
 import { FETCH_ERRORS, FETCH_METHODS, fetchData } from './fetchData';
 import { COOKIE_KEY } from '../globalState';
 

src/api/apiServerSettings.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS } from './fetchData';
-import { ServerAppConfigInterface } from '../globalState';
+import { ServerAppConfigInterface } from '../globalState/interfaces';
 
 export const apiServerSettings = async (): Promise<ServerAppConfigInterface> =>
 	fetchData({

src/api/appointments/deleteAppointment.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './../fetchData';
-import { AppointmentsDataInterface } from '../../globalState/interfaces/AppointmentsDataInterface';
+import { AppointmentsDataInterface } from '../../globalState/interfaces';
 
 export const deleteAppointment = async (
 	appointmentId: string

src/api/appointments/getAppointment.ts

@@ -1,4 +1,4 @@
-import { AppointmentsDataInterface } from '../../globalState/interfaces/AppointmentsDataInterface';
+import { AppointmentsDataInterface } from '../../globalState/interfaces';
 import { endpoints } from '../../resources/scripts/endpoints';
 import { FETCH_ERRORS, FETCH_METHODS, fetchData } from '../fetchData';
 

src/api/appointments/getAppointments.ts

@@ -1,4 +1,4 @@
-import { AppointmentsDataInterface } from '../../globalState/interfaces/AppointmentsDataInterface';
+import { AppointmentsDataInterface } from '../../globalState/interfaces';
 import { endpoints } from '../../resources/scripts/endpoints';
 import { FETCH_ERRORS, FETCH_METHODS, fetchData } from '../fetchData';
 

src/api/appointments/postAppointments.ts

@@ -3,7 +3,7 @@ import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './../fetchData';
 import {
 	AppointmentsDataInterface,
 	STATUS_CREATED
-} from '../../globalState/interfaces/AppointmentsDataInterface';
+} from '../../globalState/interfaces';
 
 export const postAppointments = async (
 	data: Partial<AppointmentsDataInterface>

src/api/appointments/putAppointment.ts

@@ -1,6 +1,6 @@
 import { endpoints } from '../../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './../fetchData';
-import { AppointmentsDataInterface } from '../../globalState/interfaces/AppointmentsDataInterface';
+import { AppointmentsDataInterface } from '../../globalState/interfaces';
 
 export const putAppointment = async (
 	appointmentId: string,

src/api/videocalls/getJwt.ts

@@ -1,4 +1,4 @@
-import { VideoCallJwtDataInterface } from '../../globalState/interfaces/VideoCallDataInterface';
+import { VideoCallJwtDataInterface } from '../../globalState/interfaces';
 import { endpoints } from '../../resources/scripts/endpoints';
 import { FETCH_ERRORS, FETCH_METHODS, fetchData } from '../fetchData';
 

src/components/E2EEncryptionSupportBanner/E2EEncryptionSupportBanner.tsx

@@ -12,9 +12,9 @@ import {
 	ConsultingTypesContext,
 	hasUserAuthority,
 	SessionsDataContext,
-	STATUS_EMPTY,
 	UserDataContext
 } from '../../globalState';
+import { STATUS_EMPTY } from '../../globalState/interfaces';
 import { Link } from 'react-router-dom';
 
 export const E2EEncryptionSupportBanner = () => {

src/components/agencySelection/AgencyInfo.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useEffect, useState } from 'react';
-import { AgencyDataInterface } from '../../globalState';
+import { AgencyDataInterface } from '../../globalState/interfaces';
 import { ReactComponent as InfoIcon } from '../../resources/img/icons/i.svg';
 import { isMobile } from 'react-device-detect';
 import { Text } from '../text/Text';

src/components/agencySelection/AgencySelection.tsx

@@ -1,11 +1,10 @@
 import * as React from 'react';
 import { useEffect, useState } from 'react';
+import { useLocaleData, useTenant } from '../../globalState';
 import {
 	AgencyDataInterface,
-	ConsultingTypeBasicInterface,
-	useLocaleData,
-	useTenant
-} from '../../globalState';
+	ConsultingTypeBasicInterface
+} from '../../globalState/interfaces';
 import { apiAgencySelection, FETCH_ERRORS } from '../../api';
 import { InputField, InputFieldItem } from '../inputField/InputField';
 import { VALID_POSTCODE_LENGTH } from './agencySelectionHelpers';

src/components/app/RouterConfig.tsx

@@ -19,11 +19,8 @@ import { CreateGroupChatView } from '../groupChat/CreateChatView';
 import { GroupChatInfo } from '../groupChat/GroupChatInfo';
 import { Appointments } from '../appointment/Appointments';
 import VideoConference from '../videoConference/VideoConference';
-import {
-	AppConfigInterface,
-	AUTHORITIES,
-	hasUserAuthority
-} from '../../globalState';
+import { AUTHORITIES, hasUserAuthority } from '../../globalState';
+import { AppConfigInterface } from '../../globalState/interfaces';
 
 import { ReactComponent as OverviewIconOutline } from '../../resources/img/icons/overview_outline.svg';
 import { ReactComponent as OverviewIconFilled } from '../../resources/img/icons/overview_filled.svg';