Merge branch 'dev' into translation

Author: FalkWolsky

client/packages/lowcoder/src/comps/comps/tourComp/tourComp.tsx

@@ -1,16 +1,24 @@
+
 import { trans } from "i18n";
 import { withMethodExposing } from "../../generators/withMethodExposing";
 import { UICompBuilder } from "../../generators";
 import { stringExposingStateControl } from "comps/controls/codeStateControl";
 import { CommonNameConfig, NameConfig, withExposingConfigs } from "../../generators/withExposing";
 import { MultiBaseComp } from "lowcoder-core";
+
+// FALK TODO: Check imports
+// import { MultiBaseComp } from "lowcoder-core";
+// import { UICompBuilder } from "comps/generators/uiCompBuilder";
+// import { stringExposingStateControl } from "comps/controls/codeStateControl";
+// import { withMethodExposing } from "comps/generators/withMethodExposing";
+
 import { TourChildrenMap, TourPropertyView } from "./tourPropertyView";
 import { Tour, TourProps } from "antd";
 import React, { useContext } from "react";
-import { EditorContext } from "@lowcoder-ee/comps/editorState";
-import { GridItemComp } from "@lowcoder-ee/comps/comps/gridItemComp";
-import { HookComp } from "@lowcoder-ee/comps/hooks/hookComp";
-import { TemporaryStateItemComp } from "@lowcoder-ee/comps/comps/temporaryStateComp";
+import { EditorContext } from "comps/editorState";
+import { GridItemComp } from "comps/comps/gridItemComp";
+import { HookComp } from "comps/hooks/hookComp";
+import { TemporaryStateItemComp } from "comps/comps/temporaryStateComp";
 
 /**
  * This component builds the Property Panel and the fake 'UI' for the Tour component

client/packages/lowcoder/src/comps/comps/tourComp/tourPropertyView.tsx

@@ -2,11 +2,18 @@ import { RecordConstructorToComp } from "lowcoder-core";
 import { BoolControl } from "../../controls/boolControl";
 import { ArrowControl, BoolCodeControl, MaskControl } from "../../controls/codeControl";
 import { Section } from "lowcoder-design";
+
 import { TourStepControl } from "@lowcoder-ee/comps/controls/tourStepControl";
 import { booleanExposingStateControl } from "comps/controls/codeStateControl";
 import { dropdownControl } from "comps/controls/dropdownControl";
+
+// Falk TODO: Check Imports
+// import { TourStepControl } from "comps/controls/tourStepControl";
+// import { booleanExposingStateControl } from "comps/controls/codeStateControl";
+// import {  dropdownControl } from "comps/controls/dropdownControl";
+
 import { trans } from "i18n";
-import { PlacementOptions, TypeOptions } from "@lowcoder-ee/comps/comps/tourComp/tourControlConstants";
+import { PlacementOptions, TypeOptions } from "./tourControlConstants";
 import {
   TourArrowTooltip,
   TourMaskTooltip,

client/packages/lowcoder/src/comps/index.tsx

@@ -63,6 +63,7 @@ import { RemoteCompInfo } from "types/remoteComp";
 import { ScannerComp } from "./comps/buttonComp/scannerComp";
 import { SignatureComp } from "./comps/signatureComp";
 import { TimeLineComp } from "./comps/timelineComp/timelineComp";
+import { TourComp } from "./comps/tourComp/tourComp";
 import { CommentComp } from "./comps/commentComp/commentComp";
 import { MentionComp } from "./comps/textInputComp/mentionComp";
 import { AutoCompleteComp } from "./comps/autoCompleteComp/autoCompleteComp";
@@ -143,7 +144,6 @@ import {
   FloatingTextComp,
   IconModal,
 } from "lowcoder-design";
-import { TourComp } from "@lowcoder-ee/comps/comps/tourComp/tourComp";
 
 type Registry = {
   [key in UICompType]?: UICompManifest;

deploy/docker/Dockerfile

@@ -51,7 +51,7 @@ CMD [ "/bin/bash" , "/lowcoder/api-service/entrypoint.sh" ]
 ##
 FROM ubuntu:jammy as build-node-service
 
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates build-essential gnupg
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates build-essential gnupg
 
 # Add nodejs repo and keys
 RUN mkdir -p /etc/apt/keyrings \
@@ -83,7 +83,7 @@ RUN chmod +x /lowcoder/node-service/*.sh
 FROM ubuntu:jammy as lowcoder-ce-node-service
 LABEL maintainer="lowcoder"
 
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates gnupg
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates gnupg
 
 # Add nodejs repo and keys
 RUN mkdir -p /etc/apt/keyrings \
@@ -200,15 +200,9 @@ RUN mkdir -p /etc/apt/keyrings \
 # Install required packages
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y bash gnupg curl lsb-release \
   && curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg \
-  && echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb bullseye main" | tee /etc/apt/sources.list.d/redis.list \
+  && echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb bookworm main" | tee /etc/apt/sources.list.d/redis.list \
   && curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor -o /usr/share/keyrings/mongodb-archive-keyring.gpg \
-  && echo "deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg arch=amd64,arm64] http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \
-  && if [ "$(dpkg --print-architecture)" = "amd64" ] || [ "$(dpkg --print-architecture)" = "i386" ]; then \
-    curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \
-  else \
-    curl -sL http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \
-  fi \
-  && dpkg -i libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb \
+  && echo "deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] https://repo.mongodb.org/apt/debian bookworm/mongodb-org/4.4 main" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \
   && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends -y \
       mongodb-org \
       redis \

deploy/docker/all-in-one/etc/supervisord.conf

@@ -4,8 +4,8 @@
 file=/var/run/supervisor.sock   ; (the path to the socket file)
 chmod=0700                       ; sockef file mode (default 0700)
 
-[inet_http_server]         ; inet (TCP) server disabled by default
-port=*:9001        ; (ip_address:port specifier, *:port for all iface)
+;[inet_http_server]         ; inet (TCP) server disabled by default
+;port=*:9001        ; (ip_address:port specifier, *:port for all iface)
 ;username=user              ; (default is no username (open server))
 ;password=123               ; (default is no password (open server))
 
@@ -37,8 +37,8 @@ files = /lowcoder/etc/supervisord/conf-enabled/*.conf
 # ; This event listener is used to capture processes log
 # ; and forward to container log using supervisor_stdout
 # ; Ref: https://github.com/coderanger/supervisor-stdout
-# [eventlistener:stdout] 
-# command = supervisor_stdout 
-# buffer_size = 100 
-# events = PROCESS_LOG 
+# [eventlistener:stdout]
+# command = supervisor_stdout
+# buffer_size = 100
+# events = PROCESS_LOG
 # result_handler = supervisor_stdout:event_handler