@openshift-assisted/ui-lib 2.10.6-cim → 2.11.0-cim

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/build/@types/cim/components/helpers/network.d.ts.map +1 -1
  2. package/build/@types/cim/components/modals/EditAgentModal.d.ts.map +1 -1
  3. package/build/cjs/cim/components/helpers/network.js +2 -3
  4. package/build/cjs/cim/components/helpers/network.js.map +1 -1
  5. package/build/cjs/cim/components/modals/EditAgentModal.js +4 -1
  6. package/build/cjs/cim/components/modals/EditAgentModal.js.map +1 -1
  7. package/lib/cim/components/helpers/network.ts +7 -6
  8. package/lib/cim/components/modals/EditAgentModal.tsx +4 -1
  9. package/package.json +3 -3
package/build/@types/cim/components/helpers/network.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AAMvF,eAAO,MAAM,eAAe,WAClB,gBAAgB,EAAE,wBACJ,8BAA8B;;;GA+BrD,CAAC"}
1
+ {"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AAOvF,eAAO,MAAM,eAAe,WAClB,gBAAgB,EAAE,wBACJ,8BAA8B;;;GA+BrD,CAAC"}
package/build/@types/cim/components/modals/EditAgentModal.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EditAgentModal.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/EditAgentModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAUjD,CAAC;AAEF,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"EditAgentModal.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/EditAgentModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAajD,CAAC;AAEF,eAAe,cAAc,CAAC"}
package/build/cjs/cim/components/helpers/network.js CHANGED
@@ -7,12 +7,11 @@ const getHostNetworks = (agents, agentClusterInstall) => {
7
7
  return [];
8
8
  }
9
9
  const connectivityMajorityGroups = JSON.parse(agentClusterInstall.status.connectivityMajorityGroups);
10
- // Format: '{"192.168.122.0/24":["4ae8f799-7d60-4d13-be7b-f9c93ddec28e","c891ff23-9b0d-4b8e-be05-c9bcc145e823","cd188ad8-8290-4e7f-a86f-b85fef0e63aa"]}'
11
- return Object.keys(connectivityMajorityGroups)
10
+ return Object.keys(connectivityMajorityGroups.majority_groups)
12
11
  .filter((k) => !['IPv4', 'IPv6'].includes(k))
13
12
  .map((cidr) => {
14
13
  const hostIds = [];
15
- connectivityMajorityGroups[cidr].forEach((hostName) => {
14
+ connectivityMajorityGroups.majority_groups[cidr].forEach((hostName) => {
16
15
  var _a;
17
16
  const agent = agents.find((agent) => { var _a; return ((_a = agent.metadata) === null || _a === void 0 ? void 0 : _a.name) === hostName; });
18
17
  if (!((_a = agent === null || agent === void 0 ? void 0 : agent.metadata) === null || _a === void 0 ? void 0 : _a.uid)) {
package/build/cjs/cim/components/helpers/network.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"network.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/network.ts"],"names":[],"mappings":";;;AAOO,MAAM,eAAe,GAAG,CAC7B,MAA0B,EAC1B,mBAAoD,EACpD,EAAE;;IACF,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,IAAI,CAAC,CAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,0CAAE,0BAA0B,CAAA,EAAE;QAC/E,OAAO,EAAE,CAAC;KACX;IAED,MAAM,0BAA0B,GAAG,IAAI,CAAC,KAAK,CAC3C,mBAAmB,CAAC,MAAM,CAAC,0BAA0B,CAC3B,CAAC;IAE7B,wJAAwJ;IACxJ,OAAO,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC;SAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC5C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,0BAA0B,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,QAAgB,EAAE,EAAE;;YAC5D,MAAM,KAAK,GAAiC,MAAM,CAAC,IAAI,CACrD,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA,CAC7C,CAAC;YACF,IAAI,CAAC,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,GAAG,CAAA,EAAE;gBACzB,2DAA2D;aAC5D;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAClC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,IAAI;YACJ,OAAO;SACR,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAjCW,QAAA,eAAe,mBAiC1B"}
1
+ {"version":3,"file":"network.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/network.ts"],"names":[],"mappings":";;;AAQO,MAAM,eAAe,GAAG,CAC7B,MAA0B,EAC1B,mBAAoD,EACpD,EAAE;;IACF,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,IAAI,CAAC,CAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,0CAAE,0BAA0B,CAAA,EAAE;QAC/E,OAAO,EAAE,CAAC;KACX;IAED,MAAM,0BAA0B,GAAG,IAAI,CAAC,KAAK,CAC3C,mBAAmB,CAAC,MAAM,CAAC,0BAA0B,CACxB,CAAC;IAEhC,OAAO,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC;SAC3D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC5C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,0BAA0B,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,QAAgB,EAAE,EAAE;;YAC5E,MAAM,KAAK,GAAiC,MAAM,CAAC,IAAI,CACrD,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA,CAC7C,CAAC;YACF,IAAI,CAAC,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,GAAG,CAAA,EAAE;gBACzB,2DAA2D;aAC5D;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAClC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,IAAI;YACJ,OAAO;SACR,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAjCW,QAAA,eAAe,mBAiC1B"}
package/build/cjs/cim/components/modals/EditAgentModal.js CHANGED
@@ -8,7 +8,10 @@ const EditAgentModal = (_a) => {
8
8
  var _b;
9
9
  var { agent, onSave } = _a, rest = tslib_1.__rest(_a, ["agent", "onSave"]);
10
10
  const [host] = agent ? (0, toAssisted_1.getAIHosts)([agent]) : [];
11
- return (React.createElement(EditHostModal_1.default, Object.assign({ host: host, inventory: (_b = agent === null || agent === void 0 ? void 0 : agent.status) === null || _b === void 0 ? void 0 : _b.inventory }, rest, { onSave: ({ hostname }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () { return agent && onSave(agent, hostname); }) })));
11
+ return (React.createElement(EditHostModal_1.default, Object.assign({ host: host, inventory: (_b = agent === null || agent === void 0 ? void 0 : agent.status) === null || _b === void 0 ? void 0 : _b.inventory }, rest, { onSave: ({ hostname }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
12
+ agent && (yield onSave(agent, hostname));
13
+ rest.onClose();
14
+ }) })));
12
15
  };
13
16
  exports.default = EditAgentModal;
14
17
  //# sourceMappingURL=EditAgentModal.js.map
package/build/cjs/cim/components/modals/EditAgentModal.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EditAgentModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/EditAgentModal.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,2GAA2E;AAE3E,sDAAmD;AAEnD,MAAM,cAAc,GAAkC,CAAC,EAA0B,EAAE,EAAE;;QAA9B,EAAE,KAAK,EAAE,MAAM,OAAW,EAAN,IAAI,sBAAxB,mBAA0B,CAAF;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAA,uBAAU,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,OAAO,CACL,oBAAC,uBAAa,kBACZ,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,0CAAE,SAAS,IAC/B,IAAI,IACR,MAAM,EAAE,CAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,0DAAC,OAAA,KAAK,IAAI,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA,GAAA,IAChE,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"EditAgentModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/EditAgentModal.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,2GAA2E;AAE3E,sDAAmD;AAEnD,MAAM,cAAc,GAAkC,CAAC,EAA0B,EAAE,EAAE;;QAA9B,EAAE,KAAK,EAAE,MAAM,OAAW,EAAN,IAAI,sBAAxB,mBAA0B,CAAF;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAA,uBAAU,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,OAAO,CACL,oBAAC,uBAAa,kBACZ,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,0CAAE,SAAS,IAC/B,IAAI,IACR,MAAM,EAAE,CAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;YAC7B,KAAK,IAAI,CAAC,MAAM,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;YACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAA,IACD,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,cAAc,CAAC"}
package/lib/cim/components/helpers/network.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  import { AgentK8sResource } from '../../types/k8s/agent';
2
2
  import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-install';
3
3
 
4
- type ConnectedMajorityGroups = {
5
- [key: string]: string[];
4
+ type ConnectivityMajorityGroups = {
5
+ l3_connected_addresses: object;
6
+ majority_groups: { [key: string]: string[] };
6
7
  };
7
8
 
8
9
  export const getHostNetworks = (
@@ -15,14 +16,14 @@ export const getHostNetworks = (
15
16
 
16
17
  const connectivityMajorityGroups = JSON.parse(
17
18
  agentClusterInstall.status.connectivityMajorityGroups,
18
- ) as ConnectedMajorityGroups;
19
+ ) as ConnectivityMajorityGroups;
19
20
 
20
- // Format: '{"192.168.122.0/24":["4ae8f799-7d60-4d13-be7b-f9c93ddec28e","c891ff23-9b0d-4b8e-be05-c9bcc145e823","cd188ad8-8290-4e7f-a86f-b85fef0e63aa"]}'
21
- return Object.keys(connectivityMajorityGroups)
21
+ return Object.keys(connectivityMajorityGroups.majority_groups)
22
22
  .filter((k) => !['IPv4', 'IPv6'].includes(k))
23
23
  .map((cidr) => {
24
24
  const hostIds: string[] = [];
25
- connectivityMajorityGroups[cidr].forEach((hostName: string) => {
25
+
26
+ connectivityMajorityGroups.majority_groups[cidr].forEach((hostName: string) => {
26
27
  const agent: AgentK8sResource | undefined = agents.find(
27
28
  (agent) => agent.metadata?.name === hostName,
28
29
  );
package/lib/cim/components/modals/EditAgentModal.tsx CHANGED
@@ -10,7 +10,10 @@ const EditAgentModal: React.FC<EditAgentModalProps> = ({ agent, onSave, ...rest
10
10
  host={host}
11
11
  inventory={agent?.status?.inventory}
12
12
  {...rest}
13
- onSave={async ({ hostname }) => agent && onSave(agent, hostname)}
13
+ onSave={async ({ hostname }) => {
14
+ agent && (await onSave(agent, hostname));
15
+ rest.onClose();
16
+ }}
14
17
  />
15
18
  );
16
19
  };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "dependencies": {
3
- "@openshift-assisted/locales": "2.10.6-cim",
4
- "@openshift-assisted/types": "2.10.6-cim",
3
+ "@openshift-assisted/locales": "2.11.0-cim",
4
+ "@openshift-assisted/types": "2.11.0-cim",
5
5
  "@openshift-console/dynamic-plugin-sdk": "0.0.3",
6
6
  "@patternfly/patternfly": "^4.222.4",
7
7
  "@patternfly/react-code-editor": "^4.82.113",
@@ -141,5 +141,5 @@
141
141
  ]
142
142
  }
143
143
  },
144
- "version": "2.10.6-cim"
144
+ "version": "2.11.0-cim"
145
145
  }