Merge pull request #868 from illacloud/develop

Develop

.github/workflows/close-stale-issues-and-PRs.yml

@@ -16,5 +16,5 @@ jobs:
           days-before-pr-stale: 5
           days-before-issue-close: 2
           days-before-pr-close: 2
-          exempt-issue-labels: 'bug,work-in-progress'
+          exempt-issue-labels: 'bug,feature,help wanted,invalid'
           exempt-all-assignees: true

apps/builder/src/components/CodeEditor/CodeMirror/theme.ts

@@ -61,6 +61,7 @@ export const ILLACodeMirrorTheme = {
 export const illaCodeMirrorTooltipStyle = css`
   > div {
     height: unset;
+    min-height: unset;
   }
   .cm-tooltip {
     &.cm-tooltip-autocomplete {

apps/builder/src/hooks/useInitApp.tsx

@@ -13,6 +13,7 @@ import { componentsActions } from "@/redux/currentApp/editor/components/componen
 import { dottedLineSquareActions } from "@/redux/currentApp/editor/dottedLineSquare/dottedLineSquareSlice"
 import { dragShadowActions } from "@/redux/currentApp/editor/dragShadow/dragShadowSlice"
 import { executionActions } from "@/redux/currentApp/executionTree/executionSlice"
+import { DashboardAppInitialState } from "@/redux/dashboard/apps/dashboardAppState"
 import { DisplayNameGenerator } from "@/utils/generators/generateDisplayName"
 
 export const useInitBuilderApp = (model: IllaMode) => {
@@ -93,6 +94,7 @@ export const useInitBuilderApp = (model: IllaMode) => {
 
     return () => {
       controller.abort()
+      dispatch(appInfoActions.updateAppInfoReducer(DashboardAppInitialState))
     }
   }, [appId, dispatch, model, versionId, isOnline])
 

apps/builder/src/i18n/locale/en-US.json

@@ -636,6 +636,10 @@
           "email": "Email",
           "regex": "Regex",
           "url": "URL"
+        },
+        "height": {
+          "fixed": "Fixed",
+          "auto": "Auto"
         }
       },
       "setter_group": {
@@ -813,7 +817,9 @@
         "x_axis_type": "X-axis type",
         "x_axis_value": "X-axis value",
         "y_axis_name": "Y-axis name",
-        "y_axis_title": "Y-axis title"
+        "y_axis_title": "Y-axis title",
+        "height": "Height",
+        "min_height": "Min height (px)"
       },
       "setter_tooltip": {
         "action": "Your actions to components trigger queries, control components, or call the data in your resources. Multiple async actions will be executed in parallel.",
@@ -979,7 +985,8 @@
       "des": "Oops, something went wrong. Please try again later."
     },
     "back": "Back to homepage",
-    "mobile_forbidden": "For the better editing experience, please visit this page on desktop"
+    "mobile_forbidden": "For the better editing experience, please visit this page on desktop",
+    "back_to_cloud": "Back to ILLA Cloud"
   },
   "title": "Welcome to illa",
   "unfreeze_tips": "Freeze the canvas and drag components into or out of containers. (D or K)",
@@ -1217,6 +1224,9 @@
     },
     "modal": {
       "name": "Modal"
+    },
+    "textarea": {
+      "name": "Textarea Input"
     }
   },
   "page": {
@@ -1231,5 +1241,131 @@
     "invalid_tips": "Please enter a value not less than {{ size }}."
   },
   "failed_to_copy": "Failed to copy",
-  "copied": "Copied!"
+  "copied": "Copied!",
+  "user_management": {
+    "role": {
+      "owner": "Owner",
+      "admin": "Administer",
+      "editor": "Editor",
+      "viewer": "Viewer"
+    },
+    "modal": {
+      "title": {
+        "invite_members": "Invite members"
+      },
+      "link": {
+        "invite_title": "Invite link",
+        "copy": "Copy",
+        "turn_off": "Turn off invite links",
+        "update": "Update invite links",
+        "description": "Share a secret link people can use to join your team.",
+        "turn_on": "Turn on invite links",
+        "fail": "Failed to obtain the link, please try again later",
+        "copied_suc": "Copied!",
+        "failed_to_copy": "Failed to copy",
+        "turn_off_fail": "Failed to turn off",
+        "turn_on_fail": "Failed to turn on"
+      },
+      "email": {
+        "invite_title": "Invite by email",
+        "invite": "Invite",
+        "placeholder": "Enter email address",
+        "invited": "Have invited",
+        "in_list": "This user is already in your team."
+      }
+    },
+    "mes": {
+      "invite_suc": "Invited successfully",
+      "invite_fail": "Failed to invite",
+      "update_suc": "Updated successfully",
+      "update_fail": "Failed to update",
+      "transfer_suc": "Successfully transferred",
+      "transfer_fail": "Failed to transfer",
+      "remove_suc": "Successfully removed",
+      "remove_fail": "Failed to remove",
+      "change_role_fail": "Failed to update",
+      "change_role_suc": "Updated successfully"
+    },
+    "page": {
+      "member": "Member",
+      "invite": "Invite",
+      "permission": "Permission",
+      "operation": "Operation",
+      "transfer": "Transfer ownership",
+      "remove": "Remove"
+    },
+    "transfer_modal": {
+      "title": "Are you sure you want to transfer ownership?",
+      "description": "After transferring, your permission will change to administrator.",
+      "transfer": "Transfer",
+      "cancel": "Cancel"
+    },
+    "remove_modal": {
+      "title": "Are you sure you want to remove {{ username }} ?",
+      "description": "After removal, the user will not be able to access the team.",
+      "remove": "Remove",
+      "cancel": "Cancel"
+    },
+    "status": {
+      "pending": "Pending"
+    },
+    "settings": {
+      "allow_editors_invite": "Allow editors and viewers to manage members"
+    }
+  },
+  "copy_failed": "Failed to copy",
+  "team_setting": {
+    "left_panel": {
+      "setting_title": "Team settings",
+      "member": "Member",
+      "leave": "Leave team",
+      "delete": "Delete team"
+    },
+    "leave_modal": {
+      "title": "Are you sure you want to leave this team?",
+      "description": "You will not be able to access any team resources after leaving.",
+      "leave": "Leave",
+      "cancel": "Cancel"
+    },
+    "delete_modal": {
+      "title": "Are you sure you want to delete this team?",
+      "delete": "Delete",
+      "cancel": "Cancel",
+      "desctiption": "The team identifier will be unavailable after deletion, and all members will be removed from this team."
+    },
+    "team_info": {
+      "title": "Team info",
+      "team_name": "Team name",
+      "domain": ".illacloud.com",
+      "existed": "Already existed",
+      "available": "Available",
+      "edit": "Edit",
+      "save": "Save Changes",
+      "adjust_avater": "Adjust the avater",
+      "avater_crop": "Crop",
+      "team_name_empty": "Please enter the team name",
+      "team_id_empty": "Please enter the team identifier",
+      "team_name_placeholder": "Enter the team name",
+      "team_id_placeholder": "Enter the team identifier",
+      "leave_title": "Leave team",
+      "leave_button": "Leave team",
+      "delete_title": "Delete team",
+      "delete_button": "Delete team",
+      "team_domain": "Team Identifier"
+    },
+    "message": {
+      "save_suc": "Successfully saved",
+      "save_fail": "Failed to save"
+    },
+    "mes": {
+      "domain_suc": "Create successfully.",
+      "delete_suc": "Deleted successfully",
+      "delete_fail": "Failed to delete",
+      "leave_suc": "Leave successfully",
+      "leave_fail": "Failed to leave"
+    }
+  },
+  "members": "Members",
+  "invite_new_member": "Invite",
+  "launch": "Launch"
 }

apps/builder/src/i18n/locale/ja-JP.json

@@ -636,6 +636,10 @@
           "email": "郵便",
           "regex": "正規表現",
           "url": "URL"
+        },
+        "height": {
+          "fixed": "Fixed",
+          "auto": "Auto"
         }
       },
       "setter_group": {
@@ -813,7 +817,9 @@
         "x_axis_type": "X軸タイプ",
         "x_axis_value": "X軸",
         "y_axis_name": "通称",
-        "y_axis_title": "Y 軸のタイトル"
+        "y_axis_title": "Y 軸のタイトル",
+        "height": "Height",
+        "min_height": "Min height (px)"
       },
       "setter_tooltip": {
         "action": "コンポーネントに対するアクションは、クエリ、コンポーネントの操作、リソース内のデータの呼び出しなどのアクションをトリガーします。複数の非同期操作が並行して実行されます。",
@@ -979,7 +985,8 @@
       "des": "リクエストに失敗しました。しばらくしてからもう一度お試しください。"
     },
     "back": "ホームページに戻ります",
-    "mobile_forbidden": "For the better editing experience, please visit this page on desktop"
+    "mobile_forbidden": "より良い編集体験を得るには、デスクトップでこのページにアクセスしてください",
+    "back_to_cloud": "ILLA Cloudに戻る"
   },
   "title": "エラ クラウドへようこそ",
   "unfreeze_tips": "キャンバスをフリーズした後、コンポーネントをコンテナ内外にドラッグできます。 (D または K)",
@@ -1217,6 +1224,9 @@
     },
     "modal": {
       "name": "Modal"
+    },
+    "textarea": {
+      "name": "Textarea Input"
     }
   },
   "page": {
@@ -1231,5 +1241,131 @@
     "invalid_tips": "Please enter a value not less than {{ size }}."
   },
   "failed_to_copy": "コピーに失敗しました",
-  "copied": "コピーしました！"
+  "copied": "コピーしました！",
+  "user_management": {
+    "role": {
+      "owner": "オーナー",
+      "admin": " 管理者",
+      "editor": "編集者",
+      "viewer": "見るだけ"
+    },
+    "modal": {
+      "title": {
+        "invite_members": "メンバーを招待"
+      },
+      "link": {
+        "invite_title": "招待リンク",
+        "copy": "コピー",
+        "turn_off": "招待リンクをオフにする",
+        "update": "招待リンクを更新する",
+        "description": "ユーザーがプライベート リンクでチームに参加できるようにする",
+        "turn_on": "招待リンクをオンにする",
+        "fail": "リンクを取得できませんでした。しばらくしてからもう一度お試しください",
+        "copied_suc": "コピーしました！",
+        "failed_to_copy": "コピーに失敗しました",
+        "turn_off_fail": "オフにできませんでした",
+        "turn_on_fail": "オンにできませんでした"
+      },
+      "email": {
+        "invite_title": "メールで招待する",
+        "invite": "招待",
+        "placeholder": "メールアドレスを入力",
+        "invited": "招待しました",
+        "in_list": "このユーザーは既にチーム内にいます"
+      }
+    },
+    "mes": {
+      "invite_suc": "招待しました",
+      "invite_fail": "招待に失敗しました",
+      "update_suc": "更新成功",
+      "update_fail": "更新に失敗しました",
+      "transfer_suc": "譲渡しました",
+      "transfer_fail": "譲渡に失敗しました",
+      "remove_suc": "削除完了",
+      "remove_fail": "削除に失敗しました",
+      "change_role_fail": "更新に失敗しました",
+      "change_role_suc": "更新に成功しました"
+    },
+    "page": {
+      "member": "メンバー",
+      "invite": "招待する",
+      "permission": "権限",
+      "operation": "オペレーション",
+      "transfer": "所有権の譲渡",
+      "remove": "削除"
+    },
+    "transfer_modal": {
+      "title": "所有権を譲渡してもよろしいですか？",
+      "description": "譲渡後、管理者に変更されます。",
+      "transfer": "譲渡",
+      "cancel": "キャンセル"
+    },
+    "remove_modal": {
+      "title": "{{ username }} を削除しますか ?",
+      "description": "削除後、ユーザーはチームにアクセスできなくなります。",
+      "remove": "削除",
+      "cancel": "キャンセル"
+    },
+    "status": {
+      "pending": "処理待ち"
+    },
+    "settings": {
+      "allow_editors_invite": "編集者と閲覧者がメンバーを管理できるようにします"
+    }
+  },
+  "copy_failed": "コピーに失敗しました",
+  "team_setting": {
+    "left_panel": {
+      "setting_title": "チーム設定",
+      "member": "メンバー",
+      "leave": "チームを離れる",
+      "delete": "チームを削除します"
+    },
+    "leave_modal": {
+      "title": "このチームを離れてもよろしいですか？",
+      "description": "このチームを離れると、チームのリソースにアクセスできなくなります。",
+      "leave": "離れる",
+      "cancel": "キャンセル"
+    },
+    "delete_modal": {
+      "title": "このチームを削除してもよろしいですか?",
+      "delete": "삭제",
+      "cancel": "キャンセル",
+      "desctiption": "削除後、チーム ID は使用できなくなり、すべてのメンバーがこのチームから削除されます。"
+    },
+    "team_info": {
+      "title": "チームプロフィール",
+      "team_name": "チームの名",
+      "domain": ".illacloud.com",
+      "existed": "すでに存在していた",
+      "available": "利用可能",
+      "edit": "編集",
+      "save": "保存",
+      "adjust_avater": "アバターを調整する",
+      "avater_crop": "切り取り",
+      "team_name_empty": "チームの名を入力して下さい",
+      "team_id_empty": "チームのIDを入力してください",
+      "team_name_placeholder": "チームの名を入力して下さい",
+      "team_id_placeholder": "チームIDを入力してください",
+      "leave_title": "チームを離れる",
+      "leave_button": "チームを離れる",
+      "delete_title": "删除团队",
+      "delete_button": "チームを削除します",
+      "team_domain": "チームID"
+    },
+    "message": {
+      "save_suc": "保存しました",
+      "save_fail": "保存に失敗しました"
+    },
+    "mes": {
+      "domain_suc": "作成されました。",
+      "delete_suc": "正常に削除されました",
+      "delete_fail": "削除できませんでした",
+      "leave_suc": "離れました",
+      "leave_fail": "離れませんでした"
+    }
+  },
+  "members": "メンバー",
+  "invite_new_member": "メンバーを招待",
+  "launch": "実行"
 }