Release v1.9.0

go_event/api/conf/socket.example.json

@@ -25,5 +25,9 @@
 	"crm_socket_url": "${ENTRYPOINT_PIVOT}",
 	"crm_socket_module": {
 		"php_crm": "/api/socket/crm/"
+	},
+	"integration_socket_url": "${ENTRYPOINT_INTEGRATION}",
+	"integration_socket_module": {
+		"php_integration": "/api/socket/integration/"
 	}
 }

go_event/api/conf/socket.go

@@ -12,18 +12,20 @@ import (
 
 // структура конфига
 type SocketConfigStruct struct {
-	CompassSocketUrl       string            `json:"compass_socket_url"`
-	CompassSocketModule    map[string]string `json:"compass_socket_module"`
-	PartnerSocketUrl       string            `json:"partner_socket_url"`
-	PartnerSocketModule    map[string]string `json:"partner_socket_module"`
-	PartnerWebSocketUrl    string            `json:"partner_web_socket_url"`
-	PartnerWebSocketModule map[string]string `json:"partner_web_socket_module"`
-	PivotSocketUrl         string            `json:"pivot_socket_url"`
-	PivotSocketModule      map[string]string `json:"pivot_socket_module"`
-	BillingSocketUrl       string            `json:"billing_socket_url"`
-	BillingSocketModule    map[string]string `json:"billing_socket_module"`
-	CrmSocketUrl           string            `json:"crm_socket_url"`
-	CrmSocketModule        map[string]string `json:"crm_socket_module"`
+	CompassSocketUrl        string            `json:"compass_socket_url"`
+	CompassSocketModule     map[string]string `json:"compass_socket_module"`
+	PartnerSocketUrl        string            `json:"partner_socket_url"`
+	PartnerSocketModule     map[string]string `json:"partner_socket_module"`
+	PartnerWebSocketUrl     string            `json:"partner_web_socket_url"`
+	PartnerWebSocketModule  map[string]string `json:"partner_web_socket_module"`
+	PivotSocketUrl          string            `json:"pivot_socket_url"`
+	PivotSocketModule       map[string]string `json:"pivot_socket_module"`
+	BillingSocketUrl        string            `json:"billing_socket_url"`
+	BillingSocketModule     map[string]string `json:"billing_socket_module"`
+	CrmSocketUrl            string            `json:"crm_socket_url"`
+	CrmSocketModule         map[string]string `json:"crm_socket_module"`
+	IntegrationSocketUrl    string            `json:"integration_socket_url"`
+	IntegrationSocketModule map[string]string `json:"integration_socket_module"`
 }
 
 // переменная содержащая конфигурацию
@@ -142,5 +144,11 @@ func GetModuleSocketUrl(module string) (string, error) {
 		return socketConfig.CrmSocketUrl + crmModuleSocketPath, nil
 	}
 
+	// получаем ссылку
+	integrationModuleSocketPath, isIntegrationModuleExist := socketConfig.IntegrationSocketModule[module]
+	if isIntegrationModuleExist {
+		return socketConfig.IntegrationSocketUrl + integrationModuleSocketPath, nil
+	}
+
 	return "", fmt.Errorf("unknown module %s", module)
 }

join_web/web/dist/index.html

@@ -28,7 +28,7 @@
     <link rel="icon" type="image/png" sizes="32x32" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAAD39/f5+fn19fX7+/v9/f3+/v7+/v74+Pj8/Pz+/v7x8fH////y8vL7+/v+/v79/f39/f3+/v739/f8/Pz+/v7/////+vf+tpP+s47/+PX+18X9YBT9XRD+0r39p3/8VAX9oXX/8+38dzv8UgX8czT/8On+0Lz7WRL7Ugf7Vw/+yrT9nnX7TgT7UQf9l2z//v7/7+n7bjP6TQT6Twf6TQX7ai3+7OT9ybT6Ug76TQf6UAv9w6v8lGv5SAP5Swb7jWL//fz+6+T6ZSz5RwT5SQb5SAT6YCb+5979wav4Sgr4Rwb4SQj8uqL7imL4QwL4RQb4RQX6g1n/+/r+5t74XCX3QgP3RAX4VyD+4tj8uKL3Qwf3QgX8sZn5gFj2PQH3QAX5eVD/+fj+4dj3Ux/2PQL2PgT2PQP3Txr93NH7r5j2PAT2PAP2OgH2OQH2OwP7qI/4dU/1NwD1OgT1OAH1Qg75hGH5h2X2RBD4b0f/9/X929H2Shn1NwL1OAP1NgD2USL7taH/+vn//Pv8uqj2VCb1OAL1RhT91cr6po/0NgL0NgP3a0X91sv92tD3cEv0NwP0NQH6noX3b0zzLgD0PAz5jnL+7en+8Oz5k3j0Pg/0LwD3aEP/+Pb//f35mYH2XDT7s6H7uKf2XTb5k3n+8u9AvsHaAAAAFXRSTlMAAAAFSrHr/gyC7gT7BEvssOr9DIF025e2AAAAAWJLR0QMgbNRYwAAAAlwSFlzAAAWJQAAFiUBSVIk8AAAAAd0SU1FB+YCCg86MBGYSNMAAAFnSURBVDjLY2BgZGZhZWMXxQDsbKwszIwMDEwcnFxiOAAXJwcTAzcnjxhOwMPJy8DHL4YH8PMxCIjhBQIMgih8cQlJKRQBQQYhFL60jKwcioAQgygKX15BQRFFQBRVgZKyioqqGh4F6hqamlraeBTo6Orp6eob4FRgaGRsYmJqZo5TgYWlFRBY2+BSYGBrZw8Edg6OOBQ4Obu4AoGbuwcOBZ5e3mDg44tdgaOffwAQBAb4BwVjVRASGhYOBmERkVgVREXHwEAsNgXBcfEJUBCfmIRFQXJKahoUpGdkYlGQlQ0EObl5+UAqvwBTQVJhUXFxSWlZeUVJcXFRZRWGguqa2rr6hsam5pbW+rq29g4MBZ1dXd09vSBWX/+EromT4AqgSa5p8pSp06ZD2DNmzpo9Zy6ELQRLtPPmL1jYBPfxosVLmiFMQXiyb1qKlE4MlsICQoBwxiGY9ZiE8WReEWEmBkj2F8KZ/QEVYJJTgbcBzgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMi0wMi0xMFQxNTo1ODo0OCswMDowMITbnI4AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjItMDItMTBUMTU6NTg6NDgrMDA6MDD1hiQyAAAAV3pUWHRSYXcgcHJvZmlsZSB0eXBlIGlwdGMAAHic4/IMCHFWKCjKT8vMSeVSAAMjCy5jCxMjE0uTFAMTIESANMNkAyOzVCDL2NTIxMzEHMQHy4BIoEouAOoXEXTyQjWVAAAAAElFTkSuQmCC">
     <link rel="icon" type="image/png" sizes="16x16" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAA1VBMVEX6+vr9/f3+/v7////+/v7+/v7+/v7/////5tv/5tn//fv9kl/9j1r//Pr+5tz8ZiP8ZCD+5Nj9up77UAj6UAf9t5n/+/n7hVX5SQP7glH/+vj+4NX5Wh75RwT5RwX5WBz+3tL8r5T4RAX4RAT8rJD/+Pb5d0z3PgH3QQX5c0j/9/X92c73TBj2OwL2PQT2ShX91sr6o4r1NgD2RxT6nID6noP2SBb1NQD6n4X3akX2Viv8w7T//f38xrf2WC33Z0H/9vT/+vn7vKz939f94Nn7u6v/+fjK+klEAAAABnRSTlMNfej25v4j2d31AAAAAWJLR0QDEQxM8gAAAAlwSFlzAAAWJQAAFiUBSVIk8AAAAAd0SU1FB+YCCg86MBGYSNMAAACTSURBVBjTY2BgZGKDAyZGBgZGZnYkwMzIwAJhcXBCaBYGVjDNxc3DC2awMrCBaT5+AUEwgw0qICQsIoosICYuISEphSQgLSMrJ6+AJKCopKSkrIIQUFVT19BQ19SCC2jr6Orp6eobwAUMjYxNTM3MLcACQIepWlpZ29jY2tk7gBwGdLqjkzPIPBdXN5DTMTyH7n0AjA4PYRZ3ZOYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjItMDItMTBUMTU6NTg6NDgrMDA6MDCE25yOAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIyLTAyLTEwVDE1OjU4OjQ4KzAwOjAw9YYkMgAAAFd6VFh0UmF3IHByb2ZpbGUgdHlwZSBpcHRjAAB4nOPyDAhxVigoyk/LzEnlUgADIwsuYwsTIxNLkxQDEyBEgDTDZAMjs1Qgy9jUyMTMxBzEB8uASKBKLgDqFxF08kI1lQAAAABJRU5ErkJggg==">
 	<script src="https://www.google.com/recaptcha/enterprise.js" async defer></script>
-    <script type="module" crossorigin src="/assets/index-73cee61e.js"></script>
+    <script type="module" crossorigin src="/assets/index-3f688d13.js"></script>
     <link rel="stylesheet" href="/assets/index-632ed746.css">
   </head>
   <body class="invisible-scrollbar">

join_web/web/src/App.tsx

@@ -13,7 +13,9 @@ import AcceptLimitLink from "./pages/AcceptLimitLink.tsx";
 import {
 	ALREADY_MEMBER_ERROR_CODE,
 	INACTIVE_LINK_ERROR_CODE,
-	LIMIT_ERROR_CODE, NEED_FINISH_SPACE_LEAVING_BEFORE_JOIN
+	LIMIT_ERROR_CODE,
+	NEED_FINISH_SPACE_LEAVING_BEFORE_JOIN,
+	PrepareJoinLinkErrorAlreadyMemberData,
 } from "./api/_types.ts";
 import PageInviteAlreadyMember from "./pages/PageInviteAlreadyMember.tsx";
 import PageWelcomeJoinLink from "./pages/PageWelcomeJoinLink.tsx";
@@ -92,6 +94,11 @@ const Page = () => {
 				}
 
 				if (prepareJoinLinkError.error_code === ALREADY_MEMBER_ERROR_CODE) {
+
+					if ((prepareJoinLinkError.data as PrepareJoinLinkErrorAlreadyMemberData).is_postmoderation == 1) {
+						return <PageInviteWaitingForPostModeration/>;
+					}
+
 					return <PageInviteAlreadyMember/>;
 				}
 

join_web/web/src/lib/getLangString.ts

@@ -109,7 +109,8 @@ const LANG_CONFIG: LangConfig = {
 				register_desc_pt2: " и вставьте его в приложении.",
 				register_button: "Скопировать",
 				login_desc_pt1: "Откройте приложение Compass",
-				login_desc_pt2: " и при необходимости введите секретный код.",
+				login_desc_pt2_desktop: " и при необходимости введите секретный код.",
+				login_desc_pt2_mobile: " и введите секретный код.",
 				login_button: "Открыть Compass",
 			},
 			step_2: {
@@ -235,6 +236,8 @@ const LANG_CONFIG: LangConfig = {
 			sso_registration_without_invite:
 				"Регистрация через SSO недоступна. Обратитесь к руководителю или системному администратору для получения ссылки-приглашения.",
 		},
+		token_life_time_desktop: "Код действителен в течение 10 минут.",
+		token_life_time_mobile: "Код действителен 10 минут.",
 		one_hour: " час",
 		two_hours: " часа",
 		five_hours: " часов",

join_web/web/src/pages/PageInviteDesktop.tsx

@@ -277,6 +277,7 @@ const StepOneContent = ({
 	parentButtonRef,
 	joinLinkAcceptIsLoading,
 }: StepOneContentProps) => {
+	const langStringPageTokenLifeTimeDesktop = useLangString("token_life_time_desktop");
 	const langStringPageInviteOpenCompassDesktopTitlePt1 = useLangString("page_invite.open_compass_desktop.title_pt1");
 	const langStringPageInviteOpenCompassDesktopTitlePt2 = useLangString("page_invite.open_compass_desktop.title_pt2");
 	const langStringPageInviteOpenCompassDesktopButton = useLangString("page_invite.open_compass_desktop.button");
@@ -317,7 +318,7 @@ const StepOneContent = ({
 	const apiAuthGenerateToken = useApiAuthGenerateToken(joinLink === null ? undefined : joinLink.join_link_uniq);
 
 	return (
-		<VStack gap="16px">
+		<VStack gap="0px">
 			<HStack w="100%" gap="16px" justify="space-between">
 				<HStack gap="8px">
 					<Text
@@ -348,7 +349,7 @@ const StepOneContent = ({
 				</Button>
 			</HStack>
 			{apiAuthGenerateToken.isLoading || !apiAuthGenerateToken.data || joinLinkAcceptIsLoading ? (
-				<VStack w="100%" bgColor="000000.01" rounded="8px" px="12px" py="8px" gap="4px" alignItems="start">
+				<VStack w="100%" bgColor="000000.01" rounded="8px" px="12px" py="8px" gap="4px" alignItems="start" mt="16px">
 					<Box w="504px" h="16px" bgColor="434455" rounded="3px" />
 					<Box w="48%" h="16px" bgColor="434455" rounded="3px" />
 				</VStack>
@@ -361,6 +362,7 @@ const StepOneContent = ({
 					px="12px"
 					py="8px"
 					cursor="pointer"
+					mt="16px"
 					onClick={() => {
 						if (tokenBoxRef.current && scrollableParentBlockRef.current) {
 							copyToClipboard(
@@ -376,6 +378,9 @@ const StepOneContent = ({
 					</Text>
 				</Box>
 			)}
+			<Text style="lato_14_20_400" letterSpacing="-0.15px" color="f8f8f8" opacity="50%" mt="12px">
+				{langStringPageTokenLifeTimeDesktop}
+			</Text>
 		</VStack>
 	);
 };