@flightctl/ui-components 0.10.0-rc3 → 0.10.0-rc5
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.
- package/dist/src/components/Device/DeviceDetails/TerminalTab.d.ts.map +1 -1
- package/dist/src/components/Device/DeviceDetails/TerminalTab.js +7 -4
- package/dist/src/components/Device/DeviceDetails/TerminalTab.js.map +1 -1
- package/dist/src/hooks/useWebSocket.d.ts +1 -1
- package/dist/src/hooks/useWebSocket.d.ts.map +1 -1
- package/dist/src/hooks/useWebSocket.js +6 -2
- package/dist/src/hooks/useWebSocket.js.map +1 -1
- package/package.json +1 -1
- package/src/components/Device/DeviceDetails/TerminalTab.tsx +3 -0
- package/src/hooks/useWebSocket.ts +8 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerminalTab.d.ts","sourceRoot":"","sources":["../../../../../src/components/Device/DeviceDetails/TerminalTab.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"TerminalTab.d.ts","sourceRoot":"","sources":["../../../../../src/components/Device/DeviceDetails/TerminalTab.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAW1C,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAmFF,QAAA,MAAM,0BAA0B,UAAW,gBAAgB,sBAO1D,CAAC;AAEF,eAAe,0BAA0B,CAAC"}
|
|
@@ -10,15 +10,18 @@ const Terminal_1 = tslib_1.__importDefault(require("../../Terminal/Terminal"));
|
|
|
10
10
|
const PageWithPermissions_1 = tslib_1.__importDefault(require("../../common/PageWithPermissions"));
|
|
11
11
|
const useAccessReview_1 = require("../../../hooks/useAccessReview");
|
|
12
12
|
const rbac_1 = require("../../../types/rbac");
|
|
13
|
+
const OrganizationGuard_1 = require("../../common/OrganizationGuard");
|
|
13
14
|
const wsMeta = {
|
|
14
15
|
tty: true,
|
|
15
16
|
term: 'xterm-256color',
|
|
16
17
|
};
|
|
17
18
|
const TerminalTab = ({ device }) => {
|
|
19
|
+
var _a;
|
|
18
20
|
const { t } = (0, useTranslation_1.useTranslation)();
|
|
19
21
|
const terminal = React.useRef(null);
|
|
22
|
+
const { currentOrganization } = (0, OrganizationGuard_1.useOrganizationGuardContext)();
|
|
20
23
|
const onMsgReceived = React.useCallback((message) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
var
|
|
24
|
+
var _b;
|
|
22
25
|
try {
|
|
23
26
|
const bytes = new Uint8Array(yield message.arrayBuffer());
|
|
24
27
|
const msgType = bytes[0];
|
|
@@ -34,18 +37,18 @@ const TerminalTab = ({ device }) => {
|
|
|
34
37
|
return;
|
|
35
38
|
}
|
|
36
39
|
}
|
|
37
|
-
catch (
|
|
40
|
+
catch (_c) {
|
|
38
41
|
// Nothing to do
|
|
39
42
|
}
|
|
40
43
|
}
|
|
41
|
-
(
|
|
44
|
+
(_b = terminal.current) === null || _b === void 0 ? void 0 : _b.onDataReceived(str);
|
|
42
45
|
}
|
|
43
46
|
catch (err) {
|
|
44
47
|
// eslint-disable-next-line
|
|
45
48
|
console.error(err);
|
|
46
49
|
}
|
|
47
50
|
}), []);
|
|
48
|
-
const { sendMessage, isClosed, error, reconnect, isConnecting } = (0, useWebSocket_1.useWebSocket)(device.metadata.name || '', onMsgReceived, wsMeta);
|
|
51
|
+
const { sendMessage, isClosed, error, reconnect, isConnecting } = (0, useWebSocket_1.useWebSocket)(device.metadata.name || '', ((_a = currentOrganization === null || currentOrganization === void 0 ? void 0 : currentOrganization.metadata) === null || _a === void 0 ? void 0 : _a.name) || undefined, onMsgReceived, wsMeta);
|
|
49
52
|
if (isConnecting) {
|
|
50
53
|
return (React.createElement(react_core_1.Bullseye, null,
|
|
51
54
|
React.createElement(react_core_1.Spinner, null)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerminalTab.js","sourceRoot":"","sources":["../../../../../src/components/Device/DeviceDetails/TerminalTab.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAAqG;AAGrG,8DAAuE;AACvE,qFAAqD;AACrD,kEAA+D;AAC/D,+EAA2E;AAC3E,mGAAmE;AACnE,oEAAiE;AACjE,8CAAqD;
|
|
1
|
+
{"version":3,"file":"TerminalTab.js","sourceRoot":"","sources":["../../../../../src/components/Device/DeviceDetails/TerminalTab.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAAqG;AAGrG,8DAAuE;AACvE,qFAAqD;AACrD,kEAA+D;AAC/D,+EAA2E;AAC3E,mGAAmE;AACnE,oEAAiE;AACjE,8CAAqD;AACrD,sEAA6E;AAM7E,MAAM,MAAM,GAAe;IACzB,GAAG,EAAE,IAAI;IACT,IAAI,EAAE,gBAAgB;CACvB,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,EAAE,MAAM,EAAoB,EAAE,EAAE;;IACnD,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAyB,IAAI,CAAC,CAAC;IAC5D,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,+CAA2B,GAAE,CAAC;IAE9D,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC,CAAO,OAAa,EAAE,EAAE;;QAC9D,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;YAC1D,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;YAClC,IAAI,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAEzC,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;gBAClB,IAAI,CAAC;oBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAqC,CAAC;oBAChE,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAC7B,GAAG,GAAG,2DAA2D,GAAG,CAAC,IAAI,EAAE,CAAC;oBAC9E,CAAC;yBAAM,CAAC;wBACN,OAAO;oBACT,CAAC;gBACH,CAAC;gBAAC,WAAM,CAAC;oBACP,gBAAgB;gBAClB,CAAC;YACH,CAAC;YACD,MAAA,QAAQ,CAAC,OAAO,0CAAE,cAAc,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,2BAA2B;YAC3B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,CAAA,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,IAAA,2BAAY,EAC5E,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,EAC1B,CAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,QAAQ,0CAAE,IAAI,KAAI,SAAS,EAChD,aAAa,EACb,MAAM,CACP,CAAC;IAEF,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,CACL,oBAAC,qBAAQ;YACP,oBAAC,oBAAO,OAAG,CACF,CACZ,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,oBAAC,oBAAU,IAAC,KAAK,EAAE,KAAK,GAAI,CAAC;IACtC,CAAC;IAED,OAAO,CACL,oBAAC,kBAAK,IAAC,SAAS;QACb,QAAQ,IAAI,CACX,oBAAC,kBAAK,IACJ,QAAQ,QACR,OAAO,EAAC,MAAM,EACd,KAAK,EAAE,CAAC,CAAC,uBAAuB,CAAC,EACjC,WAAW,EACT,oBAAC,4BAAe,IACd,OAAO,EAAE,GAAG,EAAE;;oBACZ,MAAA,QAAQ,CAAC,OAAO,0CAAE,KAAK,EAAE,CAAC;oBAC1B,SAAS,EAAE,CAAC;gBACd,CAAC,IAEA,CAAC,CAAC,WAAW,CAAC,CACC,GAEpB,CACH;QACD,oBAAC,sBAAS;YACR,oBAAC,kBAAQ,IAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAI,CACtC,CACN,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,KAAuB,EAAE,EAAE;IAC7D,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,IAAA,iCAAe,EAAC,eAAQ,CAAC,cAAc,EAAE,WAAI,CAAC,GAAG,CAAC,CAAC;IAC9E,OAAO,CACL,oBAAC,6BAAmB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO;QACrD,oBAAC,WAAW,oBAAK,KAAK,EAAI,CACN,CACvB,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,0BAA0B,CAAC"}
|
|
@@ -2,7 +2,7 @@ export type WsMetadata = {
|
|
|
2
2
|
tty: boolean;
|
|
3
3
|
term: string;
|
|
4
4
|
};
|
|
5
|
-
export declare const useWebSocket: <T>(deviceId: string, onMsgReceived: (msg: T) => Promise<void>, wsMetadata: WsMetadata) => {
|
|
5
|
+
export declare const useWebSocket: <T>(deviceId: string, organizationId: string | undefined, onMsgReceived: (msg: T) => Promise<void>, wsMetadata: WsMetadata) => {
|
|
6
6
|
sendMessage: (msg: string, resize?: boolean) => void;
|
|
7
7
|
isConnecting: boolean;
|
|
8
8
|
isClosed: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWebSocket.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWebSocket.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,YAAY,gBACb,MAAM,
|
|
1
|
+
{"version":3,"file":"useWebSocket.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWebSocket.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,YAAY,gBACb,MAAM,kBACA,MAAM,GAAG,SAAS,6BACP,QAAQ,IAAI,CAAC,cAC5B,UAAU;uBAEH,MAAM,WAAW,OAAO,KAAK,IAAI;kBACtC,OAAO;cACX,OAAO;WACV,OAAO;eACH,YAAY;CA0ExB,CAAC"}
|
|
@@ -13,7 +13,7 @@ const msgToBytes = (msg, resize) => {
|
|
|
13
13
|
result.set(encodedData, 1);
|
|
14
14
|
return result;
|
|
15
15
|
};
|
|
16
|
-
const useWebSocket = (deviceId, onMsgReceived, wsMetadata) => {
|
|
16
|
+
const useWebSocket = (deviceId, organizationId, onMsgReceived, wsMetadata) => {
|
|
17
17
|
const { fetch: { getWsEndpoint }, } = (0, useAppContext_1.useAppContext)();
|
|
18
18
|
const { t } = (0, useTranslation_1.useTranslation)();
|
|
19
19
|
const wsRef = React.useRef();
|
|
@@ -34,6 +34,10 @@ const useWebSocket = (deviceId, onMsgReceived, wsMetadata) => {
|
|
|
34
34
|
const params = new URLSearchParams({
|
|
35
35
|
metadata: wsMeta,
|
|
36
36
|
});
|
|
37
|
+
// NOTE: Since webSocket connections can't use custom headers, we must add the "org_id" query parameter to the URL instead
|
|
38
|
+
if (organizationId) {
|
|
39
|
+
params.set('org_id', organizationId);
|
|
40
|
+
}
|
|
37
41
|
const ws = new WebSocket(`${wsEndpoint}?${params.toString()}`, 'v5.channel.k8s.io');
|
|
38
42
|
ws.addEventListener('open', () => setIsConnecting(false));
|
|
39
43
|
ws.addEventListener('close', () => {
|
|
@@ -56,7 +60,7 @@ const useWebSocket = (deviceId, onMsgReceived, wsMetadata) => {
|
|
|
56
60
|
(_a = wsRef.current) === null || _a === void 0 ? void 0 : _a.close();
|
|
57
61
|
wsRef.current = undefined;
|
|
58
62
|
};
|
|
59
|
-
}, [deviceId, t, getWsEndpoint, reset, wsMetadata]);
|
|
63
|
+
}, [deviceId, organizationId, t, getWsEndpoint, reset, wsMetadata]);
|
|
60
64
|
const reconnect = React.useCallback(() => {
|
|
61
65
|
var _a;
|
|
62
66
|
(_a = wsRef.current) === null || _a === void 0 ? void 0 : _a.close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWebSocket.js","sourceRoot":"","sources":["../../../src/hooks/useWebSocket.ts"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,qDAAkD;AAClD,mDAAgD;AAEhD,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,MAAgB,EAAE,EAAE;IACnD,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtD,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAChC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC3B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAOK,MAAM,YAAY,GAAG,CAC1B,QAAgB,EAChB,aAAwC,EACxC,UAAsB,EAOtB,EAAE;IACF,MAAM,EACJ,KAAK,EAAE,EAAE,aAAa,EAAE,GACzB,GAAG,IAAA,6BAAa,GAAE,CAAC;IACpB,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAa,CAAC;IACxC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAW,CAAC;IACpD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAS,CAAC,CAAC,CAAC;IAEpD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,IAAY,EAAE,MAAgB,EAAE,EAAE;;QACvE,MAAA,KAAK,CAAC,OAAO,0CAAE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC;YACH,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;gBACjC,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"useWebSocket.js","sourceRoot":"","sources":["../../../src/hooks/useWebSocket.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flightctl/ui-components",
|
|
3
|
-
"version": "0.10.0-
|
|
3
|
+
"version": "0.10.0-rc5",
|
|
4
4
|
"description": "Components for Flightctl UI",
|
|
5
5
|
"repository": "https://github.com/flightctl/flightctl-ui.git",
|
|
6
6
|
"homepage": "https://github.com/flightctl/flightctl-ui.git",
|
|
@@ -9,6 +9,7 @@ import Terminal, { ImperativeTerminalType } from '../../Terminal/Terminal';
|
|
|
9
9
|
import PageWithPermissions from '../../common/PageWithPermissions';
|
|
10
10
|
import { useAccessReview } from '../../../hooks/useAccessReview';
|
|
11
11
|
import { RESOURCE, VERB } from '../../../types/rbac';
|
|
12
|
+
import { useOrganizationGuardContext } from '../../common/OrganizationGuard';
|
|
12
13
|
|
|
13
14
|
type TerminalTabProps = {
|
|
14
15
|
device: Device;
|
|
@@ -22,6 +23,7 @@ const wsMeta: WsMetadata = {
|
|
|
22
23
|
const TerminalTab = ({ device }: TerminalTabProps) => {
|
|
23
24
|
const { t } = useTranslation();
|
|
24
25
|
const terminal = React.useRef<ImperativeTerminalType>(null);
|
|
26
|
+
const { currentOrganization } = useOrganizationGuardContext();
|
|
25
27
|
|
|
26
28
|
const onMsgReceived = React.useCallback(async (message: Blob) => {
|
|
27
29
|
try {
|
|
@@ -51,6 +53,7 @@ const TerminalTab = ({ device }: TerminalTabProps) => {
|
|
|
51
53
|
|
|
52
54
|
const { sendMessage, isClosed, error, reconnect, isConnecting } = useWebSocket(
|
|
53
55
|
device.metadata.name || '',
|
|
56
|
+
currentOrganization?.metadata?.name || undefined,
|
|
54
57
|
onMsgReceived,
|
|
55
58
|
wsMeta,
|
|
56
59
|
);
|
|
@@ -18,6 +18,7 @@ export type WsMetadata = {
|
|
|
18
18
|
|
|
19
19
|
export const useWebSocket = <T>(
|
|
20
20
|
deviceId: string,
|
|
21
|
+
organizationId: string | undefined,
|
|
21
22
|
onMsgReceived: (msg: T) => Promise<void>,
|
|
22
23
|
wsMetadata: WsMetadata,
|
|
23
24
|
): {
|
|
@@ -50,6 +51,12 @@ export const useWebSocket = <T>(
|
|
|
50
51
|
const params = new URLSearchParams({
|
|
51
52
|
metadata: wsMeta,
|
|
52
53
|
});
|
|
54
|
+
|
|
55
|
+
// NOTE: Since webSocket connections can't use custom headers, we must add the "org_id" query parameter to the URL instead
|
|
56
|
+
if (organizationId) {
|
|
57
|
+
params.set('org_id', organizationId);
|
|
58
|
+
}
|
|
59
|
+
|
|
53
60
|
const ws = new WebSocket(`${wsEndpoint}?${params.toString()}`, 'v5.channel.k8s.io');
|
|
54
61
|
ws.addEventListener('open', () => setIsConnecting(false));
|
|
55
62
|
ws.addEventListener('close', () => {
|
|
@@ -70,7 +77,7 @@ export const useWebSocket = <T>(
|
|
|
70
77
|
wsRef.current?.close();
|
|
71
78
|
wsRef.current = undefined;
|
|
72
79
|
};
|
|
73
|
-
}, [deviceId, t, getWsEndpoint, reset, wsMetadata]);
|
|
80
|
+
}, [deviceId, organizationId, t, getWsEndpoint, reset, wsMetadata]);
|
|
74
81
|
|
|
75
82
|
const reconnect = React.useCallback(() => {
|
|
76
83
|
wsRef.current?.close();
|