@dovetail-v2/refine 0.4.0 → 0.4.2-alpha.0

package/dist/shell.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index-31874f77.cjs");
-const common = require("./common-1eb43414.cjs");
+const index = require("./index-9c194830.cjs");
+const common = require("./common-84e75a63.cjs");
 require("@cloudtower/eagle");
 require("@xterm/addon-canvas");
 require("@xterm/addon-fit");
@@ -9,7 +9,6 @@ require("@xterm/addon-search");
 require("@xterm/addon-web-links");
 require("@xterm/addon-webgl");
 require("@xterm/xterm");
-require("copy-to-clipboard");
 require("lodash-es");
 require("react");
 require("@cloudtower/icons-react");

package/dist/shell.js

@@ -1,5 +1,5 @@
-import { S } from "./index-ab97826a.js";
-import { S as S2 } from "./common-241b21f8.js";
+import { S } from "./index-33963e6a.js";
+import { S as S2 } from "./common-b35e289c.js";
 import "@cloudtower/eagle";
 import "@xterm/addon-canvas";
 import "@xterm/addon-fit";
@@ -7,7 +7,6 @@ import "@xterm/addon-search";
 import "@xterm/addon-web-links";
 import "@xterm/addon-webgl";
 import "@xterm/xterm";
-import "copy-to-clipboard";
 import "lodash-es";
 import "react";
 import "@cloudtower/icons-react";

package/dist/types/resource.d.ts

@@ -134,6 +134,8 @@ export type CommonFormConfig<Model extends ResourceModel = ResourceModel> = {
     formDesc?: string | ((action: 'create' | 'edit') => string);
     /** 保存按钮文本 */
     saveButtonText?: string;
+    /** 提交失败时 Footer 的提示文本，如"克隆失败" */
+    formFailedText?: string;
     /**
      * 错误信息格式化函数，待完善
      * @param errorBody 错误信息体

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.4.0",
+  "version": "0.4.2-alpha.0",
   "type": "module",
   "files": [
     "dist",
@@ -10,44 +10,18 @@
   "module": "./dist/refine.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@cloudtower/eagle": "^490.0.1",
-    "@cloudtower/icons-react": "^490.0.1",
-    "@patternfly/react-core": "^5.1.1",
-    "@patternfly/react-log-viewer": "^5.2.0",
-    "@refinedev/core": "^4.47.2",
-    "@refinedev/inferencer": "^4.5.20",
-    "@refinedev/react-hook-form": "^4.8.14",
-    "@xterm/addon-attach": "^0.11.0",
-    "@xterm/addon-canvas": "^0.7.0",
-    "@xterm/addon-fit": "^0.10.0",
-    "@xterm/addon-search": "^0.15.0",
-    "@xterm/addon-web-links": "^0.11.0",
-    "@xterm/addon-webgl": "^0.18.0",
-    "@xterm/xterm": "^5.5.0",
-    "antd": "4.5.0",
     "buffer": "^6.0.3",
     "copy-to-clipboard": "^3.3.3",
-    "dayjs": "^1.11.10",
-    "i18next": "^23.2.3",
-    "js-yaml": "^4.1.0",
-    "k8s-api-provider": "^0.0.36",
-    "ky": "^0.33.3",
-    "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
-    "monaco-editor": "^0.33.0",
-    "monaco-yaml": "^4.0.4",
     "qs": "6.11.2",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "react-hook-form": "^7.50.1",
-    "react-router-dom": "^5.1.2",
-    "sunflower-antd": "^1.0.0-beta.3",
-    "usehooks-ts": "^2.9.1"
+    "sunflower-antd": "^1.0.0-beta.3"
   },
   "devDependencies": {
     "@babel/core": "^7.4.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-typescript": "^7.10.4",
+    "@cloudtower/eagle": "^490.0.1",
+    "@cloudtower/icons-react": "^490.0.1",
     "@kubernetes/client-node": "^0.20.0",
     "@linaria/babel-preset": "^4.5.4",
     "@linaria/core": "^4.5.4",
@@ -55,14 +29,22 @@
     "@linaria/react": "^4.5.4",
     "@linaria/utils": "^4.5.3",
     "@linaria/vite": "^4.5.4",
+    "@patternfly/react-core": "^5.1.1",
+    "@patternfly/react-log-viewer": "^5.2.0",
     "@playwright/test": "^1.39.0",
     "@refinedev/cli": "^2.9.0",
+    "@refinedev/core": "^4.47.2",
+    "@refinedev/inferencer": "^4.5.20",
+    "@refinedev/react-hook-form": "^4.8.14",
     "@rollup/pluginutils": "^4.2.1",
+    "@tanstack/react-query": "^4.35.3",
     "@testing-library/react-hooks": "7",
     "@types/body-parser": "^1.19.5",
+    "@types/history": "^4.7.11",
     "@types/jest": "^29",
     "@types/js-yaml": "^4.0.6",
     "@types/json-schema": "^7.0.13",
+    "@types/lodash": "^4.14.198",
     "@types/lodash-es": "^4.17.9",
     "@types/node": "^18.16.2",
     "@types/qs": "^6.9.8",
@@ -72,28 +54,78 @@
     "@typescript-eslint/eslint-plugin": "^6.7.5",
     "@typescript-eslint/parser": "^6.7.5",
     "@vitejs/plugin-react": "^4.0.0",
+    "@xterm/addon-attach": "^0.11.0",
+    "@xterm/addon-canvas": "^0.7.0",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/addon-search": "^0.15.0",
+    "@xterm/addon-web-links": "^0.11.0",
+    "@xterm/addon-webgl": "^0.18.0",
+    "@xterm/xterm": "^5.5.0",
+    "antd": "4.5.0",
     "body-parser": "^1.20.2",
+    "buffer": "^6.0.3",
+    "copy-to-clipboard": "^3.3.3",
+    "dayjs": "^1.11.10",
     "eslint": "^8.38.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.3.4",
+    "history": "^4.10.1",
+    "i18next": "^23.2.3",
     "jest": "^29",
     "jest-environment-jsdom": "^30.0.0",
+    "js-yaml": "^4.1.0",
+    "json-schema": "^0.4.0",
+    "k8s-api-provider": "^0.0.36",
     "kubernetes-types": "^1.26.0",
+    "ky": "^0.33.3",
+    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
+    "mitt": "^3.0.1",
+    "monaco-editor": "^0.33.0",
+    "monaco-yaml": "^4.0.4",
     "prettier": "2.8.8",
+    "qs": "6.11.2",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "react-hook-form": "^7.50.1",
+    "react-router-dom": "^5.1.2",
     "sass": "1.51.0",
+    "sunflower-antd": "^1.0.0-beta.3",
     "ts-jest": "^29",
+    "usehooks-ts": "^2.9.1",
     "vite": "^4.5.2",
-    "vite-plugin-commonjs": "^0.10.0"
+    "vite-plugin-commonjs": "^0.10.0",
+    "ws": "^8.18.2"
   },
   "peerDependencies": {
     "@cloudtower/eagle": "^490.0.1",
     "@cloudtower/icons-react": "^490.0.1",
+    "@patternfly/react-core": "^5.1.1",
+    "@patternfly/react-log-viewer": "^5.2.0",
     "@refinedev/core": "^4.47.2",
+    "@refinedev/inferencer": "^4.5.20",
+    "@refinedev/react-hook-form": "^4.8.14",
+    "@xterm/addon-attach": "^0.11.0",
+    "@xterm/addon-canvas": "^0.7.0",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/addon-search": "^0.15.0",
+    "@xterm/addon-web-links": "^0.11.0",
+    "@xterm/addon-webgl": "^0.18.0",
+    "@xterm/xterm": "^5.5.0",
     "antd": "4.5.0",
+    "dayjs": "^1.11.10",
     "i18next": "^23.2.3",
+    "js-yaml": "^4.1.0",
+    "k8s-api-provider": "^0.0.36",
+    "ky": "^0.33.3",
+    "lodash-es": "^4.17.21",
+    "monaco-editor": "^0.33.0",
+    "monaco-yaml": "^4.0.4",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "react-router-dom": "^5.1.2"
+    "react-hook-form": "^7.50.1",
+    "react-router-dom": "^5.1.2",
+    "usehooks-ts": "^2.9.1"
   },
   "scripts": {
     "dev": "refine dev",
@@ -103,7 +135,7 @@
     "refine": "refine",
     "unit-test": "jest",
     "playwright-test": "npx playwright test --workers 1",
-    "test": "yarn unit-test && yarn playwright-test",
+    "test": "pnpm unit-test && pnpm playwright-test",
     "lint": "eslint src --ext .ts,.tsx"
   },
   "browserslist": {

package/dist/PodShell-43c7028e.cjs

@@ -1,216 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const common = require("./common-1eb43414.cjs");
-const eagle = require("@cloudtower/eagle");
-const React = require("react");
-const index = require("./index-31874f77.cjs");
-const buffer = require("buffer");
-require("@xterm/addon-canvas");
-require("@xterm/addon-fit");
-require("@xterm/addon-search");
-require("@xterm/addon-web-links");
-require("@xterm/addon-webgl");
-require("@xterm/xterm");
-require("copy-to-clipboard");
-require("lodash-es");
-require("@cloudtower/icons-react");
-function addParam(url, key, val) {
-  let out = url + (url.includes("?") ? "&" : "?");
-  if (!Array.isArray(val)) {
-    val = [val];
-  }
-  out += val.map((v) => {
-    if (v === null) {
-      return `${encodeURIComponent(key)}`;
-    } else {
-      return `${encodeURIComponent(key)}=${encodeURIComponent(v)}`;
-    }
-  }).join("&");
-  return out;
-}
-function addParams(url, params) {
-  if (params && typeof params === "object") {
-    Object.keys(params).forEach((key) => {
-      url = addParam(url, key, params[key]);
-    });
-  }
-  return url;
-}
-function base64Encode(str, alphabet = "normal") {
-  let buf;
-  if (str === null || typeof str === "undefined") {
-    return str;
-  }
-  if (typeof buffer.Buffer.from === "function" && buffer.Buffer.from !== Uint8Array.from) {
-    buf = buffer.Buffer.from(str);
-  } else {
-    buf = new buffer.Buffer(str);
-  }
-  if (alphabet === "url") {
-    const m = {
-      "+": "-",
-      "/": "_"
-    };
-    return buf.toString("base64").replace(/[+/]|=+$/g, (char) => m[char] || "");
-  }
-  return buf.toString("base64");
-}
-function base64DecodeToBuffer(str) {
-  if (str === null || typeof str === "undefined") {
-    return str;
-  }
-  if (typeof buffer.Buffer.from === "function" && buffer.Buffer.from !== Uint8Array.from) {
-    return buffer.Buffer.from(str, "base64");
-  } else {
-    return new buffer.Buffer(str, "base64");
-  }
-}
-function base64Decode(str) {
-  return !str ? str : base64DecodeToBuffer(str.replace(/[-_]/g, (char) => char === "-" ? "+" : "/")).toString();
-}
-var OS = /* @__PURE__ */ ((OS2) => {
-  OS2["Linux"] = "linux";
-  OS2["Windows"] = "windows";
-  return OS2;
-})(OS || {});
-const BACKUP_SHELLS = [
-  "windows",
-  "linux"
-  /* Linux */
-];
-const COMMANDS = {
-  [
-    "linux"
-    /* Linux */
-  ]: [
-    "/bin/sh",
-    "-c",
-    'TERM=xterm-256color; export TERM; [ -x /bin/bash ] && ([ -x /usr/bin/script ] && /usr/bin/script -q -c "/bin/bash" /dev/null || exec /bin/bash) || exec /bin/sh'
-  ],
-  [
-    "windows"
-    /* Windows */
-  ]: ["cmd"]
-};
-const PodShell = React.forwardRef(
-  function PodShell2(props, ref) {
-    const { pod, basePath, onSocketStatusChange } = props;
-    const id = pod.id;
-    const [namespace, name] = React.useMemo(() => id.split("/"), [id]);
-    const shellRef = React.useRef(null);
-    const errorMsgRef = React.useRef("");
-    const [osIndex, setOsIndex] = React.useState(0);
-    const [container, setContainer] = React.useState("");
-    const containers = React.useMemo(() => {
-      var _a, _b;
-      return (((_a = pod == null ? void 0 : pod._rawYaml.status) == null ? void 0 : _a.containerStatuses) || []).concat(((_b = pod == null ? void 0 : pod._rawYaml.status) == null ? void 0 : _b.initContainerStatuses) || []).map((containerStatus) => containerStatus.name);
-    }, [pod]);
-    const url = React.useMemo(() => {
-      const os = BACKUP_SHELLS[osIndex];
-      const protocol = location.protocol.includes("https") ? "wss" : "ws";
-      const url2 = container && os ? addParams(
-        `${protocol}://${location.host}${basePath}/api/v1/namespaces/${namespace}/pods/${name}/exec`,
-        {
-          container,
-          stdout: "true",
-          stdin: "true",
-          stderr: "true",
-          tty: "true",
-          command: COMMANDS[
-            os || "linux"
-            /* Linux */
-          ]
-        }
-      ) : "";
-      return url2;
-    }, [container, name, namespace, osIndex, basePath]);
-    const onSocketClose = React.useCallback(
-      (socket, term) => {
-        var _a, _b;
-        if (errorMsgRef.current) {
-          if (osIndex + 1 < BACKUP_SHELLS.length) {
-            setOsIndex(osIndex + 1);
-          } else {
-            term == null ? void 0 : term.writeln(`\x1B[38;2;255;82;82m${errorMsgRef.current}`);
-            (_a = shellRef.current) == null ? void 0 : _a.setSocketStatus(common.SocketStatus.Disconnected);
-            errorMsgRef.current = "";
-          }
-        } else {
-          (_b = shellRef.current) == null ? void 0 : _b.setSocketStatus(common.SocketStatus.Disconnected);
-        }
-      },
-      [osIndex]
-    );
-    const onSocketMessage = React.useCallback(
-      (e, socket, term) => {
-        const type = e.data.substr(0, 1);
-        const msg = base64Decode(e.data.substr(1));
-        if (`${type}` === "1") {
-          term == null ? void 0 : term.write(msg);
-        } else {
-          if (`${type}` === "3") {
-            errorMsgRef.current = msg;
-          }
-        }
-      },
-      []
-    );
-    const fit = React.useCallback(({ rows, cols }) => {
-      var _a;
-      const message = `${"4"}${base64Encode(
-        JSON.stringify({
-          Width: Math.floor(cols),
-          Height: Math.floor(rows)
-        })
-      )}`;
-      (_a = shellRef.current) == null ? void 0 : _a.send(message);
-    }, []);
-    const encode = React.useCallback((input) => `${"0"}${base64Encode(input)}`, []);
-    React.useEffect(() => {
-      if (!container && containers.length) {
-        setContainer(containers[0]);
-      }
-    }, [containers, container]);
-    React.useImperativeHandle(
-      ref,
-      () => ({
-        getAllTerminalContents: () => {
-          var _a;
-          return ((_a = shellRef.current) == null ? void 0 : _a.getAllTerminalContents()) || [];
-        }
-      }),
-      []
-    );
-    return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
-      index.Shell,
-      {
-        ref: shellRef,
-        url,
-        protocols: "base64.channel.k8s.io",
-        encode,
-        fit,
-        toolbarLeftSlot: /* @__PURE__ */ common.jsxRuntimeExports.jsx(
-          eagle.Select,
-          {
-            input: {
-              value: container,
-              onChange(value) {
-                setContainer(value);
-              }
-            },
-            style: {
-              width: "256px"
-            },
-            size: "small",
-            children: containers.map((containerName) => /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.AntdOption, { value: containerName, label: containerName, children: containerName }, containerName))
-          }
-        ),
-        onSocketMessage,
-        onSocketClose,
-        onSocketStatusChange
-      }
-    );
-  }
-);
-exports.OS = OS;
-exports.PodShell = PodShell;

package/dist/PodShell-76331418.js

@@ -1,216 +0,0 @@
-import { S as SocketStatus, j as jsxRuntimeExports } from "./common-241b21f8.js";
-import { Select, AntdOption } from "@cloudtower/eagle";
-import React, { useMemo, useRef, useState, useCallback, useEffect, useImperativeHandle } from "react";
-import { S as Shell } from "./index-ab97826a.js";
-import { Buffer } from "buffer";
-import "@xterm/addon-canvas";
-import "@xterm/addon-fit";
-import "@xterm/addon-search";
-import "@xterm/addon-web-links";
-import "@xterm/addon-webgl";
-import "@xterm/xterm";
-import "copy-to-clipboard";
-import "lodash-es";
-import "@cloudtower/icons-react";
-function addParam(url, key, val) {
-  let out = url + (url.includes("?") ? "&" : "?");
-  if (!Array.isArray(val)) {
-    val = [val];
-  }
-  out += val.map((v) => {
-    if (v === null) {
-      return `${encodeURIComponent(key)}`;
-    } else {
-      return `${encodeURIComponent(key)}=${encodeURIComponent(v)}`;
-    }
-  }).join("&");
-  return out;
-}
-function addParams(url, params) {
-  if (params && typeof params === "object") {
-    Object.keys(params).forEach((key) => {
-      url = addParam(url, key, params[key]);
-    });
-  }
-  return url;
-}
-function base64Encode(str, alphabet = "normal") {
-  let buf;
-  if (str === null || typeof str === "undefined") {
-    return str;
-  }
-  if (typeof Buffer.from === "function" && Buffer.from !== Uint8Array.from) {
-    buf = Buffer.from(str);
-  } else {
-    buf = new Buffer(str);
-  }
-  if (alphabet === "url") {
-    const m = {
-      "+": "-",
-      "/": "_"
-    };
-    return buf.toString("base64").replace(/[+/]|=+$/g, (char) => m[char] || "");
-  }
-  return buf.toString("base64");
-}
-function base64DecodeToBuffer(str) {
-  if (str === null || typeof str === "undefined") {
-    return str;
-  }
-  if (typeof Buffer.from === "function" && Buffer.from !== Uint8Array.from) {
-    return Buffer.from(str, "base64");
-  } else {
-    return new Buffer(str, "base64");
-  }
-}
-function base64Decode(str) {
-  return !str ? str : base64DecodeToBuffer(str.replace(/[-_]/g, (char) => char === "-" ? "+" : "/")).toString();
-}
-var OS = /* @__PURE__ */ ((OS2) => {
-  OS2["Linux"] = "linux";
-  OS2["Windows"] = "windows";
-  return OS2;
-})(OS || {});
-const BACKUP_SHELLS = [
-  "windows",
-  "linux"
-  /* Linux */
-];
-const COMMANDS = {
-  [
-    "linux"
-    /* Linux */
-  ]: [
-    "/bin/sh",
-    "-c",
-    'TERM=xterm-256color; export TERM; [ -x /bin/bash ] && ([ -x /usr/bin/script ] && /usr/bin/script -q -c "/bin/bash" /dev/null || exec /bin/bash) || exec /bin/sh'
-  ],
-  [
-    "windows"
-    /* Windows */
-  ]: ["cmd"]
-};
-const PodShell = React.forwardRef(
-  function PodShell2(props, ref) {
-    const { pod, basePath, onSocketStatusChange } = props;
-    const id = pod.id;
-    const [namespace, name] = useMemo(() => id.split("/"), [id]);
-    const shellRef = useRef(null);
-    const errorMsgRef = useRef("");
-    const [osIndex, setOsIndex] = useState(0);
-    const [container, setContainer] = useState("");
-    const containers = useMemo(() => {
-      var _a, _b;
-      return (((_a = pod == null ? void 0 : pod._rawYaml.status) == null ? void 0 : _a.containerStatuses) || []).concat(((_b = pod == null ? void 0 : pod._rawYaml.status) == null ? void 0 : _b.initContainerStatuses) || []).map((containerStatus) => containerStatus.name);
-    }, [pod]);
-    const url = useMemo(() => {
-      const os = BACKUP_SHELLS[osIndex];
-      const protocol = location.protocol.includes("https") ? "wss" : "ws";
-      const url2 = container && os ? addParams(
-        `${protocol}://${location.host}${basePath}/api/v1/namespaces/${namespace}/pods/${name}/exec`,
-        {
-          container,
-          stdout: "true",
-          stdin: "true",
-          stderr: "true",
-          tty: "true",
-          command: COMMANDS[
-            os || "linux"
-            /* Linux */
-          ]
-        }
-      ) : "";
-      return url2;
-    }, [container, name, namespace, osIndex, basePath]);
-    const onSocketClose = useCallback(
-      (socket, term) => {
-        var _a, _b;
-        if (errorMsgRef.current) {
-          if (osIndex + 1 < BACKUP_SHELLS.length) {
-            setOsIndex(osIndex + 1);
-          } else {
-            term == null ? void 0 : term.writeln(`\x1B[38;2;255;82;82m${errorMsgRef.current}`);
-            (_a = shellRef.current) == null ? void 0 : _a.setSocketStatus(SocketStatus.Disconnected);
-            errorMsgRef.current = "";
-          }
-        } else {
-          (_b = shellRef.current) == null ? void 0 : _b.setSocketStatus(SocketStatus.Disconnected);
-        }
-      },
-      [osIndex]
-    );
-    const onSocketMessage = useCallback(
-      (e, socket, term) => {
-        const type = e.data.substr(0, 1);
-        const msg = base64Decode(e.data.substr(1));
-        if (`${type}` === "1") {
-          term == null ? void 0 : term.write(msg);
-        } else {
-          if (`${type}` === "3") {
-            errorMsgRef.current = msg;
-          }
-        }
-      },
-      []
-    );
-    const fit = useCallback(({ rows, cols }) => {
-      var _a;
-      const message = `${"4"}${base64Encode(
-        JSON.stringify({
-          Width: Math.floor(cols),
-          Height: Math.floor(rows)
-        })
-      )}`;
-      (_a = shellRef.current) == null ? void 0 : _a.send(message);
-    }, []);
-    const encode = useCallback((input) => `${"0"}${base64Encode(input)}`, []);
-    useEffect(() => {
-      if (!container && containers.length) {
-        setContainer(containers[0]);
-      }
-    }, [containers, container]);
-    useImperativeHandle(
-      ref,
-      () => ({
-        getAllTerminalContents: () => {
-          var _a;
-          return ((_a = shellRef.current) == null ? void 0 : _a.getAllTerminalContents()) || [];
-        }
-      }),
-      []
-    );
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(
-      Shell,
-      {
-        ref: shellRef,
-        url,
-        protocols: "base64.channel.k8s.io",
-        encode,
-        fit,
-        toolbarLeftSlot: /* @__PURE__ */ jsxRuntimeExports.jsx(
-          Select,
-          {
-            input: {
-              value: container,
-              onChange(value) {
-                setContainer(value);
-              }
-            },
-            style: {
-              width: "256px"
-            },
-            size: "small",
-            children: containers.map((containerName) => /* @__PURE__ */ jsxRuntimeExports.jsx(AntdOption, { value: containerName, label: containerName, children: containerName }, containerName))
-          }
-        ),
-        onSocketMessage,
-        onSocketClose,
-        onSocketStatusChange
-      }
-    );
-  }
-);
-export {
-  OS,
-  PodShell
-};