diff --git a/package.json b/package.json index 3aa115ca8..2bd11aed5 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "material-table": "1.43.0", "moment": "^2.22.2", "openchs-idi": "git+https://github.com/avniproject/openchs-idi#b6c57e051b91ed4bc2634f4f087dba51cc3a01c8", - "openchs-models": "1.30.87", + "openchs-models": "1.30.89", "popper.js": "^1.14.3", "prismjs": "^1.17.1", "prop-types": "^15.7.2", diff --git a/src/formDesigner/components/RuleFailureTelemetry/RuleFailureTelemetryList.js b/src/formDesigner/components/RuleFailureTelemetry/RuleFailureTelemetryList.js index c3ae61a3f..21990c176 100644 --- a/src/formDesigner/components/RuleFailureTelemetry/RuleFailureTelemetryList.js +++ b/src/formDesigner/components/RuleFailureTelemetry/RuleFailureTelemetryList.js @@ -13,7 +13,7 @@ import { Privilege } from "openchs-models"; import { Close, MenuOpen } from "@material-ui/icons"; const tableRef = React.createRef(); -const refreshTable = ref => ref.current && ref.current.onQueryChange(); +const refreshTable = ref => ref.current && ref.current.onQueryChange({ page: 0 }); const STATUS = { OPEN: 1, @@ -52,6 +52,31 @@ const columns = [ title: "Rule UUID", field: "ruleUuid", render: rowData => rowData.ruleUuid + }, + { + title: "Source", + field: "source", + render: rowData => ( + + {rowData.sourceId || ""} + {rowData.sourceType ? " (" + rowData.sourceType + ")" : ""} + + ) + }, + { + title: "Entity", + field: "entity", + render: rowData => ( + + {rowData.entityId || ""} + {rowData.entityType ? " (" + rowData.entityType + ")" : ""} + + ) + }, + { + title: "App", + field: "app", + render: rowData => rowData.appType } ]; @@ -177,8 +202,6 @@ const RuleFailureTelemetryList = ({ userInfo }) => { data={fetchData(resourceName, resourceUrl, queryParams)} detailPanel={[ { - icon: "expand_more", - openIcon: "expand_less", tooltip: "Show Stacktrace", render: rowData => { return
{rowData.stacktrace}
; diff --git a/yarn.lock b/yarn.lock index 92919dfa3..c9aeb4e1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15606,10 +15606,10 @@ open@^7.1.0: grunt "^1.0.3" webpack "^4.13.0" -openchs-models@1.30.78: - version "1.30.78" - resolved "https://registry.yarnpkg.com/openchs-models/-/openchs-models-1.30.78.tgz#767b4b7043d6289ffee99c6e94d558b0d3c3dfc0" - integrity sha512-UFXR3VPlKaslrymy6CB6kIQg+Wpf8N0qIcwBuYKsrpMeIZ5ehM3n9bAmkQXaOtK3aH4DfGGH7L/yYTxI4uBYtQ== +openchs-models@1.30.89: + version "1.30.89" + resolved "https://registry.yarnpkg.com/openchs-models/-/openchs-models-1.30.89.tgz#fbe3e49e7c85b00f5c1aa1cd13d8bb0d2dad0802" + integrity sha512-8sCkZoXB//9N/eSOiXoFr25DiPL01y65XkcXulm/wi5946R35bEpTwP005Y+GThHY2RrAouTYcfs1Wpi/Q/ekA== openchs-models@^0.2.25: version "0.2.86"