Merge branch 'feat/update_dependencies' into beta

illacloud · Dec 18, 2023 · 6c49564 · 6c49564
2 parents f802a32 + 260b317
commit 6c49564
Show file tree

Hide file tree

Showing 17 changed files with 107 additions and 211 deletions.
diff --git a/apps/builder/package.json b/apps/builder/package.json
@@ -71,7 +71,7 @@
     "@mui/x-data-grid-premium": "^6.18.2",
     "@protobuf-ts/runtime": "^2.8.3",
     "@react-google-maps/api": "^2.18.1",
-    "@reduxjs/toolkit": "^1.9.7",
+    "@reduxjs/toolkit": "^2.0.1",
     "@rjsf/core": "^5.10.0",
     "@rjsf/utils": "^5.10.0",
     "@rjsf/validator-ajv8": "^5.10.0",
@@ -84,7 +84,7 @@
     "@uiw/react-color-sketch": "^1.4.2",
     "acorn": "^8.7.1",
     "acorn-walk": "^8.2.0",
-    "axios": "^0.26.1",
+    "axios": "^1.6.2",
     "chart.js": "^3.9.1",
     "chroma-js": "^2.4.2",
     "copy-to-clipboard": "^3.3.2",
@@ -120,7 +120,7 @@
     "react-markdown": "^8.0.3",
     "react-pdf": "^6.2.2",
     "react-player": "^2.11.2",
-    "react-redux": "^8.1.3",
+    "react-redux": "^9.0.4",
     "react-rnd": "^10.3.7",
     "react-router-dom": "^6.14.0",
     "react-selecto": "^1.22.0",
@@ -130,7 +130,6 @@
     "react-virtuoso": "^4.3.11",
     "react-window": "^1.8.9",
     "react-window-infinite-loader": "^1.0.9",
-    "redux-logger": "^3.0.6",
     "rehype-raw": "^6.1.1",
     "rehype-sanitize": "^5.0.1",
     "remark-gfm": "^3.0.1",
@@ -159,7 +158,6 @@
     "@types/react-slick": "^0.23.10",
     "@types/react-window": "^1.8.5",
     "@types/react-window-infinite-loader": "^1.0.6",
-    "@types/redux-logger": "^3.0.9",
     "@types/streamsaver": "^2.0.1",
     "@types/tern": "^0.23.5",
     "@types/toposort": "^2.0.4",

diff --git a/apps/builder/src/api/http/base.ts b/apps/builder/src/api/http/base.ts
@@ -1,6 +1,9 @@
-import { actionRuntimeAxios, needAuthAxios } from "@illa-public/illa-net/base"
-import { authInterceptor } from "@/api/http/interceptors/request/auth"
-import { errorHandlerInterceptor } from "@/api/http/interceptors/response/errorHandler"
+import {
+  actionRuntimeAxios,
+  authInterceptor,
+  errorHandlerInterceptor,
+  needAuthAxios,
+} from "@illa-public/illa-net"
 
 needAuthAxios.interceptors.request.use(authInterceptor)
 needAuthAxios.interceptors.response.use(undefined, errorHandlerInterceptor)

diff --git a/apps/builder/src/api/http/interceptors/request/auth.ts b/apps/builder/src/api/http/interceptors/request/auth.ts
diff --git a/apps/builder/src/api/http/interceptors/response/errorHandler.ts b/apps/builder/src/api/http/interceptors/response/errorHandler.ts
diff --git a/apps/builder/src/middleware/guideAsync/index.ts b/apps/builder/src/middleware/guideAsync/index.ts
@@ -1,8 +1,11 @@
-import { Middleware } from "@reduxjs/toolkit"
+import { Middleware, isAction } from "@reduxjs/toolkit"
 import { guideUpdate } from "@/middleware/guideAsync/guideUpdate"
 import { getGuideStatus } from "@/redux/guide/guideSelector"
 
 export const guideAsync: Middleware = (store) => (next) => (action) => {
+  if (!isAction(action) || !("payload" in action)) {
+    return next(action)
+  }
   const isGuideOpen = getGuideStatus(store.getState())
   if (isGuideOpen) {
     guideUpdate(store.getState(), store.dispatch, action)

diff --git a/apps/builder/src/middleware/mixpanelReport/index.ts b/apps/builder/src/middleware/mixpanelReport/index.ts
@@ -1,7 +1,10 @@
-import { Middleware } from "@reduxjs/toolkit"
+import { Middleware, isAction } from "@reduxjs/toolkit"
 import { reportMessage } from "./reportMessage"
 
 export const mixpanelReport: Middleware = (store) => (next) => (action) => {
+  if (!isAction(action) || !("payload" in action)) {
+    return next(action)
+  }
   const { type } = action
   const typeList = type.split("/")
   const isRemoteAction = typeList[typeList.length - 1] === "remote"

diff --git a/apps/builder/src/middleware/reduxAsync/index.ts b/apps/builder/src/middleware/reduxAsync/index.ts
@@ -1,11 +1,14 @@
-import * as Redux from "@reduxjs/toolkit"
+import { Middleware, isAction } from "@reduxjs/toolkit"
 import { illaSnapshot } from "@/page/App/components/DotPanel/constant/snapshotNew"
 import { getExecutionWidgetLayoutInfo } from "@/redux/currentApp/executionTree/executionSelector"
 import { RootState } from "@/store"
 import { receiveMessage } from "./receiveMessages"
 import { sendMessage } from "./sendMessage"
 
-export const reduxAsync: Redux.Middleware = (store) => (next) => (action) => {
+export const reduxAsync: Middleware = (store) => (next) => (action) => {
+  if (!isAction(action) || !("payload" in action)) {
+    return next(action)
+  }
   const { type } = action
   const typeList = type.split("/")
   const isRemoteAction = typeList[typeList.length - 1] === "remote"

diff --git a/apps/builder/src/middleware/undoRedo/index.ts b/apps/builder/src/middleware/undoRedo/index.ts
@@ -1,9 +1,12 @@
-import { Middleware } from "@reduxjs/toolkit"
+import { Middleware, isAction } from "@reduxjs/toolkit"
 import { REDUX_ACTION_FROM } from "./interface"
 import { undoRedoMethod } from "./method"
 
 export const UndoRedo: Middleware = (store) => (next) => (action) => {
-  if (action.from && action.from === REDUX_ACTION_FROM.WS) {
+  if (!isAction(action) || !("payload" in action)) {
+    return next(action)
+  }
+  if ("from" in action && action.from && action.from === REDUX_ACTION_FROM.WS) {
     const resp = next(action)
     return resp
   }

diff --git a/apps/builder/src/page/App/Module/PageNavBar/ShareAppButton/index.tsx b/apps/builder/src/page/App/Module/PageNavBar/ShareAppButton/index.tsx
@@ -120,7 +120,7 @@ export const ShareAppButton: FC<ShareAppButtonProps> = (props) => {
               dispatch(
                 appInfoActions.updateAppInfoReducer({
                   ...appInfo,
-                  appName: appConfig.publishWithAIAgent,
+                  appName: appConfig.appName,
                   config: {
                     ...appInfo.config,
                     description: appConfig.appDesc,

diff --git a/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts b/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts
@@ -1,6 +1,4 @@
-import { AppInfoShape } from "@illa-public/public-types"
 import { createSlice } from "@reduxjs/toolkit"
-import { SliceCaseReducers } from "@reduxjs/toolkit/src/createSlice"
 import {
   updateAppContributeReducer,
   updateAppDeployedReducer,
@@ -9,11 +7,7 @@ import {
 } from "@/redux/currentApp/appInfo/appInfoReducer"
 import { DashboardAppInitialState } from "./appInfoState"
 
-const appInfoSlice = createSlice<
-  AppInfoShape,
-  SliceCaseReducers<AppInfoShape>,
-  "appInfo"
->({
+const appInfoSlice = createSlice({
   name: "appInfo",
   initialState: DashboardAppInitialState,
   reducers: {

diff --git a/apps/builder/src/store.ts b/apps/builder/src/store.ts
@@ -7,7 +7,6 @@ import {
   configureStore,
   createListenerMiddleware,
 } from "@reduxjs/toolkit"
-import { logger } from "redux-logger"
 import { guideAsync } from "@/middleware/guideAsync"
 import { reduxAsync } from "@/middleware/reduxAsync"
 import aiAgent from "@/redux/aiAgent/dashboardTeamAIAgentSlice"
@@ -40,10 +39,6 @@ const appReducer = combineReducers({
 
 const middlewares = [reduxAsync, UndoRedo, guideAsync]
 
-if (import.meta.env.ILLA_APP_ENV === "development") {
-  middlewares.push(logger)
-}
-
 if (isCloudVersion) {
   middlewares.unshift(mixpanelReport)
 }

diff --git a/apps/cloud/package.json b/apps/cloud/package.json
@@ -34,8 +34,8 @@
     "@illa-public/user-data": "workspace:*",
     "@illa-public/user-role-utils": "workspace:*",
     "@illa-public/utils": "workspace:*",
-    "@reduxjs/toolkit": "^1.9.7",
-    "axios": "^0.26.1",
+    "@reduxjs/toolkit": "^2.0.1",
+    "axios": "^1.6.2",
     "dayjs": "^1.11.10",
     "fuse.js": "^6.6.2",
     "i18next": "^23.7.6",
@@ -44,7 +44,7 @@
     "lodash": "^4.17.21",
     "react-hook-form": "^7.40.0",
     "react-i18next": "^13.5.0",
-    "react-redux": "^8.1.3",
+    "react-redux": "^9.0.4",
     "react-router-dom": "^6.14.0",
     "swr": "^2.2.4",
     "uuid": "^9.0.0"

diff --git a/apps/cloud/src/api/http/base.ts b/apps/cloud/src/api/http/base.ts
@@ -1,6 +1,8 @@
-import { needAuthAxios } from "@illa-public/illa-net"
-import { authInterceptor } from "./interceptors/request/auth"
-import { errorHandlerInterceptor } from "./interceptors/response/errorHandler"
+import {
+  authInterceptor,
+  errorHandlerInterceptor,
+  needAuthAxios,
+} from "@illa-public/illa-net"
 
 needAuthAxios.interceptors.request.use(authInterceptor)
 needAuthAxios.interceptors.response.use(undefined, errorHandlerInterceptor)
diff --git a/apps/cloud/src/api/http/interceptors/request/auth.ts b/apps/cloud/src/api/http/interceptors/request/auth.ts
diff --git a/apps/cloud/src/api/http/interceptors/response/errorHandler.ts b/apps/cloud/src/api/http/interceptors/response/errorHandler.ts
diff --git a/packages/illa-public-component b/packages/illa-public-component
+1 −1		CloudDashboardLayout/package.json
+1 −1		Dashboard/package.json
+2 −0		ILLANet/index.ts
+10 −0		ILLANet/interceptors/request/auth.ts
+37 −0		ILLANet/interceptors/response/errorHandler.ts
+1 −1		ILLANet/package.json
+1 −1		MemberPage/package.json
+1 −1		ResourceGenerator/package.json
+1 −1		UpgradeModal/package.json
+2 −2		UserData/package.json