@next-libs/cmdb-instances 7.4.0 → 7.6.0

package/dist/esm/instance-list/InstanceList.js

@@ -17,6 +17,7 @@ import { extraFieldAttrs, CMDB_MODAL_FIELDS_SETTINGS, CMDB_RESOURCE_FIELDS_SETTI
 import { ModelAttributeValueType } from "../model-attribute-form-control/ModelAttributeFormControl";
 import { IconButton } from "./IconButton";
 import { changeQueryWithCustomRules } from "../processors";
+import FilterInstanceSource from "./FilterInstanceSource";
 export function joinRelationFieldAndShowkey(fields, modelData, objectList) {
   var attrIdMap = keyBy(modelData.attrList, "id");
   return fields.map(field => {
@@ -140,10 +141,10 @@ export function translateConditions(aq, idObjectMap, modelData, t) {
   });
   var attrAndRelationList = [...modelData.attrList, ...relations];
   if (!isEmpty(aq)) {
-    for (var query of aq) {
-      var _queries = [query];
-      if (Object.keys(query)[0] === "$or" || Object.keys(query)[0] === "$and") {
-        _queries = query[Object.keys(query)[0]];
+    for (var _query of aq) {
+      var _queries = [_query];
+      if (Object.keys(_query)[0] === "$or" || Object.keys(_query)[0] === "$and") {
+        _queries = _query[Object.keys(_query)[0]];
       }
       _queries.forEach(query => {
         var _attr;
@@ -302,6 +303,11 @@ export function LegacyInstanceList(props) {
         idNameMap = yield CmdbObjectApi_getIdMapName({
           parentObjectId: modelData.objectId
         });
+        props.showFilterInstanceSource && jsonLocalStorage.setItem("instances-sources-objectId-name-map", {
+          parentObjectId: modelData.objectId,
+          query: props.presetConfigs.query,
+          idNameMap
+        });
       }
       setInheritanceModelIdNameMap(idNameMap);
     });
@@ -382,6 +388,9 @@ export function LegacyInstanceList(props) {
       pageSize: (_ref4 = (_props$dataSource$pag2 = (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.pageSize) !== null && _props$dataSource$pag2 !== void 0 ? _props$dataSource$pag2 : props.pageSize) !== null && _ref4 !== void 0 ? _ref4 : 10,
       aliveHosts: props.aliveHosts,
       relatedToMe: props.relatedToMe,
+      objectIdQuery: props.objectIdQuery,
+      filterInstanceSource: props.filterInstanceSource,
+      instanceSourcePopoverVisible: false,
       inited: false,
       loading: false,
       failed: false,
@@ -601,6 +610,12 @@ export function LegacyInstanceList(props) {
     }
     refreshInstanceList(state.sort, state.asc, 1);
   }, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]);
+  useEffect(() => {
+    setQ(props.q);
+    setState({
+      q: props.q
+    });
+  }, [props.q]);
 
   // on other condition change
   useEffect(() => {
@@ -909,7 +924,36 @@ export function LegacyInstanceList(props) {
       (_props$onAdvancedSear2 = props.onAdvancedSearch) === null || _props$onAdvancedSear2 === void 0 ? void 0 : _props$onAdvancedSear2.call(props, queries);
     };
   };
+  var onFilterInstanceSourceChange = checked => {
+    var _props$onFilterInstan;
+    setState({
+      filterInstanceSource: checked
+    });
+    (_props$onFilterInstan = props.onFilterInstanceSourceChange) === null || _props$onFilterInstan === void 0 ? void 0 : _props$onFilterInstan.call(props, checked);
+  };
+  var onFilterObjectIdChange = objectIdQuery => {
+    var _props$onFilterObject;
+    setState({
+      objectIdQuery: objectIdQuery
+    });
+    (_props$onFilterObject = props.onFilterObjectIdChange) === null || _props$onFilterObject === void 0 ? void 0 : _props$onFilterObject.call(props, objectIdQuery);
+  };
+  var onPopoverVisibleChange = visible => {
+    setState({
+      instanceSourcePopoverVisible: visible
+    });
+  };
   var conditions = translateConditions(state.aqToShow, idObjectMap, modelData);
+  useEffect(() => {
+    if (props.showFilterInstanceSource) {
+      var aq = initAqToShow(props.aq, modelData, false);
+      var aqToShow = props.aqToShow || initAqToShow(props.aq, modelData);
+      setState({
+        aq,
+        aqToShow
+      });
+    }
+  }, [props.aq, props.aqToShow, props.showFilterInstanceSource]);
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: state.loading
   }, state.inited && !state.failed ? /*#__PURE__*/React.createElement(React.Fragment, null, (!props.searchDisabled || !props.advancedSearchDisabled || !props.relatedToMeDisabled || !props.aliveHostsDisabled || !props.moreButtonsDisabled) && /*#__PURE__*/React.createElement("div", {
@@ -974,6 +1018,16 @@ export function LegacyInstanceList(props) {
     })
   }, " ", i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.CLEAR)))), ((_props$extraOperateBr = props.extraOperateBricks) === null || _props$extraOperateBr === void 0 ? void 0 : _props$extraOperateBr.useBrick) && /*#__PURE__*/React.createElement(BrickAsComponent, {
     useBrick: props.extraOperateBricks.useBrick
+  }), props.showFilterInstanceSource && /*#__PURE__*/React.createElement(FilterInstanceSource, {
+    visible: state.instanceSourcePopoverVisible,
+    checked: state.filterInstanceSource,
+    onPopoverVisibleChange: onPopoverVisibleChange,
+    onIconClicKChange: onFilterInstanceSourceChange,
+    onChange: onFilterObjectIdChange,
+    inheritanceModelIdNameMap: inheritanceModelIdNameMap,
+    value: state.objectIdQuery,
+    jsonLocalStorage: jsonLocalStorage,
+    isAbstract: modelData.isAbstract
   }), props.objectId === "HOST" && props.enableSearchByApp && /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: toggleSearchMode