@choerodon/asgard - npm Package Compare versions

Comparing version 0.24.0 to 0.25.0

lib/common/json-format/JsonFormatter.js

@@ -13,3 +13,3 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
@@ -16,0 +16,0 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }

lib/components/mouseOverWrapper/MouseOverWrapper.js

@@ -20,3 +20,3 @@ import "choerodon-ui/lib/tooltip/style";
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
@@ -23,0 +23,0 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }

lib/index.js

@@ -22,3 +22,3 @@ import "choerodon-ui/pro/lib/modal-container/style";
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
@@ -25,0 +25,0 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }

lib/routes/saga-instance/index.js

 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 import { asyncRouter, nomatch } from '@choerodon/boot';
+import { PermissionRoute } from '@choerodon/master';
 var SagaInstance = asyncRouter(function () {
   return import("./SagaInstance");
 });
+var _service = {
+  site: ['choerodon.code.site.manager.saga-manager.saga-instance.ps.default'],
+  organization: ['choerodon.code.organization.manager.saga-instance.ps.default'],
+  project: ['choerodon.code.project.operation.saga-instance.ps.default']
+};
 
 var Index = function Index(_ref) {
   var match = _ref.match;
-  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
+  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PermissionRoute, {
     exact: true,
     path: match.url,
-    component: SagaInstance
+    component: SagaInstance,
+    service: function service(type) {
+      return _service[type] || ['choerodon.code.site.manager.saga-manager.saga-instance.ps.default'];
+    }
   }), /*#__PURE__*/React.createElement(Route, {
@@ -15,0 +24,0 @@ path: "*",

lib/routes/saga-instance/SagaInstance.js

@@ -32,2 +32,4 @@ import "choerodon-ui/lib/button/style";
 import { withRouter } from 'react-router-dom';
+import { ThemeWrap } from '@choerodon/master';
+import classnames from 'classnames';
 import { FormattedMessage } from 'react-intl';
@@ -115,2 +117,6 @@ import MouseOverWrapper from "../../components/mouseOverWrapper";
     init();
+
+    if (AppState.getCurrentTheme === 'theme4') {
+      import("./style/saga-theme4.less");
+    }
   }, []);
@@ -167,3 +173,2 @@ useEffect(function () {
   var renderTooltipTitle = function renderTooltipTitle(record) {
-    var id = record.get('viewId');
     var sagaCode = record.get('sagaCode');
@@ -180,10 +185,2 @@ var level = record.get('level');
     }, /*#__PURE__*/React.createElement(FormattedMessage, {
-      id: "saga-instance.saga.instance.id"
-    })), /*#__PURE__*/React.createElement("div", {
-      className: "c7n-saga-instance-table-tooltip-item-value"
-    }, "#", id)), /*#__PURE__*/React.createElement("div", {
-      className: "c7n-saga-instance-table-tooltip-item"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "c7n-saga-instance-table-tooltip-item-title"
-    }, /*#__PURE__*/React.createElement(FormattedMessage, {
       id: "saga-instance.saga.instance.sagaCode"
@@ -332,2 +329,6 @@ })), /*#__PURE__*/React.createElement("div", {
     }, /*#__PURE__*/React.createElement(Column, {
+      name: "searchId",
+      tooltip: "overflow",
+      className: "c7n-asgard-table-cell"
+    }), /*#__PURE__*/React.createElement(Column, {
       name: "sagaCode",
@@ -370,2 +371,3 @@ className: "c7n-asgard-table-cell-click",
       name: "refId",
+      tooltip: "overflow",
       className: "c7n-asgard-table-cell"
@@ -372,0 +374,0 @@ }), /*#__PURE__*/React.createElement(Column, {

lib/routes/saga-instance/stores/SagaInstanceDataSet.js

@@ -12,2 +12,5 @@ import "choerodon-ui/pro/lib/data-set/style";
   });
+  var searchId = intl.formatMessage({
+    id: "".concat(intlPrefix, ".searchId")
+  });
   var status = intl.formatMessage({
@@ -50,2 +53,5 @@ id: "".concat(intlPrefix, ".status")
     fields: [{
+      name: 'searchId',
+      label: searchId
+    }, {
       name: 'sagaCode',
@@ -76,2 +82,5 @@ type: 'string',
     queryFields: [{
+      name: 'searchId',
+      label: searchId
+    }, {
       name: 'sagaCode',
@@ -78,0 +87,0 @@ type: 'string',

lib/routes/saga/index.js

 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 import { asyncRouter, nomatch } from '@choerodon/boot';
+import { PermissionRoute } from '@choerodon/master';
 var index = asyncRouter(function () {
@@ -10,6 +11,7 @@ return import("./Saga");
   var match = _ref.match;
-  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
+  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PermissionRoute, {
     exact: true,
     path: match.url,
-    component: index
+    component: index,
+    service: ['choerodon.code.site.manager.saga-manager.saga.ps.default']
   }), /*#__PURE__*/React.createElement(Route, {
@@ -16,0 +18,0 @@ path: "*",

lib/routes/saga/SagaImg.js

@@ -6,3 +6,3 @@ import "choerodon-ui/lib/icon/style";
 
-var _class, _temp;
+var _class;
 
@@ -31,3 +31,3 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
@@ -47,3 +47,3 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-var SagaImg = injectIntl(_class = (_temp = /*#__PURE__*/function (_Component) {
+var SagaImg = injectIntl(_class = /*#__PURE__*/function (_Component) {
   _inherits(SagaImg, _Component);
@@ -53,22 +53,2 @@
 
-  _createClass(SagaImg, [{
-    key: "getInitState",
-    value: function getInitState() {
-      var _this$props = this.props,
-          instance = _this$props.instance,
-          data = _this$props.data;
-      return {
-        showDetail: false,
-        task: {},
-        json: '',
-        lineData: {},
-        activeCode: '',
-        activeTab: instance ? 'run' : '',
-        jsonTitle: false,
-        // 是否展示input output
-        data: data
-      };
-    }
-  }]);
-
   function SagaImg(props) {
@@ -228,5 +208,5 @@ var _this;
       var id = _this.state.task.id;
-      var _this$props2 = _this.props,
-          formatMessage = _this$props2.intl.formatMessage,
-          unLock = _this$props2.unLock;
+      var _this$props = _this.props,
+          formatMessage = _this$props.intl.formatMessage,
+          unLock = _this$props.unLock;
       unLock(id).then(function (data) {
@@ -259,5 +239,5 @@ if (data.failed) {
       var id = _this.state.task.id;
-      var _this$props3 = _this.props,
-          formatMessage = _this$props3.intl.formatMessage,
-          retry = _this$props3.retry;
+      var _this$props2 = _this.props,
+          formatMessage = _this$props2.intl.formatMessage,
+          retry = _this$props2.retry;
       retry(id).then(function (data) {
@@ -474,5 +454,5 @@ if (data.failed) {
     _this.renderTaskDetail = function () {
-      var _this$props4 = _this.props,
-          formatMessage = _this$props4.intl.formatMessage,
-          instance = _this$props4.instance;
+      var _this$props3 = _this.props,
+          formatMessage = _this$props3.intl.formatMessage,
+          instance = _this$props3.instance;
       var _this$state$task3 = _this.state.task,
@@ -568,2 +548,20 @@ code = _this$state$task3.code,
   _createClass(SagaImg, [{
+    key: "getInitState",
+    value: function getInitState() {
+      var _this$props4 = this.props,
+          instance = _this$props4.instance,
+          data = _this$props4.data;
+      return {
+        showDetail: false,
+        task: {},
+        json: '',
+        lineData: {},
+        activeCode: '',
+        activeTab: instance ? 'run' : '',
+        jsonTitle: false,
+        // 是否展示input output
+        data: data
+      };
+    }
+  }, {
     key: "componentWillMount",
@@ -767,4 +765,4 @@ value: function componentWillMount() {
   return SagaImg;
-}(Component), _temp)) || _class;
+}(Component)) || _class;
 
 export { SagaImg as default };

lib/routes/task-detail/create/stores/TaskCreateDataSet.js

@@ -39,3 +39,2 @@ import "choerodon-ui/pro/lib/data-set/style";
     _checkTaskName = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(value, name, record) {
-      var res;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -46,25 +45,24 @@ while (1) {
               _context.prev = 0;
-              _context.next = 3;
+              _context.prev = 1;
+              _context.next = 4;
               return axios.post("/hagd/v1/schedules".concat(levelType, "/tasks/check"), value);
 
-            case 3:
-              res = _context.sent;
+            case 4:
+              return _context.abrupt("return", true);
 
-              if (!res.failed) {
-                _context.next = 6;
-                break;
-              }
+            case 7:
+              _context.prev = 7;
+              _context.t0 = _context["catch"](1);
+              return _context.abrupt("return", _context.t0.message);
 
-              return _context.abrupt("return", res.message);
-
-            case 6:
-              _context.next = 11;
+            case 10:
+              _context.next = 15;
               break;
 
-            case 8:
-              _context.prev = 8;
-              _context.t0 = _context["catch"](0);
-              return _context.abrupt("return", _context.t0);
+            case 12:
+              _context.prev = 12;
+              _context.t1 = _context["catch"](0);
+              return _context.abrupt("return", _context.t1);
 
-            case 11:
+            case 15:
             case "end":
@@ -74,3 +72,3 @@ return _context.stop();
         }
-      }, _callee, null, [[0, 8]]);
+      }, _callee, null, [[0, 12], [1, 7]]);
     }));
@@ -99,3 +97,3 @@ return _checkTaskName.apply(this, arguments);
               if (!res.failed) {
-                _context2.next = 9;
+                _context2.next = 7;
                 break;
@@ -109,15 +107,13 @@ }
 
-            case 9:
+            case 7:
               record.set('cronTime', observable(['最近3次运行时间：'].concat(res)));
+              _context2.next = 13;
+              break;
 
             case 10:
-              _context2.next = 15;
-              break;
-
-            case 12:
-              _context2.prev = 12;
+              _context2.prev = 10;
               _context2.t0 = _context2["catch"](0);
               return _context2.abrupt("return", _context2.t0);
 
-            case 15:
+            case 13:
             case "end":
@@ -127,3 +123,3 @@ return _context2.stop();
         }
-      }, _callee2, null, [[0, 12]]);
+      }, _callee2, null, [[0, 10]]);
     }));
@@ -130,0 +126,0 @@ return _checkCronExpression.apply(this, arguments);

lib/routes/task-detail/executable-program/stores/MethodDataSet.js

@@ -48,4 +48,21 @@ export default function (_ref) {
       label: '在线实例数'
+    }],
+    queryFields: [{
+      name: 'code',
+      type: 'string',
+      label: '类编码'
+    }, {
+      name: 'service',
+      type: 'string',
+      label: '所属微服务'
+    }, {
+      name: 'method',
+      type: 'string',
+      label: '类名'
+    }, {
+      name: 'description',
+      type: 'string',
+      label: '描述'
     }]
   };
 }

lib/routes/task-detail/index.js

 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 import { asyncRouter, nomatch } from '@choerodon/boot';
+import { PermissionRoute } from '@choerodon/master';
 var index = asyncRouter(function () {
@@ -10,6 +11,9 @@ return import("./List");
   var match = _ref.match;
-  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
+  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PermissionRoute, {
     exact: true,
     path: match.url,
-    component: index
+    component: index,
+    service: function service(type) {
+      return type === 'organization' ? ['choerodon.code.organization.manager.task.ps.default'] : ['choerodon.code.site.manager.task-detail.ps.default'];
+    }
   }), /*#__PURE__*/React.createElement(Route, {
@@ -16,0 +20,0 @@ path: "*",

package.json

 {
   "name": "@choerodon/asgard",
   "routeName": "asgard",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "",
@@ -16,7 +16,7 @@ "main": "./lib/index.js",
   "devDependencies": {
-    "@choerodon/boot": "0.22.0",
-    "@choerodon/master": "0.24.0",
+    "@choerodon/boot": "0.23.0",
+    "@choerodon/master": "0.25.0",
+    "@choerodon/components": "0.0.1",
     "babel-eslint": "^8.1.0",
-    "babel-preset-c7n-app": "^0.0.1",
-    "choerodon-ui": "0.8.x",
+    "babel-preset-c7n": "^0.0.1",
     "eslint": "^7.6.0",
@@ -23,0 +23,0 @@ "eslint-config-airbnb": "^18.2.0",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

582167

increased by1.71%

Number of package files

83

increased by5.06%

Lines of code

6158

increased by0.65%

No dependency changes