Merge branch 'develop' into merge/hash-tag

Dockerfile

@@ -11,8 +11,7 @@ RUN apk add --no-cache \
 ## copy frontend
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY illa-builder-frontend.conf /etc/nginx/conf.d/illa-builder-frontend.conf
-COPY ./apps/builder/dist/index.html /opt/illa/illa-builder-frontend/index.html
-COPY ./apps/builder/dist/assets /opt/illa/illa-builder-frontend/assets
+COPY ./apps/builder/dist /opt/illa/illa-builder-frontend
 RUN rm /etc/nginx/conf.d/default.conf
 
 # test nginx

apps/builder/package.json

@@ -40,8 +40,28 @@
  "@editorjs/marker": "^1.3.0",
  "@emotion/cache": "^11.11.0",
  "@illa-design/react": "workspace:*",
+ "@illa-public/avatar": "workspace:*",
+ "@illa-public/code-editor": "workspace:*",
+ "@illa-public/cropper": "workspace:*",
+ "@illa-public/icon": "workspace:*",
+ "@illa-public/illa-net": "workspace:*",
+ "@illa-public/invite-modal": "workspace:*",
+ "@illa-public/layout-auto-change": "workspace:*",
+ "@illa-public/market-agent": "workspace:*",
+ "@illa-public/market-app": "workspace:*",
+ "@illa-public/member-page": "workspace:*",
+ "@illa-public/mixpanel-utils": "workspace:*",
+ "@illa-public/record-editor": "workspace:*",
+ "@illa-public/select": "workspace:*",
+ "@illa-public/sso-module": "workspace:*",
+ "@illa-public/upgrade-modal": "workspace:*",
+ "@illa-public/user-data": "workspace:*",
+ "@illa-public/user-role-utils": "workspace:*",
  "@illa-public/illa-storage": "workspace:*",
  "@illa-public/utils": "workspace:*",
+ "@illa-public/text-link": "workspace:*",
+ "@illa-public/resource-generator": "workspace:*",
+ "@illa-public/public-types": "workspace:*",
  "@protobuf-ts/runtime": "^2.8.3",
  "@react-google-maps/api": "^2.18.1",
  "@rjsf/core": "^5.10.0",
@@ -106,27 +126,7 @@
  "ts-key-enum": "^2.0.12",
  "uuid": "^8.3.2",
  "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.0/xlsx-0.20.0.tgz",
- "fuse.js": "^6.6.2",
- "@illa-public/user-role-utils": "workspace:*",
- "@illa-public/mixpanel-utils": "workspace:*",
- "@illa-public/code-editor": "workspace:*",
- "@illa-public/cropper": "workspace:*",
- "@illa-public/icon": "workspace:*",
- "@illa-public/record-editor": "workspace:*",
- "@illa-public/avatar": "workspace:*",
- "@illa-public/select": "workspace:*",
- "@illa-public/user-data": "workspace:*",
- "@illa-public/market-agent": "workspace:*",
- "@illa-public/market-app": "workspace:*",
- "@illa-public/sso-module": "workspace:*",
- "@illa-public/layout-auto-change": "workspace:*",
- "@illa-public/invite-modal": "workspace:*",
- "@illa-public/illa-net": "workspace:*",
- "@illa-public/member-page": "workspace:*",
- "@illa-public/upgrade-modal": "workspace:*",
- "@illa-public/text-link": "workspace:*",
- "@illa-public/resource-generator": "workspace:*",
- "@illa-public/public-types": "workspace:*"
+ "fuse.js": "^6.6.2"
  },
  "devDependencies": {
  "@mdx-js/rollup": "^2.3.0",

apps/builder/src/api/http/interceptors/response/errorHandler.ts

@@ -1,54 +1,30 @@
-import { isCloudVersion } from "@illa-public/utils"
-import { removeAuthToken } from "@illa-public/utils"
+import { getILLABuilderURL, removeAuthToken } from "@illa-public/utils"
 import { AxiosError } from "axios"
 import { cloudRedirect } from "@/router/constant"
-import { getQS } from "@/router/utils/translateQS"
 import { commonBillingErrorHandler } from "@/utils/billing/errorHandler"
 
-const getRedirectPathWhen401 = (searchParams: URLSearchParams) => {
- const inviteToken = searchParams.get("inviteToken")
- const qs = getQS(searchParams)
- if (inviteToken) {
- return `/register${qs}`
- } else {
- return `/login${qs}`
- }
-}
-
 export const errorHandlerInterceptor = (error: AxiosError) => {
  const { response } = error
  if (!response) return Promise.reject(error)
- const { href } = location
  const { status } = response
  switch (status) {
  // TODO: @aruseito maybe need custom error status, because of we'll have plugin to request other's api
  case 401: {
  removeAuthToken()
- if (isCloudVersion) {
- // navigate to illa cloud, avoid redirect loop
- if (!href.includes("redirectURL")) {
- window.location.href = cloudRedirect
- }
- } else {
- const { href } = location
- const url = new URL(href)
- const searchParams = url.searchParams
- const path = getRedirectPathWhen401(searchParams)
- window.location.pathname = path
- }
+ window.location.href = cloudRedirect
  break
  }
  case 403: {
- window.location.pathname = "/403"
+ window.location.href = `${getILLABuilderURL()}/403`
  break
  }
  case 500: {
- window.location.pathname = "/500"
+ window.location.href = `${getILLABuilderURL()}/500`
  break
  }
  default: {
  if (status >= 500) {
- window.location.pathname = "/500"
+ window.location.href = `${getILLABuilderURL()}/500`
  break
  }
  commonBillingErrorHandler(response)