@flightctl/ui-components 1.0.0-rc1 → 1.0.0-rc3
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/AuthProvider/AuthProviderDetails/AuthProviderDetails.d.ts.map +1 -1
- package/dist/src/components/AuthProvider/AuthProviderDetails/AuthProviderDetails.js +5 -1
- package/dist/src/components/AuthProvider/AuthProviderDetails/AuthProviderDetails.js.map +1 -1
- package/dist/src/components/AuthProvider/AuthProviderRow.d.ts.map +1 -1
- package/dist/src/components/AuthProvider/AuthProviderRow.js +8 -0
- package/dist/src/components/AuthProvider/AuthProviderRow.js.map +1 -1
- package/dist/src/components/AuthProvider/CreateAuthProvider/AuthProviderHelperText.js +1 -1
- package/dist/src/components/AuthProvider/CreateAuthProvider/AuthProviderHelperText.js.map +1 -1
- package/dist/src/components/AuthProvider/CreateAuthProvider/CreateAuthProvider.d.ts.map +1 -1
- package/dist/src/components/AuthProvider/CreateAuthProvider/CreateAuthProvider.js +8 -11
- package/dist/src/components/AuthProvider/CreateAuthProvider/CreateAuthProvider.js.map +1 -1
- package/dist/src/components/AuthProvider/CreateAuthProvider/CreateAuthProviderForm.d.ts.map +1 -1
- package/dist/src/components/AuthProvider/CreateAuthProvider/CreateAuthProviderForm.js +9 -16
- package/dist/src/components/AuthProvider/CreateAuthProvider/CreateAuthProviderForm.js.map +1 -1
- package/dist/src/components/AuthProvider/CreateAuthProvider/RoleAssignmentSection.js +6 -6
- package/dist/src/components/AuthProvider/CreateAuthProvider/RoleAssignmentSection.js.map +1 -1
- package/dist/src/components/Device/DeviceDetails/TerminalTab.d.ts.map +1 -1
- package/dist/src/components/Device/DeviceDetails/TerminalTab.js +33 -8
- package/dist/src/components/Device/DeviceDetails/TerminalTab.js.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/deviceSpecUtils.d.ts.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/deviceSpecUtils.js +29 -26
- package/dist/src/components/Device/EditDeviceWizard/deviceSpecUtils.js.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/steps/ApplicationContainerForm.d.ts.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/steps/ApplicationContainerForm.js +1 -3
- package/dist/src/components/Device/EditDeviceWizard/steps/ApplicationContainerForm.js.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/steps/ApplicationTemplates.d.ts.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/steps/ApplicationTemplates.js +5 -1
- package/dist/src/components/Device/EditDeviceWizard/steps/ApplicationTemplates.js.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/steps/ApplicationVolumeForm.d.ts.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/steps/ApplicationVolumeForm.js +17 -53
- package/dist/src/components/Device/EditDeviceWizard/steps/ApplicationVolumeForm.js.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/utils.d.ts +16 -2
- package/dist/src/components/Device/EditDeviceWizard/utils.d.ts.map +1 -1
- package/dist/src/components/Device/EditDeviceWizard/utils.js +1 -1
- package/dist/src/components/Device/EditDeviceWizard/utils.js.map +1 -1
- package/dist/src/components/EnrollmentRequest/EnrollmentRequestDetails/EnrollmentRequestDetails.js +1 -1
- package/dist/src/components/EnrollmentRequest/EnrollmentRequestDetails/EnrollmentRequestDetails.js.map +1 -1
- package/dist/src/components/Fleet/CreateFleet/fleetSpecUtils.d.ts.map +1 -1
- package/dist/src/components/Fleet/CreateFleet/fleetSpecUtils.js +10 -4
- package/dist/src/components/Fleet/CreateFleet/fleetSpecUtils.js.map +1 -1
- package/dist/src/components/Fleet/CreateFleet/steps/UpdateStepUpdatePolicy.d.ts.map +1 -1
- package/dist/src/components/Fleet/CreateFleet/steps/UpdateStepUpdatePolicy.js +13 -11
- package/dist/src/components/Fleet/CreateFleet/steps/UpdateStepUpdatePolicy.js.map +1 -1
- package/dist/src/components/Terminal/Terminal.css +12 -1
- package/dist/src/components/Terminal/Terminal.js +3 -3
- package/dist/src/components/Terminal/Terminal.js.map +1 -1
- package/dist/src/components/common/OrganizationGuard.d.ts +1 -1
- package/dist/src/components/common/OrganizationGuard.d.ts.map +1 -1
- package/dist/src/components/common/OrganizationGuard.js +7 -5
- package/dist/src/components/common/OrganizationGuard.js.map +1 -1
- package/dist/src/components/common/OrganizationSelector.d.ts.map +1 -1
- package/dist/src/components/common/OrganizationSelector.js +20 -6
- package/dist/src/components/common/OrganizationSelector.js.map +1 -1
- package/dist/src/components/form/validations.d.ts +21 -3
- package/dist/src/components/form/validations.d.ts.map +1 -1
- package/dist/src/components/form/validations.js +43 -23
- package/dist/src/components/form/validations.js.map +1 -1
- package/dist/src/hooks/useAppLinks.js +5 -5
- package/dist/src/hooks/useAppLinks.js.map +1 -1
- package/dist/src/hooks/useWebSocket.d.ts.map +1 -1
- package/dist/src/hooks/useWebSocket.js +47 -19
- package/dist/src/hooks/useWebSocket.js.map +1 -1
- package/dist/src/types/deviceSpec.d.ts +2 -6
- package/dist/src/types/deviceSpec.d.ts.map +1 -1
- package/dist/src/types/deviceSpec.js +1 -7
- package/dist/src/types/deviceSpec.js.map +1 -1
- package/dist/src/utils/patch.js +2 -2
- package/dist/src/utils/patch.js.map +1 -1
- package/dist/src/utils/time.d.ts +0 -1
- package/dist/src/utils/time.d.ts.map +1 -1
- package/dist/src/utils/time.js +1 -20
- package/dist/src/utils/time.js.map +1 -1
- package/package.json +1 -1
- package/src/components/AuthProvider/AuthProviderDetails/AuthProviderDetails.tsx +11 -1
- package/src/components/AuthProvider/AuthProviderRow.tsx +10 -3
- package/src/components/AuthProvider/CreateAuthProvider/AuthProviderHelperText.tsx +1 -1
- package/src/components/AuthProvider/CreateAuthProvider/CreateAuthProvider.tsx +19 -21
- package/src/components/AuthProvider/CreateAuthProvider/CreateAuthProviderForm.tsx +16 -33
- package/src/components/AuthProvider/CreateAuthProvider/RoleAssignmentSection.tsx +6 -6
- package/src/components/Device/DeviceDetails/TerminalTab.tsx +54 -22
- package/src/components/Device/EditDeviceWizard/deviceSpecUtils.ts +27 -24
- package/src/components/Device/EditDeviceWizard/steps/ApplicationContainerForm.tsx +0 -7
- package/src/components/Device/EditDeviceWizard/steps/ApplicationTemplates.tsx +10 -0
- package/src/components/Device/EditDeviceWizard/steps/ApplicationVolumeForm.tsx +36 -89
- package/src/components/Device/EditDeviceWizard/utils.ts +2 -1
- package/src/components/EnrollmentRequest/EnrollmentRequestDetails/EnrollmentRequestDetails.tsx +1 -1
- package/src/components/Fleet/CreateFleet/fleetSpecUtils.ts +9 -2
- package/src/components/Fleet/CreateFleet/steps/UpdateStepUpdatePolicy.tsx +31 -21
- package/src/components/Terminal/Terminal.css +12 -1
- package/src/components/Terminal/Terminal.tsx +3 -3
- package/src/components/common/OrganizationGuard.tsx +8 -7
- package/src/components/common/OrganizationSelector.tsx +65 -38
- package/src/components/form/validations.ts +62 -32
- package/src/hooks/useAppLinks.ts +5 -5
- package/src/hooks/useWebSocket.ts +53 -16
- package/src/types/deviceSpec.ts +2 -7
- package/src/utils/patch.ts +3 -3
- package/src/utils/time.ts +0 -24
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthProviderDetails.d.ts","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/AuthProviderDetails/AuthProviderDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthProviderDetails.d.ts","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/AuthProviderDetails/AuthProviderDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA8G/B,QAAA,MAAM,kCAAkC,yBAQvC,CAAC;AAEF,eAAe,kCAAkC,CAAC"}
|
|
@@ -16,6 +16,7 @@ const PageWithPermissions_1 = tslib_1.__importDefault(require("../../common/Page
|
|
|
16
16
|
const PermissionsContext_1 = require("../../common/PermissionsContext");
|
|
17
17
|
const YamlEditor_1 = tslib_1.__importDefault(require("../../common/CodeEditor/YamlEditor"));
|
|
18
18
|
const NavItem_1 = tslib_1.__importDefault(require("../../NavItem/NavItem"));
|
|
19
|
+
const extraTypes_1 = require("../../../types/extraTypes");
|
|
19
20
|
const authProviderDetailsPermissions = [
|
|
20
21
|
{ kind: rbac_1.RESOURCE.AUTH_PROVIDER, verb: rbac_1.VERB.DELETE },
|
|
21
22
|
{ kind: rbac_1.RESOURCE.AUTH_PROVIDER, verb: rbac_1.VERB.PATCH },
|
|
@@ -34,9 +35,12 @@ const AuthProviderDetails = () => {
|
|
|
34
35
|
};
|
|
35
36
|
const { checkPermissions } = (0, PermissionsContext_1.usePermissionsContext)();
|
|
36
37
|
const [canDelete, canEdit] = checkPermissions(authProviderDetailsPermissions);
|
|
38
|
+
const isOAuth2 = (authProviderDetails === null || authProviderDetails === void 0 ? void 0 : authProviderDetails.spec.providerType) === extraTypes_1.ProviderType.OAuth2;
|
|
37
39
|
return (React.createElement(DetailsPage_1.default, { loading: isLoading, error: error, id: authProviderId, title: authProviderDetails === null || authProviderDetails === void 0 ? void 0 : authProviderDetails.metadata.name, resourceLink: useNavigate_1.ROUTE.AUTH_PROVIDERS, resourceType: "Authentication providers", resourceTypeLabel: t('Authentication providers'), actions: (canDelete || canEdit) && (React.createElement(DetailsPageActions_1.default, null,
|
|
38
40
|
React.createElement(react_core_1.DropdownList, null,
|
|
39
|
-
canEdit && (React.createElement(react_core_1.DropdownItem, { onClick: () => navigate({ route: useNavigate_1.ROUTE.AUTH_PROVIDER_EDIT, postfix: authProviderId })
|
|
41
|
+
canEdit && (React.createElement(react_core_1.DropdownItem, { onClick: () => navigate({ route: useNavigate_1.ROUTE.AUTH_PROVIDER_EDIT, postfix: authProviderId }), isAriaDisabled: isOAuth2, tooltipProps: isOAuth2
|
|
42
|
+
? { content: React.createElement("span", null, t('OAuth2 providers can only be edited via the YAML editor')) }
|
|
43
|
+
: undefined }, t('Edit authentication provider'))),
|
|
40
44
|
canDelete && (React.createElement(react_core_1.DropdownItem, { onClick: () => setIsDeleteModalOpen(true) }, t('Delete authentication provider')))))), nav: React.createElement(react_core_1.Nav, { variant: "tertiary" },
|
|
41
45
|
React.createElement(react_core_1.NavList, null,
|
|
42
46
|
React.createElement(NavItem_1.default, { to: "details" }, t('Details')),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthProviderDetails.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/AuthProviderDetails/AuthProviderDetails.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAAkF;AAIlF,8EAA2E;AAC3E,wFAAwD;AACxD,sGAAsE;AACtE,8FAA8D;AAC9D,gGAAgE;AAChE,kEAA+D;AAC/D,4DAAgE;AAChE,gEAA6D;AAC7D,8CAAqD;AACrD,mGAAmE;AACnE,wEAAwE;AACxE,4FAA4D;AAC5D,4EAA4C;
|
|
1
|
+
{"version":3,"file":"AuthProviderDetails.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/AuthProviderDetails/AuthProviderDetails.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthProviderRow.d.ts","sourceRoot":"","sources":["../../../../src/components/AuthProvider/AuthProviderRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAchD,QAAA,MAAM,eAAe;cAA6C,YAAY;mBAAiB,YAAY;
|
|
1
|
+
{"version":3,"file":"AuthProviderRow.d.ts","sourceRoot":"","sources":["../../../../src/components/AuthProvider/AuthProviderRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAchD,QAAA,MAAM,eAAe;cAA6C,YAAY;mBAAiB,YAAY;uBAsE1G,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -7,6 +7,7 @@ const react_core_1 = require("@patternfly/react-core");
|
|
|
7
7
|
const useTranslation_1 = require("../../hooks/useTranslation");
|
|
8
8
|
const useNavigate_1 = require("../../hooks/useNavigate");
|
|
9
9
|
const rbac_1 = require("../../types/rbac");
|
|
10
|
+
const extraTypes_1 = require("../../types/extraTypes");
|
|
10
11
|
const types_1 = require("./CreateAuthProvider/types");
|
|
11
12
|
const utils_1 = require("./CreateAuthProvider/utils");
|
|
12
13
|
const PermissionsContext_1 = require("../common/PermissionsContext");
|
|
@@ -29,8 +30,15 @@ const AuthProviderRow = ({ provider, onDeleteClick }) => {
|
|
|
29
30
|
},
|
|
30
31
|
];
|
|
31
32
|
if (canEdit) {
|
|
33
|
+
const isDisableEdit = providerSpec.providerType === extraTypes_1.ProviderType.OAuth2;
|
|
32
34
|
actions.push({
|
|
33
35
|
title: t('Edit'),
|
|
36
|
+
isAriaDisabled: isDisableEdit,
|
|
37
|
+
tooltipProps: isDisableEdit
|
|
38
|
+
? {
|
|
39
|
+
content: t('OAuth2 providers can only be edited via the YAML editor'),
|
|
40
|
+
}
|
|
41
|
+
: undefined,
|
|
34
42
|
onClick: () => navigate({ route: useNavigate_1.ROUTE.AUTH_PROVIDER_EDIT, postfix: providerName }),
|
|
35
43
|
});
|
|
36
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthProviderRow.js","sourceRoot":"","sources":["../../../../src/components/AuthProvider/AuthProviderRow.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"AuthProviderRow.js","sourceRoot":"","sources":["../../../../src/components/AuthProvider/AuthProviderRow.tsx"],"names":[],"mappings":"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"}
|
|
@@ -81,7 +81,7 @@ exports.RoleClaimHelperText = RoleClaimHelperText;
|
|
|
81
81
|
const RoleSeparatorHelperText = () => {
|
|
82
82
|
const { t } = (0, useTranslation_1.useTranslation)();
|
|
83
83
|
return (React.createElement("div", null,
|
|
84
|
-
React.createElement("p", null, t('Separator for org:role format (default: ":"). Roles containing the separator are split into organization-scoped roles. Roles without separator are global and apply to all organizations. Example: "org1:admin" becomes org-scoped role "admin" for organization "org1", while "admin" becomes a global role.'))));
|
|
84
|
+
React.createElement("p", null, t('Separator for org:role format (default: ":"). Roles containing the separator are split into organization-scoped roles. Roles without separator are global and apply to all organizations. Example: "org1:flightctl-admin" becomes org-scoped role "flightctl-admin" for organization "org1", while "flightctl-admin" becomes a global role.'))));
|
|
85
85
|
};
|
|
86
86
|
exports.RoleSeparatorHelperText = RoleSeparatorHelperText;
|
|
87
87
|
//# sourceMappingURL=AuthProviderHelperText.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthProviderHelperText.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/AuthProviderHelperText.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,kEAA+D;AAExD,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,OAAO,CACL;QACE;YACE;gBAAS,CAAC,CAAC,SAAS,CAAC;oBAAW;YAC/B,CAAC,CAAC,4EAA4E,CAAC,CAC9E;QACJ;YACE;gBAAS,CAAC,CAAC,eAAe,CAAC;oBAAW;;YAAE,CAAC,CAAC,0DAA0D,CAAC,CACnG;QACJ;YACE;gBAAS,CAAC,CAAC,iBAAiB,CAAC;oBAAW;;YAAE,CAAC,CAAC,iCAAiC,CAAC,CAC5E,CACA,CACP,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,gBAAgB,oBAgB3B;AAEK,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,OAAO,CACL;QACE;YACE;gBAAS,CAAC,CAAC,SAAS,CAAC;oBAAW;;YAAE,CAAC,CAAC,6CAA6C,CAAC,CAChF;QACJ;YACE;gBAAS,CAAC,CAAC,QAAQ,CAAC;oBAAW;YAAC,GAAG;YAClC,CAAC,CACA,8MAA8M,CAC/M,CACC;QACJ;YACE;gBAAS,CAAC,CAAC,cAAc,CAAC;oBAAW;YAAC,GAAG;YACxC,CAAC,CACA,6GAA6G,CAC9G,CACC,CACA,CACP,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,uBAAuB,2BAqBlC;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,OAAO,CACL;QACE;YACE;gBAAS,CAAC,CAAC,SAAS,CAAC;oBAAW;YAAC,GAAG;YACnC,CAAC,CAAC,kFAAkF,CAAC,CACpF;QACJ;YACE;gBAAS,CAAC,CAAC,eAAe,CAAC;oBAAW;;YAAE,CAAC,CAAC,oEAAoE,CAAC,CAC7G;QACJ;YACE;gBAAS,CAAC,CAAC,QAAQ,CAAC;oBAAW;YAAC,GAAG;YAClC,CAAC,CAAC,yFAAyF,CAAC,CAC3F;QACJ;YACE;gBAAS,CAAC,CAAC,iBAAiB,CAAC;oBAAW;;YAAE,CAAC,CAAC,wCAAwC,CAAC,CACnF,CACA,CACP,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B;AAEK,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,OAAO,CACL;QACE,+BACG,CAAC,CACA
|
|
1
|
+
{"version":3,"file":"AuthProviderHelperText.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/AuthProviderHelperText.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,kEAA+D;AAExD,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,OAAO,CACL;QACE;YACE;gBAAS,CAAC,CAAC,SAAS,CAAC;oBAAW;YAC/B,CAAC,CAAC,4EAA4E,CAAC,CAC9E;QACJ;YACE;gBAAS,CAAC,CAAC,eAAe,CAAC;oBAAW;;YAAE,CAAC,CAAC,0DAA0D,CAAC,CACnG;QACJ;YACE;gBAAS,CAAC,CAAC,iBAAiB,CAAC;oBAAW;;YAAE,CAAC,CAAC,iCAAiC,CAAC,CAC5E,CACA,CACP,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,gBAAgB,oBAgB3B;AAEK,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,OAAO,CACL;QACE;YACE;gBAAS,CAAC,CAAC,SAAS,CAAC;oBAAW;;YAAE,CAAC,CAAC,6CAA6C,CAAC,CAChF;QACJ;YACE;gBAAS,CAAC,CAAC,QAAQ,CAAC;oBAAW;YAAC,GAAG;YAClC,CAAC,CACA,8MAA8M,CAC/M,CACC;QACJ;YACE;gBAAS,CAAC,CAAC,cAAc,CAAC;oBAAW;YAAC,GAAG;YACxC,CAAC,CACA,6GAA6G,CAC9G,CACC,CACA,CACP,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,uBAAuB,2BAqBlC;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,OAAO,CACL;QACE;YACE;gBAAS,CAAC,CAAC,SAAS,CAAC;oBAAW;YAAC,GAAG;YACnC,CAAC,CAAC,kFAAkF,CAAC,CACpF;QACJ;YACE;gBAAS,CAAC,CAAC,eAAe,CAAC;oBAAW;;YAAE,CAAC,CAAC,oEAAoE,CAAC,CAC7G;QACJ;YACE;gBAAS,CAAC,CAAC,QAAQ,CAAC;oBAAW;YAAC,GAAG;YAClC,CAAC,CAAC,yFAAyF,CAAC,CAC3F;QACJ;YACE;gBAAS,CAAC,CAAC,iBAAiB,CAAC;oBAAW;;YAAE,CAAC,CAAC,wCAAwC,CAAC,CACnF,CACA,CACP,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B;AAEK,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,OAAO,CACL;QACE,+BACG,CAAC,CACA,6UAA6U,CAC9U,CACC,CACA,CACP,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,uBAAuB,2BAWlC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAuthProvider.d.ts","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/CreateAuthProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"CreateAuthProvider.d.ts","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/CreateAuthProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAgI/B,QAAA,MAAM,iCAAiC,yBAYtC,CAAC;AAEF,eAAe,iCAAiC,CAAC"}
|
|
@@ -42,6 +42,7 @@ const CreateAuthProvider = ({ authProviderId }) => {
|
|
|
42
42
|
void fetchAuthProvider();
|
|
43
43
|
}
|
|
44
44
|
}, [get, authProviderId]);
|
|
45
|
+
let title;
|
|
45
46
|
let content;
|
|
46
47
|
if (error) {
|
|
47
48
|
content = (React.createElement(react_core_1.Alert, { isInline: true, variant: "danger", title: t('An error occurred') },
|
|
@@ -54,15 +55,13 @@ const CreateAuthProvider = ({ authProviderId }) => {
|
|
|
54
55
|
content = (React.createElement(react_core_1.Bullseye, null,
|
|
55
56
|
React.createElement(react_core_1.Spinner, null)));
|
|
56
57
|
}
|
|
57
|
-
else {
|
|
58
|
-
content = (React.createElement(
|
|
59
|
-
|
|
60
|
-
let title;
|
|
61
|
-
if (!!authProviderDetails) {
|
|
62
|
-
title = t('Edit authentication provider');
|
|
58
|
+
else if ((authProviderDetails === null || authProviderDetails === void 0 ? void 0 : authProviderDetails.spec.providerType) === extraTypes_1.ProviderType.OAuth2) {
|
|
59
|
+
content = (React.createElement(react_core_1.PageSection, { variant: react_core_1.PageSectionVariants.light },
|
|
60
|
+
React.createElement(react_core_1.Alert, { isInline: true, variant: "danger", title: t('Not allowed') }, t('OAuth2 providers can only be edited via the YAML editor'))));
|
|
63
61
|
}
|
|
64
62
|
else {
|
|
65
|
-
title = t('Add authentication provider');
|
|
63
|
+
title = authProviderDetails ? t('Edit authentication provider') : t('Add authentication provider');
|
|
64
|
+
content = (React.createElement(CreateAuthProviderForm_1.default, { authProvider: authProviderDetails, onClose: () => navigate(useNavigate_1.ROUTE.AUTH_PROVIDERS), onSuccess: (authProvider) => navigate({ route: useNavigate_1.ROUTE.AUTH_PROVIDER_DETAILS, postfix: authProvider.metadata.name }) }));
|
|
66
65
|
}
|
|
67
66
|
return (React.createElement(React.Fragment, null,
|
|
68
67
|
React.createElement(react_core_1.PageSection, { variant: "light", type: "breadcrumb" },
|
|
@@ -72,10 +71,8 @@ const CreateAuthProvider = ({ authProviderId }) => {
|
|
|
72
71
|
authProviderId && (React.createElement(react_core_1.BreadcrumbItem, null,
|
|
73
72
|
React.createElement(useNavigate_1.Link, { to: { route: useNavigate_1.ROUTE.AUTH_PROVIDER_DETAILS, postfix: authProviderId } }, authProviderId))),
|
|
74
73
|
React.createElement(react_core_1.BreadcrumbItem, { isActive: true }, title))),
|
|
75
|
-
React.createElement(react_core_1.PageSection, { variant: react_core_1.PageSectionVariants.light },
|
|
76
|
-
React.createElement(react_core_1.Title, { headingLevel: "h1", size: "3xl" }, title),
|
|
77
|
-
React.createElement(react_core_1.TextContent, null,
|
|
78
|
-
React.createElement(react_core_1.Text, { component: react_core_1.TextVariants.small }, t("Set up how users will sign in and which organization they'll be assigned to.")))),
|
|
74
|
+
title && (React.createElement(react_core_1.PageSection, { variant: react_core_1.PageSectionVariants.light, className: "pf-v5-u-pt-0" },
|
|
75
|
+
React.createElement(react_core_1.Title, { headingLevel: "h1", size: "3xl" }, title))),
|
|
79
76
|
React.createElement(react_core_1.PageSection, { variant: react_core_1.PageSectionVariants.light, className: "pf-v5-u-pt-0" }, content)));
|
|
80
77
|
};
|
|
81
78
|
const createAuthProviderPermissions = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAuthProvider.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/CreateAuthProvider.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"CreateAuthProvider.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/CreateAuthProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAuthProviderForm.d.ts","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/CreateAuthProviderForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"CreateAuthProviderForm.d.ts","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/CreateAuthProviderForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAsDhD,eAAO,MAAM,gBAAgB;;uBA0E5B,CAAC;AAmFF,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,IAAI,CAAC;IAChD,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,QAAA,MAAM,sBAAsB,yCAA0C,2BAA2B,sBAyChG,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
|
|
@@ -11,7 +11,6 @@ const useTranslation_1 = require("../../../hooks/useTranslation");
|
|
|
11
11
|
const useFetch_1 = require("../../../hooks/useFetch");
|
|
12
12
|
const NameField_1 = tslib_1.__importDefault(require("../../form/NameField"));
|
|
13
13
|
const TextField_1 = tslib_1.__importDefault(require("../../form/TextField"));
|
|
14
|
-
const RadioField_1 = tslib_1.__importDefault(require("../../form/RadioField"));
|
|
15
14
|
const SwitchField_1 = tslib_1.__importDefault(require("../../form/SwitchField"));
|
|
16
15
|
const ListItemField_1 = tslib_1.__importDefault(require("../../form/ListItemField"));
|
|
17
16
|
const FlightCtlForm_1 = tslib_1.__importDefault(require("../../form/FlightCtlForm"));
|
|
@@ -27,14 +26,6 @@ const AuthOrganizationAssignment_1 = tslib_1.__importDefault(require("./AuthOrga
|
|
|
27
26
|
const RoleAssignmentSection_1 = tslib_1.__importDefault(require("./RoleAssignmentSection"));
|
|
28
27
|
const TestConnectionModal_1 = tslib_1.__importDefault(require("../TestConnectionModal/TestConnectionModal"));
|
|
29
28
|
const AuthProviderHelperText_1 = require("./AuthProviderHelperText");
|
|
30
|
-
const ProviderTypeSection = () => {
|
|
31
|
-
const { t } = (0, useTranslation_1.useTranslation)();
|
|
32
|
-
return (React.createElement(react_core_1.Split, { hasGutter: true },
|
|
33
|
-
React.createElement(react_core_1.SplitItem, null,
|
|
34
|
-
React.createElement(RadioField_1.default, { id: "oidc-provider-radio", name: "providerType", label: t('OIDC'), checkedValue: extraTypes_1.ProviderType.OIDC })),
|
|
35
|
-
React.createElement(react_core_1.SplitItem, null,
|
|
36
|
-
React.createElement(RadioField_1.default, { id: "oauth2-provider-radio", name: "providerType", label: t('OAuth2'), checkedValue: extraTypes_1.ProviderType.OAuth2 }))));
|
|
37
|
-
};
|
|
38
29
|
const EnabledHelpText = () => {
|
|
39
30
|
const { t } = (0, useTranslation_1.useTranslation)();
|
|
40
31
|
return (React.createElement(react_core_1.Popover, { bodyContent: React.createElement("div", null,
|
|
@@ -55,20 +46,22 @@ const AuthProviderForm = ({ isEdit }) => {
|
|
|
55
46
|
React.createElement(NameField_1.default, { name: "name", "aria-label": t('Provider name'), isRequired: true, isDisabled: isEdit, resourceType: "authproviders", validations: (0, validations_1.getDnsSubdomainValidations)(t), helperText: t("You can't change the provider name after it's created") }),
|
|
56
47
|
React.createElement(react_core_1.FormGroup, { label: t('Display name') },
|
|
57
48
|
React.createElement(TextField_1.default, { name: "displayName", "aria-label": t('Display name'), helperText: t('Display name for this provider') })),
|
|
58
|
-
React.createElement(ProviderTypeSection, null),
|
|
59
49
|
values.providerType === extraTypes_1.ProviderType.OAuth2 && React.createElement(Oauth2ProviderFields_1.default, null),
|
|
60
|
-
React.createElement(react_core_1.
|
|
61
|
-
React.createElement(
|
|
62
|
-
|
|
63
|
-
React.createElement(
|
|
64
|
-
|
|
65
|
-
React.createElement(
|
|
50
|
+
React.createElement(react_core_1.FormSection, { title: t('OIDC') },
|
|
51
|
+
React.createElement(react_core_1.FormGroup, { label: t('Issuer URL'), isRequired: isOidcProvider },
|
|
52
|
+
React.createElement(TextField_1.default, { name: "issuer", "aria-label": t('Issuer URL') })),
|
|
53
|
+
React.createElement(react_core_1.FormGroup, { label: t('Client ID'), isRequired: true },
|
|
54
|
+
React.createElement(TextField_1.default, { name: "clientId", "aria-label": t('Client ID') })),
|
|
55
|
+
React.createElement(react_core_1.FormGroup, { label: t('Client secret'), isRequired: true },
|
|
56
|
+
React.createElement(TextField_1.default, { name: "clientSecret", "aria-label": t('Client secret'), type: "password" }))),
|
|
57
|
+
React.createElement(react_core_1.Divider, { style: { margin: '2rem 0 1rem' } }),
|
|
66
58
|
React.createElement(react_core_1.FormSection, { title: t('User identity & authorization') },
|
|
67
59
|
React.createElement(WithHelperText_1.FormGroupWithHelperText, { label: t('Scopes'), content: React.createElement(AuthProviderHelperText_1.ScopesHelperText, null) },
|
|
68
60
|
React.createElement(ListItemField_1.default, { name: "scopes", helperText: t('Add scopes required to access username and role claims from your authentication provider.'), addButtonText: t('Add scope') })),
|
|
69
61
|
React.createElement(WithHelperText_1.FormGroupWithHelperText, { label: t('Username claim path'), content: React.createElement(AuthProviderHelperText_1.UsernameClaimHelperText, null) },
|
|
70
62
|
React.createElement(ListItemField_1.default, { name: "usernameClaim", helperText: t('Enter the path segments to the username claim'), addButtonText: t('Add path segment'), resolvedValue: (items) => items.join('.'), resolvedLabel: t('Resulting username claim') }))),
|
|
71
63
|
React.createElement(RoleAssignmentSection_1.default, null),
|
|
64
|
+
React.createElement(react_core_1.Divider, { style: { margin: '2rem 0 1rem' } }),
|
|
72
65
|
React.createElement(AuthOrganizationAssignment_1.default, null)));
|
|
73
66
|
};
|
|
74
67
|
exports.AuthProviderForm = AuthProviderForm;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAuthProviderForm.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/CreateAuthProviderForm.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"CreateAuthProviderForm.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/CreateAuthProviderForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,11 +13,11 @@ const types_1 = require("./types");
|
|
|
13
13
|
const WithHelperText_1 = require("../../common/WithHelperText");
|
|
14
14
|
const AuthProviderHelperText_1 = require("./AuthProviderHelperText");
|
|
15
15
|
const getAvailableRoles = (t) => ({
|
|
16
|
-
admin: t('System administrator'),
|
|
17
|
-
'org-admin': t('Organization administrator'),
|
|
18
|
-
operator: t('Operator'),
|
|
19
|
-
installer: t('Installer'),
|
|
20
|
-
viewer: t('Viewer'),
|
|
16
|
+
'flightctl-admin': t('System administrator'),
|
|
17
|
+
'flightctl-org-admin': t('Organization administrator'),
|
|
18
|
+
'flightctl-operator': t('Operator'),
|
|
19
|
+
'flightctl-installer': t('Installer'),
|
|
20
|
+
'flightctl-viewer': t('Viewer'),
|
|
21
21
|
});
|
|
22
22
|
const RoleSelector = () => {
|
|
23
23
|
const { t } = (0, useTranslation_1.useTranslation)();
|
|
@@ -47,7 +47,7 @@ const RoleSelector = () => {
|
|
|
47
47
|
return (React.createElement(React.Fragment, null,
|
|
48
48
|
React.createElement(FieldHelperText_1.DefaultHelperText, { helperText: t('List of roles to assign to all users from this provider') }),
|
|
49
49
|
React.createElement(react_core_1.LabelGroup, { numLabels: 5, isEditable: true, addLabelControl: React.createElement(react_core_1.Select, { isOpen: isOpen, onOpenChange: setIsOpen, onSelect: (_, value) => onAddRole(value), toggle: (toggleRef) => (React.createElement(react_core_1.MenuToggle, { ref: toggleRef, isDisabled: !hasAvailableRoles, onClick: () => setIsOpen(!isOpen), isExpanded: isOpen, className: "pf-v5-u-ml-xs" }, t('Add role'))), shouldFocusToggleOnSelect: true },
|
|
50
|
-
React.createElement(react_core_1.SelectList, null, availableRoles.map((role) => (React.createElement(react_core_1.SelectOption, { key: role.value, value: role.value }, role.label))))) }, roles.map((roleCode) => (React.createElement(react_core_1.Label, { key: roleCode, onClose: () => onDelete(roleCode), textMaxWidth: "18ch"
|
|
50
|
+
React.createElement(react_core_1.SelectList, null, availableRoles.map((role) => (React.createElement(react_core_1.SelectOption, { key: role.value, value: role.value }, role.label))))) }, roles.map((roleCode) => (React.createElement(react_core_1.Label, { key: roleCode, onClose: () => onDelete(roleCode), textMaxWidth: "18ch" }, allRoles[roleCode])))),
|
|
51
51
|
React.createElement(FieldHelperText_1.default, { meta: meta, touchRequired: false })));
|
|
52
52
|
};
|
|
53
53
|
const RoleAssignmentSection = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoleAssignmentSection.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/RoleAssignmentSection.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAE/B,uDAWgC;AAChC,mCAAoD;AAEpD,kEAA+D;AAC/D,+EAA+C;AAC/C,qFAAqD;AACrD,6EAA6C;AAC7C,sFAAgF;AAChF,mCAAqE;AACrE,gEAAsE;AACtE,qEAAwF;AAExF,MAAM,iBAAiB,GAAG,CAAC,CAAY,EAA0B,EAAE,CAAC,CAAC;IACnE,
|
|
1
|
+
{"version":3,"file":"RoleAssignmentSection.js","sourceRoot":"","sources":["../../../../../src/components/AuthProvider/CreateAuthProvider/RoleAssignmentSection.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAE/B,uDAWgC;AAChC,mCAAoD;AAEpD,kEAA+D;AAC/D,+EAA+C;AAC/C,qFAAqD;AACrD,6EAA6C;AAC7C,sFAAgF;AAChF,mCAAqE;AACrE,gEAAsE;AACtE,qEAAwF;AAExF,MAAM,iBAAiB,GAAG,CAAC,CAAY,EAA0B,EAAE,CAAC,CAAC;IACnE,iBAAiB,EAAE,CAAC,CAAC,sBAAsB,CAAC;IAC5C,qBAAqB,EAAE,CAAC,CAAC,4BAA4B,CAAC;IACtD,oBAAoB,EAAE,CAAC,CAAC,UAAU,CAAC;IACnC,qBAAqB,EAAE,CAAC,CAAC,WAAW,CAAC;IACrC,kBAAkB,EAAE,CAAC,CAAC,QAAQ,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,GAAG,EAAE;IACxB,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAW,aAAa,CAAC,CAAC;IACjF,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAElD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAClC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAER,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACxC,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;aAC5B,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aACjD,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC,CAAC;IACR,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEtB,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE;QACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,QAAQ,CAAC,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC;QACD,SAAS,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAE;QAChC,QAAQ,CACN,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,EAC/B,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;IAEpD,OAAO,CACL;QACE,oBAAC,mCAAiB,IAAC,UAAU,EAAE,CAAC,CAAC,yDAAyD,CAAC,GAAI;QAC/F,oBAAC,uBAAU,IACT,SAAS,EAAE,CAAC,EACZ,UAAU,QACV,eAAe,EACb,oBAAC,mBAAM,IACL,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,QAAQ,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAe,CAAC,EAClD,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CACrB,oBAAC,uBAAU,IACT,GAAG,EAAE,SAAS,EACd,UAAU,EAAE,CAAC,iBAAiB,EAC9B,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EACjC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAC,eAAe,IAExB,CAAC,CAAC,UAAU,CAAC,CACH,CACd,EACD,yBAAyB;gBAEzB,oBAAC,uBAAU,QACR,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAC5B,oBAAC,yBAAY,IAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,IAC7C,IAAI,CAAC,KAAK,CACE,CAChB,CAAC,CACS,CACN,IAGV,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CACvB,oBAAC,kBAAK,IAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAC,MAAM,IACzE,QAAQ,CAAC,QAAQ,CAAC,CACb,CACT,CAAC,CACS;QACb,oBAAC,yBAAe,IAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,GAAI,CACpD,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACjC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAgB,GAA0B,CAAC;IAE9D,OAAO,CACL,oBAAC,wBAAW,IAAC,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAAE,SAAS,EAAC,eAAe;QACjE,oBAAC,kBAAK,IAAC,SAAS;YACd,oBAAC,sBAAS;gBACR,oBAAC,oBAAU,IACT,EAAE,EAAC,sBAAsB,EACzB,IAAI,EAAC,oBAAoB,EACzB,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,EAClB,YAAY,EAAE,0BAAkB,CAAC,MAAM,GACvC,CACQ;YACZ,oBAAC,sBAAS;gBACR,oBAAC,oBAAU,IACT,EAAE,EAAC,uBAAuB,EAC1B,IAAI,EAAC,oBAAoB,EACzB,KAAK,EAAE,CAAC,CAAC,SAAS,CAAC,EACnB,YAAY,EAAE,0BAAkB,CAAC,OAAO,GACxC,CACQ,CACN;QAEP,MAAM,CAAC,kBAAkB,KAAK,0BAAkB,CAAC,MAAM,IAAI,CAC1D,oBAAC,sBAAS,IAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,UAAU;YACtC,oBAAC,YAAY,OAAG,CACN,CACb;QAEA,MAAM,CAAC,kBAAkB,KAAK,0BAAkB,CAAC,OAAO,IAAI,CAC3D;YACE,oBAAC,wCAAuB,IAAC,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,oBAAC,4CAAmB,OAAG;gBACpF,oBAAC,uBAAa,IACZ,IAAI,EAAC,eAAe,EACpB,UAAU,EAAE,CAAC,CACX,gGAAgG,CACjG,EACD,aAAa,EAAE,CAAC,CAAC,kBAAkB,CAAC,GACpC,CACsB;YAE1B,oBAAC,wCAAuB,IAAC,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,oBAAC,gDAAuB,OAAG;gBAClF,oBAAC,mBAAS,IAAC,IAAI,EAAC,eAAe,EAAC,EAAE,EAAC,eAAe,gBAAa,CAAC,CAAC,WAAW,CAAC,EAAE,WAAW,EAAC,GAAG,GAAG,CACzE,CACzB,CACJ,CACW,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,qBAAqB,CAAC"}
|
|
@@ -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;AAW1C,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,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;AAmHF,QAAA,MAAM,0BAA0B,UAAW,gBAAgB,sBAQ1D,CAAC;AAEF,eAAe,0BAA0B,CAAC"}
|
|
@@ -20,6 +20,30 @@ const TerminalTab = ({ device }) => {
|
|
|
20
20
|
const { t } = (0, useTranslation_1.useTranslation)();
|
|
21
21
|
const terminal = React.useRef(null);
|
|
22
22
|
const { currentOrganization } = (0, OrganizationGuard_1.useOrganizationGuardContext)();
|
|
23
|
+
const containerRef = React.useRef(null);
|
|
24
|
+
const [containerHeight, setContainerHeight] = React.useState('calc(97vh - 300px)');
|
|
25
|
+
React.useEffect(() => {
|
|
26
|
+
const updateHeight = () => {
|
|
27
|
+
if (containerRef.current) {
|
|
28
|
+
const boundingRect = containerRef.current.getBoundingClientRect();
|
|
29
|
+
if (boundingRect.top > 0) {
|
|
30
|
+
setContainerHeight(`calc(97vh - ${Math.ceil(boundingRect.top)}px)`);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
updateHeight();
|
|
35
|
+
// Use ResizeObserver to detect when container position changes
|
|
36
|
+
const resizeObserver = new ResizeObserver(updateHeight);
|
|
37
|
+
// Also listen to window resize for viewport changes
|
|
38
|
+
window.addEventListener('resize', updateHeight);
|
|
39
|
+
if (containerRef.current) {
|
|
40
|
+
resizeObserver.observe(containerRef.current);
|
|
41
|
+
}
|
|
42
|
+
return () => {
|
|
43
|
+
resizeObserver.disconnect();
|
|
44
|
+
window.removeEventListener('resize', updateHeight);
|
|
45
|
+
};
|
|
46
|
+
}, []);
|
|
23
47
|
const onMsgReceived = React.useCallback((message) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
24
48
|
var _b;
|
|
25
49
|
try {
|
|
@@ -56,14 +80,15 @@ const TerminalTab = ({ device }) => {
|
|
|
56
80
|
if (error) {
|
|
57
81
|
return React.createElement(ErrorAlert_1.default, { error: error });
|
|
58
82
|
}
|
|
59
|
-
return (React.createElement(
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
React.createElement(
|
|
83
|
+
return (React.createElement("div", { ref: containerRef, style: { height: containerHeight, display: 'flex', flexDirection: 'column' } },
|
|
84
|
+
React.createElement(react_core_1.Stack, { hasGutter: true, style: { height: '100%', display: 'flex', flexDirection: 'column' } },
|
|
85
|
+
isClosed && (React.createElement(react_core_1.Alert, { isInline: true, variant: "info", title: t('Connection was closed'), actionLinks: React.createElement(react_core_1.AlertActionLink, { onClick: () => {
|
|
86
|
+
var _a;
|
|
87
|
+
(_a = terminal.current) === null || _a === void 0 ? void 0 : _a.reset();
|
|
88
|
+
reconnect();
|
|
89
|
+
} }, t('Reconnect')) })),
|
|
90
|
+
React.createElement(react_core_1.StackItem, { isFilled: true },
|
|
91
|
+
React.createElement(Terminal_1.default, { onData: sendMessage, ref: terminal })))));
|
|
67
92
|
};
|
|
68
93
|
const TerminalTabWithPermissions = (props) => {
|
|
69
94
|
const { checkPermissions, loading } = (0, PermissionsContext_1.usePermissionsContext)();
|
|
@@ -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,wEAAwE;AACxE,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;
|
|
1
|
+
{"version":3,"file":"TerminalTab.js","sourceRoot":"","sources":["../../../../../src/components/Device/DeviceDetails/TerminalTab.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceSpecUtils.d.ts","sourceRoot":"","sources":["../../../../../src/components/Device/EditDeviceWizard/deviceSpecUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,
|
|
1
|
+
{"version":3,"file":"deviceSpecUtils.d.ts","sourceRoot":"","sources":["../../../../../src/components/Device/EditDeviceWizard/deviceSpecUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EAIvB,UAAU,EAIV,sBAAsB,EAKtB,wBAAwB,EAExB,YAAY,EACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,OAAO,EAKP,oBAAoB,EACpB,UAAU,EAQV,kBAAkB,EAClB,oBAAoB,EAYrB,MAAM,2BAA2B,CAAC;AAOnC,eAAO,MAAM,aAAa,qBAAqB,CAAC;AA6BhD,eAAO,MAAM,aAAa,WAAY,oBAAoB,KAAG,UAAU,GAAG,SAYzE,CAAC;AA2DF,eAAO,MAAM,0BAA0B,mBACrB,oBAAoB,EAAE,cAC1B,oBAAoB,EAAE,cACtB,MAAM,iBAwDnB,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,OAAO,KAAG,uBAiF/C,CAAC;AAqKF,eAAO,MAAM,qBAAqB,aACtB,MAAM,eACH,uBAAuB,EAAE,eACzB,OAAO,EAAE,iBA0CvB,CAAC;AAEF,eAAO,MAAM,YAAY,OAAQ,kBAAkB,KAAG,oBAkDrD,CAAC;AAsBF,eAAO,MAAM,oBAAoB,gBAAiB,UAAU,KAAG,OAAO,EAuDrE,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBAAiB,UAAU,KAAG,oBAAoB,EAOnF,CAAC;AAEF,eAAO,MAAM,wBAAwB,gBAAiB,UAAU,uBAAuB,OAAO,yBAkD7F,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,MAAM,KAAG,MAItD,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,sBAO1B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,sBAO7B,CAAC;AAsCF,eAAO,MAAM,0BAA0B,EAAE,wBAQxC,CAAC;AAEF,eAAO,MAAM,+BAA+B,gBAAiB,UAAU,KAAG,OASzE,CAAC"}
|
|
@@ -149,7 +149,7 @@ const getDeviceSpecConfigPatches = (currentConfigs, newConfigs, configPath) => {
|
|
|
149
149
|
};
|
|
150
150
|
exports.getDeviceSpecConfigPatches = getDeviceSpecConfigPatches;
|
|
151
151
|
const toAPIApplication = (app) => {
|
|
152
|
-
var _a;
|
|
152
|
+
var _a, _b, _c;
|
|
153
153
|
const envVars = app.variables.reduce((acc, variable) => {
|
|
154
154
|
acc[variable.name] = variable.value;
|
|
155
155
|
return acc;
|
|
@@ -158,16 +158,13 @@ const toAPIApplication = (app) => {
|
|
|
158
158
|
const volume = {
|
|
159
159
|
name: v.name || '',
|
|
160
160
|
};
|
|
161
|
-
|
|
162
|
-
const hasImage = v.volumeType === deviceSpec_1.VolumeType.IMAGE_ONLY || v.volumeType === deviceSpec_1.VolumeType.IMAGE_MOUNT;
|
|
163
|
-
const hasMount = v.volumeType === deviceSpec_1.VolumeType.MOUNT_ONLY || v.volumeType === deviceSpec_1.VolumeType.IMAGE_MOUNT;
|
|
164
|
-
if (hasImage && v.imageRef) {
|
|
161
|
+
if (v.imageRef) {
|
|
165
162
|
volume.image = {
|
|
166
163
|
reference: v.imageRef,
|
|
167
|
-
pullPolicy: v.imagePullPolicy,
|
|
164
|
+
pullPolicy: v.imagePullPolicy || types_1.ImagePullPolicy.PullIfNotPresent,
|
|
168
165
|
};
|
|
169
166
|
}
|
|
170
|
-
if (
|
|
167
|
+
if (v.mountPath) {
|
|
171
168
|
volume.mount = {
|
|
172
169
|
path: v.mountPath,
|
|
173
170
|
};
|
|
@@ -187,8 +184,15 @@ const toAPIApplication = (app) => {
|
|
|
187
184
|
if (app.ports) {
|
|
188
185
|
data.ports = app.ports.map((p) => `${p.hostPort}:${p.containerPort}`);
|
|
189
186
|
}
|
|
190
|
-
|
|
191
|
-
|
|
187
|
+
// Removed fields must not appear in the resources object
|
|
188
|
+
const appLimits = {};
|
|
189
|
+
if ((_b = app.limits) === null || _b === void 0 ? void 0 : _b.cpu) {
|
|
190
|
+
appLimits.cpu = app.limits.cpu;
|
|
191
|
+
}
|
|
192
|
+
if ((_c = app.limits) === null || _c === void 0 ? void 0 : _c.memory) {
|
|
193
|
+
appLimits.memory = app.limits.memory;
|
|
194
|
+
}
|
|
195
|
+
if (Object.keys(appLimits).length > 0) {
|
|
192
196
|
data.resources = {
|
|
193
197
|
limits: appLimits,
|
|
194
198
|
};
|
|
@@ -225,13 +229,17 @@ const hasInlineApplicationChanged = (currentApp, updatedApp) => {
|
|
|
225
229
|
if (currentApp.inline.length !== updatedApp.files.length) {
|
|
226
230
|
return true;
|
|
227
231
|
}
|
|
228
|
-
|
|
232
|
+
const filesChanged = currentApp.inline.some((file, index) => {
|
|
229
233
|
const updatedFile = updatedApp.files[index];
|
|
230
234
|
const isCurrentBase64 = file.contentEncoding === types_1.EncodingType.EncodingBase64;
|
|
231
235
|
return ((updatedFile.base64 || false) !== isCurrentBase64 ||
|
|
232
236
|
updatedFile.path !== file.path ||
|
|
233
237
|
updatedFile.content !== file.content);
|
|
234
238
|
});
|
|
239
|
+
if (filesChanged) {
|
|
240
|
+
return true;
|
|
241
|
+
}
|
|
242
|
+
return !areVolumesEqual(currentApp.volumes || [], updatedApp.volumes || []);
|
|
235
243
|
};
|
|
236
244
|
const areVolumesEqual = (currentVolumes, updatedFormVolumes) => {
|
|
237
245
|
if (currentVolumes.length !== updatedFormVolumes.length) {
|
|
@@ -249,10 +257,12 @@ const areVolumesEqual = (currentVolumes, updatedFormVolumes) => {
|
|
|
249
257
|
if (currentImageRef !== updatedImageRef) {
|
|
250
258
|
return false;
|
|
251
259
|
}
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
260
|
+
if (currentImageRef || updatedImageRef) {
|
|
261
|
+
const currentPullPolicy = ((_b = currentFullVol.image) === null || _b === void 0 ? void 0 : _b.pullPolicy) || types_1.ImagePullPolicy.PullIfNotPresent;
|
|
262
|
+
const updatedPullPolicy = (updatedFormVol === null || updatedFormVol === void 0 ? void 0 : updatedFormVol.imagePullPolicy) || types_1.ImagePullPolicy.PullIfNotPresent;
|
|
263
|
+
if (currentPullPolicy !== updatedPullPolicy) {
|
|
264
|
+
return false;
|
|
265
|
+
}
|
|
256
266
|
}
|
|
257
267
|
const currentMountPath = ((_c = currentFullVol.mount) === null || _c === void 0 ? void 0 : _c.path) || '';
|
|
258
268
|
const updatedMountPath = (updatedFormVol === null || updatedFormVol === void 0 ? void 0 : updatedFormVol.mountPath) || '';
|
|
@@ -437,23 +447,16 @@ const convertVolumesToForm = (volumes) => {
|
|
|
437
447
|
if (!volumes)
|
|
438
448
|
return [];
|
|
439
449
|
return volumes.map((vol) => {
|
|
440
|
-
var _a, _b
|
|
450
|
+
var _a, _b;
|
|
441
451
|
const fullVolume = vol;
|
|
442
452
|
const volForm = {
|
|
443
453
|
name: fullVolume.name,
|
|
444
454
|
imageRef: ((_a = fullVolume.image) === null || _a === void 0 ? void 0 : _a.reference) || '',
|
|
445
|
-
|
|
446
|
-
mountPath: ((_c = fullVolume.mount) === null || _c === void 0 ? void 0 : _c.path) || '',
|
|
455
|
+
mountPath: ((_b = fullVolume.mount) === null || _b === void 0 ? void 0 : _b.path) || '',
|
|
447
456
|
};
|
|
448
|
-
//
|
|
449
|
-
if (
|
|
450
|
-
volForm.
|
|
451
|
-
}
|
|
452
|
-
else if (volForm.imageRef) {
|
|
453
|
-
volForm.volumeType = deviceSpec_1.VolumeType.IMAGE_ONLY;
|
|
454
|
-
}
|
|
455
|
-
else if (volForm.mountPath) {
|
|
456
|
-
volForm.volumeType = deviceSpec_1.VolumeType.MOUNT_ONLY;
|
|
457
|
+
// Only set imagePullPolicy if there's an image
|
|
458
|
+
if (fullVolume.image) {
|
|
459
|
+
volForm.imagePullPolicy = fullVolume.image.pullPolicy || types_1.ImagePullPolicy.PullIfNotPresent;
|
|
457
460
|
}
|
|
458
461
|
return volForm;
|
|
459
462
|
});
|