-
Notifications
You must be signed in to change notification settings - Fork 304
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/candidate-9.4.x' into candidate-…
…9.6.x Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
- Loading branch information
Showing
17 changed files
with
420 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,205 @@ | ||
| import * as React from "react"; | ||
| import { Checkbox, CommandBar, ContextualMenuItemType, ICommandBarItemProps, Label, Stack } from "@fluentui/react"; | ||
| import { WsAccess, AccessService } from "@hpcc-js/comms"; | ||
| import { scopedLogger } from "@hpcc-js/util"; | ||
| import nlsHPCC from "src/nlsHPCC"; | ||
| import { useConfirm } from "../hooks/confirm"; | ||
| import { HolyGrail } from "../layouts/HolyGrail"; | ||
| import { ShortVerticalDivider } from "./Common"; | ||
| import { AddGroupResourceForm } from "./forms/AddGroupResource"; | ||
|
|
||
| const logger = scopedLogger("src-react/components/PermissionsEditor.tsx"); | ||
|
|
||
| const service = new AccessService({ baseUrl: "" }); | ||
|
|
||
| // from ShowIndividualPermissionsWidget.js | ||
| const calcPermissionState = (field, value, row) => { | ||
| switch (field) { | ||
| case "allow_access": | ||
| row.allow_full = value && row.allow_read && row.allow_write; | ||
| if (value) | ||
| calcPermissionState("deny_access", false, row); | ||
| break; | ||
| case "allow_read": | ||
| row.allow_full = row.allow_access && value && row.allow_write; | ||
| if (value) | ||
| calcPermissionState("deny_read", false, row); | ||
| break; | ||
| case "allow_write": | ||
| row.allow_full = row.allow_access && row.allow_read && value; | ||
| if (value) | ||
| calcPermissionState("deny_write", false, row); | ||
| break; | ||
| case "allow_full": | ||
| row.allow_access = value; | ||
| row.allow_read = value; | ||
| row.allow_write = value; | ||
| if (value) | ||
| calcPermissionState("deny_full", false, row); | ||
| break; | ||
| case "deny_access": | ||
| row.deny_full = value && row.deny_read && row.deny_write; | ||
| if (value) | ||
| calcPermissionState("allow_access", false, row); | ||
| break; | ||
| case "deny_read": | ||
| row.deny_full = row.deny_access && value && row.deny_write; | ||
| if (value) | ||
| calcPermissionState("allow_read", false, row); | ||
| break; | ||
| case "deny_write": | ||
| row.deny_full = row.deny_access && row.deny_read && value; | ||
| if (value) | ||
| calcPermissionState("allow_write", false, row); | ||
| break; | ||
| case "deny_full": | ||
| row.deny_access = value; | ||
| row.deny_read = value; | ||
| row.deny_write = value; | ||
| if (value) | ||
| calcPermissionState("allow_full", false, row); | ||
| break; | ||
| } | ||
| row[field] = value; | ||
| }; | ||
|
|
||
| interface PermissionsEditorProps { | ||
| BaseDn?: string; | ||
| Name?: string; | ||
| } | ||
|
|
||
| export const PermissionsEditor: React.FunctionComponent<PermissionsEditorProps> = ({ | ||
| BaseDn, | ||
| Name | ||
| }) => { | ||
|
|
||
| const [data, setData] = React.useState<any[]>([]); | ||
| const [selectedIndex, setSelectedIndex] = React.useState(-1); | ||
| const [showAddGroup, setShowAddGroup] = React.useState(false); | ||
|
|
||
| const refreshData = React.useCallback(() => { | ||
| service.ResourcePermissions({ BasednName: BaseDn, name: Name }) | ||
| .then(({ Permissions }: WsAccess.ResourcePermissionsResponse) => { | ||
| setData(Permissions?.Permission.map(Permission => { | ||
| return { | ||
| account_name: Permission.account_name, | ||
| allow_access: Permission.allow_access ?? false, | ||
| allow_read: Permission.allow_read ?? false, | ||
| allow_write: Permission.allow_write ?? false, | ||
| allow_full: Permission.allow_full ?? false, | ||
| deny_access: Permission.deny_access ?? false, | ||
| deny_read: Permission.deny_read ?? false, | ||
| deny_write: Permission.deny_write ?? false, | ||
| deny_full: Permission.deny_full ?? false, | ||
| }; | ||
| })); | ||
| setSelectedIndex(-1); | ||
| }) | ||
| .catch(err => logger.error(err)) | ||
| ; | ||
| }, [BaseDn, Name]); | ||
|
|
||
| const [DeleteConfirm, setShowDeleteConfirm] = useConfirm({ | ||
| title: nlsHPCC.Delete, | ||
| message: nlsHPCC.DeleteSelectedGroups + "\n\n" + data[selectedIndex]?.account_name, | ||
| onSubmit: React.useCallback(() => { | ||
| service.PermissionAction({ | ||
| action: "delete", | ||
| BasednName: BaseDn, | ||
| rname: Name, | ||
| account_name: data[selectedIndex]?.account_name | ||
| }) | ||
| .then(() => refreshData()) | ||
| .catch(err => logger.error(err)) | ||
| ; | ||
| }, [BaseDn, data, Name, refreshData, selectedIndex]) | ||
| }); | ||
|
|
||
| // Command Bar --- | ||
| const buttons = React.useMemo((): ICommandBarItemProps[] => [ | ||
| { | ||
| key: "refresh", text: nlsHPCC.Refresh, iconProps: { iconName: "Refresh" }, | ||
| onClick: () => refreshData() | ||
| }, | ||
| { key: "divider_1", itemType: ContextualMenuItemType.Divider, onRender: () => <ShortVerticalDivider /> }, | ||
| { | ||
| key: "add", text: nlsHPCC.Add, | ||
| onClick: () => setShowAddGroup(true) | ||
| }, | ||
| { key: "divider_2", itemType: ContextualMenuItemType.Divider, onRender: () => <ShortVerticalDivider /> }, | ||
| { | ||
| key: "delete", text: nlsHPCC.Delete, disabled: selectedIndex < 0, | ||
| onClick: () => setShowDeleteConfirm(true) | ||
| }, | ||
| ], [refreshData, selectedIndex, setShowDeleteConfirm]); | ||
|
|
||
| React.useEffect(() => { | ||
| refreshData(); | ||
| }, [refreshData]); | ||
|
|
||
| const onRowSelect = React.useCallback((evt, index) => { | ||
| if (evt.target.checked) { | ||
| setSelectedIndex(index); | ||
| } else { | ||
| setSelectedIndex(-1); | ||
| } | ||
| }, [setSelectedIndex]); | ||
|
|
||
| const onPermissionCheckboxClick = React.useCallback((evt, permission, prop) => { | ||
| calcPermissionState(prop, evt.target.checked, permission); | ||
| service.PermissionAction({ | ||
| action: "update", | ||
| BasednName: BaseDn, | ||
| rname: Name, | ||
| account_type: 1, | ||
| ...permission | ||
| }).then(({ retcode, retmsg }) => { | ||
| if (retcode === 0) { | ||
| setData(prevState => { | ||
| const newState = Array.from(prevState); | ||
| return newState; | ||
| }); | ||
| } else if (retcode === -1) { | ||
| logger.error(retmsg); | ||
| refreshData(); | ||
| } | ||
| }).catch(err => logger.error(err)); | ||
| }, [BaseDn, Name, refreshData]); | ||
|
|
||
| return <> | ||
| <HolyGrail | ||
| header={<CommandBar items={buttons} />} | ||
| main={ | ||
| <div style={{ margin: "0 10px" }}> | ||
| <Stack horizontal> | ||
| <Stack.Item grow={1}><Label>{nlsHPCC.Account}</Label></Stack.Item> | ||
| <Stack.Item style={{ width: "min-content", margin: "0 10px" }}><Label>{nlsHPCC.AllowAccess}</Label></Stack.Item> | ||
| <Stack.Item style={{ width: "min-content", margin: "0 10px" }}><Label>{nlsHPCC.AllowRead}</Label></Stack.Item> | ||
| <Stack.Item style={{ width: "min-content", margin: "0 10px" }}><Label>{nlsHPCC.AllowWrite}</Label></Stack.Item> | ||
| <Stack.Item style={{ width: "min-content", margin: "0 16px 0 10px" }}><Label>{nlsHPCC.AllowFull}</Label></Stack.Item> | ||
| <Stack.Item style={{ width: "min-content", margin: "0 10px 0 16px" }}><Label>{nlsHPCC.DenyAccess}</Label></Stack.Item> | ||
| <Stack.Item style={{ width: "min-content", margin: "0 10px" }}><Label>{nlsHPCC.DenyRead}</Label></Stack.Item> | ||
| <Stack.Item style={{ width: "min-content", margin: "0 10px" }}><Label>{nlsHPCC.DenyWrite}</Label></Stack.Item> | ||
| <Stack.Item style={{ width: "min-content", margin: "0 10px" }}><Label>{nlsHPCC.DenyFull}</Label></Stack.Item> | ||
| </Stack> | ||
| {data?.map((permission, index) => ( | ||
| <Stack horizontal style={{ marginBottom: 5 }}> | ||
| <Stack.Item><Checkbox checked={index === selectedIndex ? true : false} onChange={(ev) => onRowSelect(ev, index)} /></Stack.Item> | ||
| <Stack.Item grow={1}>{permission.account_name}</Stack.Item> | ||
| <Stack.Item style={{ width: 36, margin: "0 10px" }}><Checkbox checked={permission.allow_access} onChange={(ev) => onPermissionCheckboxClick(ev, permission, "allow_access")} /></Stack.Item> | ||
| <Stack.Item style={{ width: 36, margin: "0 10px" }}><Checkbox checked={permission.allow_read} onChange={(ev) => onPermissionCheckboxClick(ev, permission, "allow_read")} /></Stack.Item> | ||
| <Stack.Item style={{ width: 36, margin: "0 10px" }}><Checkbox checked={permission.allow_write} onChange={(ev) => onPermissionCheckboxClick(ev, permission, "allow_write")} /></Stack.Item> | ||
| <Stack.Item style={{ width: 36, margin: "0 20px 0 10px" }}><Checkbox checked={permission.allow_full} onChange={(ev) => onPermissionCheckboxClick(ev, permission, "allow_full")} /></Stack.Item> | ||
| <Stack.Item style={{ width: 36, margin: "0 10px" }}><Checkbox checked={permission.deny_access} onChange={(ev) => onPermissionCheckboxClick(ev, permission, "deny_access")} /></Stack.Item> | ||
| <Stack.Item style={{ width: 36, margin: "0 10px" }}><Checkbox checked={permission.deny_read} onChange={(ev) => onPermissionCheckboxClick(ev, permission, "deny_read")} /></Stack.Item> | ||
| <Stack.Item style={{ width: 36, margin: "0 10px" }}><Checkbox checked={permission.deny_write} onChange={(ev) => onPermissionCheckboxClick(ev, permission, "deny_write")} /></Stack.Item> | ||
| <Stack.Item style={{ width: 36, margin: "0 10px" }}><Checkbox checked={permission.deny_full} onChange={(ev) => onPermissionCheckboxClick(ev, permission, "deny_full")} /></Stack.Item> | ||
| </Stack> | ||
| ))} | ||
| </div> | ||
| } | ||
| /> | ||
| <AddGroupResourceForm rname={Name} BasednName={BaseDn} refreshGrid={refreshData} showForm={showAddGroup} setShowForm={setShowAddGroup} /> | ||
| <DeleteConfirm /> | ||
| </>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.