From 5dd87554c32e340a66777adaa3ba29c4e083ec6e Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Sat, 25 Feb 2023 19:15:43 +0100 Subject: [PATCH] :bug: Attempt to fix load crash on UC Browser --- .../GoogleSheetsSettingsBody.tsx | 7 ++++--- apps/viewer/package.json | 2 +- package.json | 2 +- .../ConversationContainer.tsx | 6 +++--- .../integrations/googleSheets/schemas.ts | 19 ++++++++++++------- packages/models/package.json | 1 - packages/wordpress/package.json | 6 +++--- packages/wordpress/trunk/README.txt | 5 ++++- .../trunk/public/class-typebot-public.php | 2 ++ packages/wordpress/trunk/typebot.php | 4 ++-- pnpm-lock.yaml | 4 +--- 11 files changed, 33 insertions(+), 25 deletions(-) diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsSettingsBody.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsSettingsBody.tsx index 60cf0246147..6a62219d4b2 100644 --- a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsSettingsBody.tsx +++ b/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsSettingsBody.tsx @@ -26,6 +26,7 @@ import { CredentialsDropdown } from '@/features/credentials' import { useSheets } from '../../hooks/useSheets' import { Sheet } from '../../types' import { RowsFilterTableList } from './RowsFilterTableList' +import { createId } from '@paralleldrive/cuid2' type Props = { options: GoogleSheetsOptions @@ -65,21 +66,21 @@ export const GoogleSheetsSettingsBody = ({ case GoogleSheetsAction.GET: { const newOptions: GoogleSheetsGetOptions = { ...baseOptions, - ...defaultGoogleSheetsGetOptions, + ...defaultGoogleSheetsGetOptions(createId), } return onOptionsChange({ ...newOptions }) } case GoogleSheetsAction.INSERT_ROW: { const newOptions: GoogleSheetsInsertRowOptions = { ...baseOptions, - ...defaultGoogleSheetsInsertOptions, + ...defaultGoogleSheetsInsertOptions(createId), } return onOptionsChange({ ...newOptions }) } case GoogleSheetsAction.UPDATE_ROW: { const newOptions: GoogleSheetsUpdateRowOptions = { ...baseOptions, - ...defaultGoogleSheetsUpdateOptions, + ...defaultGoogleSheetsUpdateOptions(createId), } return onOptionsChange({ ...newOptions }) } diff --git a/apps/viewer/package.json b/apps/viewer/package.json index 84268c20553..db7fe20c9ec 100644 --- a/apps/viewer/package.json +++ b/apps/viewer/package.json @@ -20,7 +20,6 @@ "aws-sdk": "2.1321.0", "bot-engine": "workspace:*", "cors": "2.8.5", - "@paralleldrive/cuid2": "2.2.0", "db": "workspace:*", "google-spreadsheet": "3.3.0", "got": "12.5.3", @@ -35,6 +34,7 @@ "trpc-openapi": "1.1.2" }, "devDependencies": { + "@paralleldrive/cuid2": "2.2.0", "@babel/preset-env": "7.20.2", "@faire/mjml-react": "3.1.1", "@playwright/test": "1.31.1", diff --git a/package.json b/package.json index f43191ca3cc..a714a84e943 100644 --- a/package.json +++ b/package.json @@ -33,5 +33,5 @@ "path": "node_modules/cz-emoji" } }, - "packageManager": "pnpm@7.27.1" + "packageManager": "pnpm@7.28.0" } diff --git a/packages/js/src/components/ConversationContainer/ConversationContainer.tsx b/packages/js/src/components/ConversationContainer/ConversationContainer.tsx index 2d9344ae0eb..b7f40907708 100644 --- a/packages/js/src/components/ConversationContainer/ConversationContainer.tsx +++ b/packages/js/src/components/ConversationContainer/ConversationContainer.tsx @@ -67,7 +67,7 @@ export const ConversationContainer = (props: Props) => { }) const sendMessage = async (message: string | undefined) => { - const currentBlockId = chatChunks().at(-1)?.input?.id + const currentBlockId = [...chatChunks()].pop()?.input?.id if (currentBlockId && props.onAnswer && message) props.onAnswer({ message, blockId: currentBlockId }) const longRequest = setTimeout(() => { @@ -116,7 +116,7 @@ export const ConversationContainer = (props: Props) => { } const handleAllBubblesDisplayed = async () => { - const lastChunk = chatChunks().at(-1) + const lastChunk = [...chatChunks()].pop() if (!lastChunk) return if (isNotDefined(lastChunk.input)) { props.onEnd?.() @@ -124,7 +124,7 @@ export const ConversationContainer = (props: Props) => { } const handleNewBubbleDisplayed = async (blockId: string) => { - const lastChunk = chatChunks().at(-1) + const lastChunk = [...chatChunks()].pop() if (!lastChunk) return if (lastChunk.clientSideActions) { const actionsToExecute = lastChunk.clientSideActions.filter( diff --git a/packages/models/features/blocks/integrations/googleSheets/schemas.ts b/packages/models/features/blocks/integrations/googleSheets/schemas.ts index 17daa0e90de..b99723c5ebb 100644 --- a/packages/models/features/blocks/integrations/googleSheets/schemas.ts +++ b/packages/models/features/blocks/integrations/googleSheets/schemas.ts @@ -1,6 +1,5 @@ import { z } from 'zod' import { ComparisonOperators, LogicalOperator } from '../../logic/condition' -import { createId } from '@paralleldrive/cuid2' import { IntegrationBlockType } from '../enums' import { GoogleSheetsAction } from './enums' import { blockBaseSchema } from '../../baseSchemas' @@ -72,7 +71,9 @@ export const googleSheetsBlockSchema = blockBaseSchema.and( export const defaultGoogleSheetsOptions: GoogleSheetsOptions = {} -export const defaultGoogleSheetsGetOptions: GoogleSheetsGetOptions = { +export const defaultGoogleSheetsGetOptions = ( + createId: () => string +): GoogleSheetsGetOptions => ({ action: GoogleSheetsAction.GET, cellsToExtract: [ { @@ -87,25 +88,29 @@ export const defaultGoogleSheetsGetOptions: GoogleSheetsGetOptions = { ], logicalOperator: LogicalOperator.AND, }, -} +}) -export const defaultGoogleSheetsInsertOptions: GoogleSheetsInsertRowOptions = { +export const defaultGoogleSheetsInsertOptions = ( + createId: () => string +): GoogleSheetsInsertRowOptions => ({ action: GoogleSheetsAction.INSERT_ROW, cellsToInsert: [ { id: createId(), }, ], -} +}) -export const defaultGoogleSheetsUpdateOptions: GoogleSheetsUpdateRowOptions = { +export const defaultGoogleSheetsUpdateOptions = ( + createId: () => string +): GoogleSheetsUpdateRowOptions => ({ action: GoogleSheetsAction.UPDATE_ROW, cellsToUpsert: [ { id: createId(), }, ], -} +}) export type GoogleSheetsBlock = z.infer export type GoogleSheetsOptions = z.infer diff --git a/packages/models/package.json b/packages/models/package.json index 3007b7793ad..21f9529ac43 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -9,7 +9,6 @@ "zod": "3.20.6" }, "devDependencies": { - "@paralleldrive/cuid2": "2.2.0", "db": "workspace:*", "next": "13.1.6", "tsconfig": "workspace:*", diff --git a/packages/wordpress/package.json b/packages/wordpress/package.json index d36d57b5f48..d4e6cbfe53d 100644 --- a/packages/wordpress/package.json +++ b/packages/wordpress/package.json @@ -1,6 +1,6 @@ { "name": "wordpress", - "version": "3.1.0", + "version": "3.1.1", "main": "index.js", "repository": "https://github.com/baptisteArno/typebot.io", "author": "baptisteArno", @@ -11,7 +11,7 @@ }, "scripts": { "deploy": "pnpm copy && pnpm commit", - "copy": "svn copy ./trunk ./tags/3.1.0", - "commit": "svn ci -m 'Fix admin critical bug and introduce excluded pages'" + "copy": "svn copy ./trunk ./tags/3.1.1", + "commit": "svn ci -m 'Fix excluded pages when empty'" } } diff --git a/packages/wordpress/trunk/README.txt b/packages/wordpress/trunk/README.txt index 6ccdd5ac84a..8f77732038b 100644 --- a/packages/wordpress/trunk/README.txt +++ b/packages/wordpress/trunk/README.txt @@ -5,7 +5,7 @@ Requires at least: 5.0 Tested up to: 6.0 License: GPL 2.0 License URI: http://www.gnu.org/licenses/gpl-2.0.txt -Stable Tag: 3.1.0 +Stable Tag: 3.1.1 Build beautiful conversational forms @@ -26,6 +26,9 @@ This plugin relies on Typebot which is a tool that allows you to create conversa 3. Activate your Typebot with the "Typebot" admin button located in the sidebar == Changelog == += 3.1.1 = +* Fix excluded pages when empty + = 3.1.0 = * Breaking change! You will need to import the new code snippet again. * Fix wp admin crash diff --git a/packages/wordpress/trunk/public/class-typebot-public.php b/packages/wordpress/trunk/public/class-typebot-public.php index f5932c3e6a6..5f5e5f4dd25 100644 --- a/packages/wordpress/trunk/public/class-typebot-public.php +++ b/packages/wordpress/trunk/public/class-typebot-public.php @@ -45,6 +45,8 @@ function typebot_script() } $arr_js = substr($arr_js, 0, -1) . '];'; echo $arr_js; + } else { + echo 'const typebotExcludePaths = null;'; } if (get_option('init_snippet') && get_option('init_snippet') !== '') { diff --git a/packages/wordpress/trunk/typebot.php b/packages/wordpress/trunk/typebot.php index 0160b523b7f..6964b19c369 100644 --- a/packages/wordpress/trunk/typebot.php +++ b/packages/wordpress/trunk/typebot.php @@ -3,7 +3,7 @@ /** * Plugin Name: Typebot * Description: Convert more with conversational forms - * Version: 3.1.0 + * Version: 3.1.1 * Author: Typebot * Author URI: http://typebot.io/ * License: GPL-2.0+ @@ -16,7 +16,7 @@ die(); } -define('TYPEBOT_VERSION', '3.1.0'); +define('TYPEBOT_VERSION', '3.1.1'); function activate_typebot() { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cbed9ac7c9a..cb21137a715 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -389,7 +389,6 @@ importers: utils: workspace:* zod: 3.20.6 dependencies: - '@paralleldrive/cuid2': 2.2.0 '@sentry/nextjs': 7.38.0_next@13.1.6+react@18.2.0 '@trpc/server': 10.12.0 '@typebot.io/js': link:../../packages/js @@ -412,6 +411,7 @@ importers: devDependencies: '@babel/preset-env': 7.20.2_@babel+core@7.21.0 '@faire/mjml-react': 3.1.1_7tbcn2mecc3yvuxakflodiks3m + '@paralleldrive/cuid2': 2.2.0 '@playwright/test': 1.31.1 '@types/cors': 2.8.13 '@types/google-spreadsheet': 3.3.1 @@ -622,7 +622,6 @@ importers: packages/models: specifiers: - '@paralleldrive/cuid2': 2.2.0 db: workspace:* next: 13.1.6 tsconfig: workspace:* @@ -631,7 +630,6 @@ importers: dependencies: zod: 3.20.6 devDependencies: - '@paralleldrive/cuid2': 2.2.0 db: link:../db next: 13.1.6_biqbaboplfbrettd7655fr4n2y tsconfig: link:../tsconfig