fix: type isssue

.env.example

@@ -51,7 +51,7 @@ VITE_ADMIN_URL=http://localhost:3100
 
 # Backend URLs
 VITE_BACKEND_GQL_URL=http://localhost:3170/graphql
-VITE_BACKEND_WS_URL=wss://localhost:3170/graphql
+VITE_BACKEND_WS_URL=ws://localhost:3170/graphql
 VITE_BACKEND_API_URL=http://localhost:3170/v1
 
 # Terms Of Service And Privacy Policy Links (Optional)

packages/hoppscotch-common/locales/cn.json

@@ -19,7 +19,7 @@
     "edit": "编辑",
     "filter": "过滤",
     "go_back": "返回",
-    "go_forward": "Go forward",
+    "go_forward": "前进",
     "group_by": "分组方式",
     "label": "标签",
     "learn_more": "了解更多",
@@ -40,9 +40,9 @@
     "start": "开始",
     "starting": "正在开始",
     "stop": "停止",
-    "to_close": "以关闭",
+    "to_close": "关闭",
-    "to_navigate": "以定位",
+    "to_navigate": "定位",
-    "to_select": "以选择",
+    "to_select": "选择",
     "turn_off": "关闭",
     "turn_on": "开启",
     "undo": "撤消",
@@ -118,16 +118,16 @@
   },
   "collection": {
     "created": "集合已创建",
-    "different_parent": "Cannot reorder collection with different parent",
+    "different_parent": "不能用不同的父类来重新排序集合",
     "edit": "编辑集合",
     "invalid_name": "请提供有效的集合名称",
-    "invalid_root_move": "Collection already in the root",
+    "invalid_root_move": "该集合已经在根级了",
-    "moved": "Moved Successfully",
+    "moved": "移动完成",
     "my_collections": "我的集合",
     "name": "我的新集合",
     "name_length_insufficient": "集合名字至少需要 3 个字符",
     "new": "新建集合",
-    "order_changed": "Collection Order Updated",
+    "order_changed": "集合顺序已更新",
     "renamed": "集合已更名",
     "request_in_use": "请求正在使用中",
     "save_as": "另存为",
@@ -147,7 +147,7 @@
     "remove_team": "你确定要删除该团队吗？",
     "remove_telemetry": "你确定要退出遥测服务吗？",
     "request_change": "你确定你要放弃当前的请求，未保存的修改将被丢失。",
-    "save_unsaved_tab": "Do you want to save changes made in this tab?",
+    "save_unsaved_tab": "你想保存在此标签页中所作的修改吗？",
     "sync": "您确定要同步该工作区吗？"
   },
   "count": {
@@ -177,7 +177,7 @@
     "members": "团队为空",
     "parameters": "该请求没有任何参数",
     "pending_invites": "此团队无待办邀请",
-    "profile": "登录以查看你的个人档案",
+    "profile": "登录以查看你的个人资料",
     "protocols": "协议为空",
     "schema": "连接至 GraphQL 端点",
     "shortcodes": "Shortcodes 为空",
@@ -209,7 +209,7 @@
     "browser_support_sse": "该浏览器似乎不支持 SSE。",
     "check_console_details": "检查控制台日志以获悉详情",
     "curl_invalid_format": "cURL 格式不正确",
-    "danger_zone": "Danger zone",
+    "danger_zone": "危险区域",
     "delete_account": "您的帐号目前为这些团队的拥有者：",
     "delete_account_description": "您在删除帐号前必须先将您自己从团队中移除、转移拥有权，或是删除团队。",
     "empty_req_name": "空请求名称",
@@ -219,7 +219,7 @@
     "incorrect_email": "电子邮箱错误",
     "invalid_link": "无效链接",
     "invalid_link_description": "你点击的链接无效或已过期。",
-    "json_parsing_failed": "Invalid JSON",
+    "json_parsing_failed": "不合法的 JSON",
     "json_prettify_invalid_body": "无法美化无效的请求头，处理 JSON 语法错误并重试",
     "network_error": "好像发生了网络错误，请重试。",
     "network_fail": "无法发送请求",
@@ -316,14 +316,14 @@
     "zen_mode": "ZEN 模式"
   },
   "modal": {
-    "close_unsaved_tab": "You have unsaved changes",
+    "close_unsaved_tab": "有未保存的变更",
     "collections": "集合",
     "confirm": "确认",
     "edit_request": "编辑请求",
     "import_export": "导入/导出"
   },
   "mqtt": {
-    "already_subscribed": "您已经订阅了此主題。",
+    "already_subscribed": "您已经订阅了此主题。",
     "clean_session": "清除会话",
     "clear_input": "清除输入",
     "clear_input_on_send": "发送后清除输入",
@@ -355,7 +355,7 @@
   "navigation": {
     "doc": "文档",
     "graphql": "GraphQL",
-    "profile": "个人档案",
+    "profile": "个人资料",
     "realtime": "实时",
     "rest": "REST",
     "settings": "设置"
@@ -377,7 +377,7 @@
     "owner_description": "所有者可以添加、编辑和删除请求、集合及团队成员。",
     "roles": "角色",
     "roles_description": "角色用以控制共享集合的访问权限。",
-    "updated": "档案已更新",
+    "updated": "已更新",
     "viewer": "查看者",
     "viewer_description": "查看者只可查看与使用请求。"
   },
@@ -396,8 +396,8 @@
       "text": "文字"
     },
     "copy_link": "复制链接",
-    "different_collection": "Cannot reorder requests from different collections",
+    "different_collection": "不能对来自不同集合的请求进行重新排序",
-    "duplicated": "Request duplicated",
+    "duplicated": "重复的请求",
     "duration": "持续时间",
     "enter_curl": "输入 cURL",
     "generate_code": "生成代码",
@@ -405,10 +405,10 @@
     "header_list": "请求头列表",
     "invalid_name": "请提供请求名称",
     "method": "方法",
-    "moved": "Request moved",
+    "moved": "请求移动完成",
     "name": "请求名称",
     "new": "新请求",
-    "order_changed": "Request Order Updated",
+    "order_changed": "请求顺序更新完成",
     "override": "覆盖",
     "override_help": "设置 <kbd>Content-Type</kbd> 头",
     "overriden": "覆盖",
@@ -479,10 +479,10 @@
     "language": "语言",
     "light_mode": "亮色",
     "official_proxy_hosting": "官方代理由 Hoppscotch 托管。",
-    "profile": "个人档案",
+    "profile": "个人资料",
-    "profile_description": "更新你的档案详情",
+    "profile_description": "更新你的资料",
     "profile_email": "电子邮箱地址",
-    "profile_name": "档案名称",
+    "profile_name": "名称",
     "proxy": "网络代理",
     "proxy_url": "代理网址",
     "proxy_use_toggle": "使用代理中间件发送请求",
@@ -532,7 +532,7 @@
       "documentation": "前往文档页面",
       "forward": "前往下一页面",
       "graphql": "前往 GraphQL 页面",
-      "profile": "前往个人档案页面",
+      "profile": "前往个人资料页面",
       "realtime": "前往实时页面",
       "rest": "前往 REST 页面",
       "settings": "前往设置页面",
@@ -574,7 +574,7 @@
   },
   "socketio": {
     "communication": "通讯",
-    "connection_not_authorized": "此SocketIO连接未使用任何验证。",
+    "connection_not_authorized": "此 SocketIO 连接未使用任何验证。",
     "event_name": "事件名称",
     "events": "事件",
     "log": "日志",
@@ -614,12 +614,12 @@
     "none": "无",
     "nothing_found": "没有找到",
     "published_error": "将信息：{topic}发布至主题：{message}时发生错误",
-    "published_message": "已将此信息：{message}发布至主题：{topic}",
+    "published_message": "已将此信息：{message} 发布至主题：{topic}",
     "reconnection_error": "重连失败",
-    "subscribed_failed": "无法订阅此主題：{topic}",
+    "subscribed_failed": "无法订阅此主题：{topic}",
-    "subscribed_success": "成功订阅此主題：{topic}",
+    "subscribed_success": "成功订阅此主题：{topic}",
-    "unsubscribed_failed": "无法取消订阅此主題：{topic}",
+    "unsubscribed_failed": "无法取消订阅此主题：{topic}",
-    "unsubscribed_success": "成功取消订阅此主題：{topic}",
+    "unsubscribed_success": "成功取消订阅此主题：{topic}",
     "waiting_send_request": "等待发送请求"
   },
   "support": {
@@ -639,7 +639,7 @@
     "body": "请求体",
     "collections": "集合",
     "documentation": "帮助文档",
-    "environments": "Environments",
+    "environments": "环境",
     "headers": "请求头",
     "history": "历史记录",
     "mqtt": "MQTT",
@@ -664,7 +664,7 @@
     "email_do_not_match": "邮箱无法与你的帐户信息匹配。请联系你的团队者。",
     "exit": "退出团队",
     "exit_disabled": "团队所有者无法退出团队",
-    "invalid_coll_id": "Invalid collection ID",
+    "invalid_coll_id": "无效的集合 ID",
     "invalid_email_format": "电子邮箱格式无效",
     "invalid_id": "无效的团队 ID，请联系你的团队者。",
     "invalid_invite_link": "无效的邀请链接",
@@ -688,7 +688,7 @@
     "member_removed": "用户已移除",
     "member_role_updated": "用户角色已更新",
     "members": "成员",
-    "more_members": "+{count} more",
+    "more_members": "+{count} 更多",
     "name_length_insufficient": "团队名称至少为 6 个字符",
     "name_updated": "团队名称已更新",
     "new": "新团队",
@@ -696,13 +696,13 @@
     "new_name": "我的新团队",
     "no_access": "你没有编辑集合的权限",
     "no_invite_found": "未找到邀请。请联系你的团队者。",
-    "no_request_found": "Request not found.",
+    "no_request_found": "请求不存在",
     "not_found": "没有找到团队，请联系您的团队所有者。",
     "not_valid_viewer": "你不是有效的查看者。请联系你的团队者。",
-    "parent_coll_move": "Cannot move collection to a child collection",
+    "parent_coll_move": "不能将集合移动到一个子集合",
     "pending_invites": "待办邀请",
     "permissions": "权限",
-    "same_target_destination": "Same target and destination",
+    "same_target_destination": "目标相同",
     "saved": "团队已保存",
     "select_a_team": "选择团队",
     "title": "团队",
@@ -732,9 +732,9 @@
     "url": "URL"
   },
   "workspace": {
-    "change": "Change workspace",
+    "change": "切换工作空间",
-    "personal": "My Workspace",
+    "personal": "我的工作空间",
-    "team": "Team Workspace",
+    "team": "团队工作空间",
-    "title": "Workspaces"
+    "title": "工作空间"
   }
 }

packages/hoppscotch-common/src/components/environments/my/Details.vue

@@ -165,8 +165,8 @@ const props = withDefaults(
   defineProps<{
     show: boolean
     action: "edit" | "new"
-    editingEnvironmentIndex: number | "Global" | null
+    editingEnvironmentIndex?: number | "Global" | null
-    editingVariableName: string | null
+    editingVariableName?: string | null
     envVars?: () => Environment["variables"]
   }>(),
   {

packages/hoppscotch-common/src/components/environments/teams/Details.vue

@@ -140,7 +140,7 @@ import * as A from "fp-ts/Array"
 import * as O from "fp-ts/Option"
 import * as TE from "fp-ts/TaskEither"
 import { flow, pipe } from "fp-ts/function"
-import { parseTemplateStringE } from "@hoppscotch/data"
+import { Environment, parseTemplateStringE } from "@hoppscotch/data"
 import { refAutoReset } from "@vueuse/core"
 import { clone } from "lodash-es"
 import { useToast } from "@composables/toast"
@@ -173,16 +173,20 @@ const props = withDefaults(
   defineProps<{
     show: boolean
     action: "edit" | "new"
-    editingEnvironment: TeamEnvironment | null
+    editingEnvironment?: TeamEnvironment | null
     editingTeamId: string | undefined
-    editingVariableName: string | null
+    editingVariableName?: string | null
-    isViewer: boolean
+    isViewer?: boolean
+    envVars?: () => Environment["variables"]
   }>(),
   {
     show: false,
     action: "edit",
     editingEnvironment: null,
     editingTeamId: "",
+    editingVariableName: null,
+    isViewer: false,
+    envVars: () => [],
   }
 )
 
@@ -226,10 +230,16 @@ watch(
   () => props.show,
   (show) => {
     if (show) {
-      if (props.editingEnvironment === null) {
+      if (props.action === "new") {
         name.value = null
-        vars.value = []
+        vars.value = pipe(
-      } else {
+          props.envVars() ?? [],
+          A.map((e: { key: string; value: string }) => ({
+            id: idTicker.value++,
+            env: clone(e),
+          }))
+        )
+      } else if (props.editingEnvironment !== null) {
         name.value = props.editingEnvironment.environment.name ?? null
         vars.value = pipe(
           props.editingEnvironment.environment.variables ?? [],

packages/hoppscotch-common/src/components/http/TestResult.vue

@@ -197,11 +197,20 @@
       />
     </div>
     <EnvironmentsMyDetails
-      :show="showModalDetails"
+      :show="showMyEnvironmentDetailsModal"
       action="new"
       :env-vars="getAdditionVars"
       @hide-modal="displayModalAdd(false)"
     />
+    <EnvironmentsTeamsDetails
+      :show="showTeamEnvironmentDetailsModal"
+      action="new"
+      :env-vars="getAdditionVars"
+      :editing-team-id="
+        workspace.type === 'team' ? workspace.teamID : undefined
+      "
+      @hide-modal="displayModalAdd(false)"
+    />
   </div>
 </template>
 
@@ -225,6 +234,7 @@ import IconClose from "~icons/lucide/x"
 
 import { useColorMode } from "~/composables/theming"
 import { useVModel } from "@vueuse/core"
+import { workspaceStatus$ } from "~/newstore/workspace"
 
 const props = defineProps<{
   modelValue: HoppTestResult | null | undefined
@@ -239,10 +249,15 @@ const testResults = useVModel(props, "modelValue", emit)
 const t = useI18n()
 const colorMode = useColorMode()
 
-const showModalDetails = ref(false)
+const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" })
+
+const showMyEnvironmentDetailsModal = ref(false)
+const showTeamEnvironmentDetailsModal = ref(false)
 
 const displayModalAdd = (shouldDisplay: boolean) => {
-  showModalDetails.value = shouldDisplay
+  if (workspace.value.type === "personal")
+    showMyEnvironmentDetailsModal.value = shouldDisplay
+  else showTeamEnvironmentDetailsModal.value = shouldDisplay
 }
 
 /**