Merge branch 'voip-branch-test' into livechat-voip/contexts-providers

MartinSchoeler · web-flow · commit 64ff04f027c9 · 2021-11-26T12:24:17.000-03:00
diff --git a/app/api/server/v1/voip/server-config.ts b/app/api/server/v1/voip/server-config.ts
@@ -67,7 +67,9 @@ API.v1.addRoute('voipServerConfig.callServer', { authRequired: true }, {
 
 		return API.v1.success({ ...config });
 	},
+  
 	// NOTE: you can use this POST endpoint for both create and update operation
+  
 	async post() {
 		check(this.bodyParams, Match.ObjectIncluding({
 			host: String,
diff --git a/client/components/voip/Callstate.ts b/client/components/voip/Callstate.ts
@@ -12,4 +12,4 @@ export type CallState =
 	| 'IN_CALL'
 	| 'UNREGISTERED'
 	| 'SERVER_DISCONNECTED'
-	| 'ERROR';
+	| 'ERROR';
diff --git a/client/views/voip/VoIPLayout.tsx b/client/views/voip/VoIPLayout.tsx
@@ -104,6 +104,7 @@ const VoIPLayout: FC<{
 	return (
 		<Box width='70%' m='auto'>
 			<FieldGroup>
+
 				{enableVideo ? (
 					<video
 						id='remote_media'
diff --git a/client/views/voip/index.ts b/client/views/voip/index.ts
@@ -0,0 +1 @@
+export { registerVoIPRoutes } from './routes';
diff --git a/client/views/voip/routes.ts b/client/views/voip/routes.ts
@@ -1,4 +1,3 @@
 import { createRouteGroup } from '../../lib/createRouteGroup';
 
-console.log('asd');
 export const registerVoIPRoutes = createRouteGroup('voip', '/voip', () => import('./VoIPRouter'));
diff --git a/definition/IVoipExtension.ts b/definition/IVoipExtension.ts
@@ -17,7 +17,6 @@ export interface IVoipExtensionConfig extends IVoipExtensionBase{
 	password: string;
 }
 
-
 export const isIVoipExtensionConfig = (obj: any): obj is IVoipExtensionConfig => obj.name !== undefined && obj.state !== undefined && obj.authType !== undefined && obj.password !== undefined;
 
 export interface IQueueMembershipDetails {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { registerVoIPRoutes } from './routes';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`import { createRouteGroup } from '../../lib/createRouteGroup';`
`2`	`2`
`3`		`-console.log('asd');`
`4`	`3`	`export const registerVoIPRoutes = createRouteGroup('voip', '/voip', () => import('./VoIPRouter'));`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ export interface IVoipExtensionConfig extends IVoipExtensionBase{`
`17`	`17`	`password: string;`
`18`	`18`	`}`
`19`	`19`
`20`		`-`
`21`	`20`	`export const isIVoipExtensionConfig = (obj: any): obj is IVoipExtensionConfig => obj.name !== undefined && obj.state !== undefined && obj.authType !== undefined && obj.password !== undefined;`
`22`	`21`
`23`	`22`	`export interface IQueueMembershipDetails {`