-
Notifications
You must be signed in to change notification settings - Fork 301
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
HPCC-28073 Additional service calls to be added to Dali Admin #17627
Merged
GordonSmith
merged 1 commit into
hpcc-systems:candidate-9.2.x
from
kunalaswani:HPCC-28073
Aug 21, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
import * as React from "react"; | ||
import { DefaultButton, DetailsList, DetailsListLayoutMode, IColumn } from "@fluentui/react"; | ||
import { SizeMe } from "react-sizeme"; | ||
import { csvParse } from "d3-dsv"; | ||
import { DaliService } from "@hpcc-js/comms"; | ||
import { scopedLogger } from "@hpcc-js/util"; | ||
import { TableGroup } from "./forms/Groups"; | ||
import { useConfirm } from "../hooks/confirm"; | ||
import nlsHPCC from "src/nlsHPCC"; | ||
import { HolyGrail } from "../layouts/HolyGrail"; | ||
|
||
const logger = scopedLogger("src-react/components/DaliAdd.tsx"); | ||
|
||
const myDaliService = new DaliService({ baseUrl: "" }); | ||
|
||
interface DaliAddProps { | ||
} | ||
|
||
export const DaliAdd: React.FunctionComponent<DaliAddProps> = ({ | ||
|
||
}) => { | ||
|
||
const [columns, setColumns] = React.useState<IColumn[]>([]); | ||
const [items, setItems] = React.useState<any[]>([]); | ||
const [path, setPath] = React.useState<string>(""); | ||
const [value, setValue] = React.useState<string>(""); | ||
|
||
const [DaliPromptConfirm, setDaliPromptConfirm] = useConfirm({ | ||
title: nlsHPCC.DaliAdmin, | ||
message: nlsHPCC.DaliPromptConfirm, | ||
onSubmit: React.useCallback(() => { | ||
myDaliService.Add({ Path: path, Value: value }).then(response => { | ||
const data = csvParse(response.Result); | ||
setColumns(data.columns.map((col, idx) => { | ||
return { | ||
key: col, | ||
name: col, | ||
fieldName: col, | ||
minWidth: 100 | ||
}; | ||
})); | ||
setItems(data); | ||
}).catch(err => logger.error(err)); | ||
}, [path, value]) | ||
}); | ||
|
||
const onSubmit = React.useCallback(() => { | ||
setDaliPromptConfirm(true); | ||
}, [setDaliPromptConfirm]); | ||
|
||
return <HolyGrail | ||
header={<span><TableGroup fields={{ | ||
"Path": { label: nlsHPCC.Path, type: "string", value: path }, | ||
"Value": { label: nlsHPCC.Value, type: "string", value: value }, | ||
}} onChange={(id, value) => { | ||
switch (id) { | ||
case "Path": | ||
setPath(value); | ||
break; | ||
case "Value": | ||
setValue(value); | ||
break; | ||
default: | ||
logger.debug(`${id}: ${value}`); | ||
} | ||
}} /><DefaultButton onClick={onSubmit} text={nlsHPCC.Submit} /></span>} | ||
main={<SizeMe monitorHeight>{({ size }) => { | ||
const height = `${size.height}px`; | ||
return <div style={{ position: "relative", width: "100%", height: "100%" }}> | ||
<div style={{ position: "absolute", width: "100%", height: `${size.height}px` }}> | ||
<DetailsList compact={true} | ||
items={items} | ||
columns={columns} | ||
setKey="key" | ||
layoutMode={DetailsListLayoutMode.justified} | ||
selectionPreservedOnEmptyClick={true} | ||
styles={{ root: { height, minHeight: height, maxHeight: height } }} | ||
/> | ||
<DaliPromptConfirm /> | ||
</div> | ||
</div>; | ||
}}</SizeMe>} | ||
/>; | ||
}; |
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,65 @@ | ||
import * as React from "react"; | ||
import { DefaultButton, DetailsList, DetailsListLayoutMode, IColumn } from "@fluentui/react"; | ||
import { SizeMe } from "react-sizeme"; | ||
import { DaliService } from "@hpcc-js/comms"; | ||
import { scopedLogger } from "@hpcc-js/util"; | ||
import { TableGroup } from "./forms/Groups"; | ||
import nlsHPCC from "src/nlsHPCC"; | ||
import { HolyGrail } from "../layouts/HolyGrail"; | ||
|
||
const logger = scopedLogger("src-react/components/DaliCount.tsx"); | ||
|
||
const myDaliService = new DaliService({ baseUrl: "" }); | ||
|
||
interface CountRequestProps { | ||
|
||
} | ||
|
||
export const DaliCount: React.FunctionComponent<CountRequestProps> = ({ | ||
|
||
}) => { | ||
|
||
const [columns, setColumns] = React.useState<IColumn[]>([]); | ||
const [items, setItems] = React.useState<any[]>([]); | ||
const [path, setPath] = React.useState<string>(""); | ||
|
||
const onSubmit = React.useCallback(() => { | ||
myDaliService.Count({ Path: path }).then(response => { | ||
const data = [{ | ||
key: "Result", | ||
result: response.Result | ||
}]; | ||
const columns = [{ | ||
key: "Result", | ||
name: "Result", | ||
fieldName: "result", | ||
minWidth: 100 | ||
}]; | ||
setItems(data); | ||
setColumns(columns); // Add this line to set the columns as well | ||
}).catch(err => logger.error(err)); | ||
}, [path]); | ||
|
||
return <HolyGrail | ||
header={<span><TableGroup fields={{ | ||
"Path": { label: nlsHPCC.Path, type: "string", value: path }, | ||
}} onChange={(id, value) => { | ||
setPath(value); | ||
}} /><DefaultButton onClick={onSubmit} text={nlsHPCC.Submit} /></span>} | ||
main={<SizeMe monitorHeight>{({ size }) => { | ||
const height = `${size.height}px`; | ||
return <div style={{ position: "relative", width: "100%", height: "100%" }}> | ||
<div style={{ position: "absolute", width: "100%", height: `${size.height}px` }}> | ||
<DetailsList compact={true} | ||
items={items} | ||
columns={columns} | ||
setKey="key" | ||
layoutMode={DetailsListLayoutMode.justified} | ||
selectionPreservedOnEmptyClick={true} | ||
styles={{ root: { height, minHeight: height, maxHeight: height } }} | ||
/> | ||
</div> | ||
</div>; | ||
}}</SizeMe>} | ||
/>; | ||
}; |
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,73 @@ | ||
import * as React from "react"; | ||
import { DefaultButton, DetailsList, DetailsListLayoutMode, IColumn } from "@fluentui/react"; | ||
import { SizeMe } from "react-sizeme"; | ||
import { csvParse } from "d3-dsv"; | ||
import { DaliService } from "@hpcc-js/comms"; | ||
import { scopedLogger } from "@hpcc-js/util"; | ||
import { TableGroup } from "./forms/Groups"; | ||
import { useConfirm } from "../hooks/confirm"; | ||
import nlsHPCC from "src/nlsHPCC"; | ||
import { HolyGrail } from "../layouts/HolyGrail"; | ||
|
||
const logger = scopedLogger("src-react/components/DaliDelete.tsx"); | ||
|
||
const myDaliService = new DaliService({ baseUrl: "" }); | ||
|
||
interface DaliDeleteProps { | ||
} | ||
|
||
export const DaliDelete: React.FunctionComponent<DaliDeleteProps> = ({ | ||
|
||
}) => { | ||
|
||
const [columns, setColumns] = React.useState<IColumn[]>([]); | ||
const [items, setItems] = React.useState<any[]>([]); | ||
const [path, setPath] = React.useState<string>(""); | ||
|
||
const [DaliPromptConfirm, setDaliPromptConfirm] = useConfirm({ | ||
title: nlsHPCC.DaliAdmin, | ||
message: nlsHPCC.DaliPromptConfirm, | ||
onSubmit: React.useCallback(() => { | ||
myDaliService.Delete({ Path: path }).then(response => { | ||
const data = csvParse(response.Result); | ||
setColumns(data.columns.map((col, idx) => { | ||
return { | ||
key: col, | ||
name: col, | ||
fieldName: col, | ||
minWidth: 100 | ||
}; | ||
})); | ||
setItems(data); | ||
}).catch(err => logger.error(err)); | ||
}, [path]) | ||
}); | ||
|
||
const onSubmit = React.useCallback(() => { | ||
setDaliPromptConfirm(true); | ||
}, [setDaliPromptConfirm]); | ||
|
||
return <HolyGrail | ||
header={<span><TableGroup fields={{ | ||
"Path": { label: nlsHPCC.Path, type: "string", value: path }, | ||
}} onChange={(id, value) => { | ||
setPath(value); | ||
}} /><DefaultButton onClick={onSubmit} text={nlsHPCC.Submit} /></span>} | ||
main={<SizeMe monitorHeight>{({ size }) => { | ||
const height = `${size.height}px`; | ||
return <div style={{ position: "relative", width: "100%", height: "100%" }}> | ||
<div style={{ position: "absolute", width: "100%", height: `${size.height}px` }}> | ||
<DetailsList compact={true} | ||
items={items} | ||
columns={columns} | ||
setKey="key" | ||
layoutMode={DetailsListLayoutMode.justified} | ||
selectionPreservedOnEmptyClick={true} | ||
styles={{ root: { height, minHeight: height, maxHeight: height } }} | ||
/> | ||
<DaliPromptConfirm /> | ||
</div> | ||
</div>; | ||
}}</SizeMe>} | ||
/>; | ||
}; |
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,89 @@ | ||
import * as React from "react"; | ||
import { DefaultButton, DetailsList, DetailsListLayoutMode, IColumn } from "@fluentui/react"; | ||
import { SizeMe } from "react-sizeme"; | ||
import { csvParse } from "d3-dsv"; | ||
import { DaliService } from "@hpcc-js/comms"; | ||
import { scopedLogger } from "@hpcc-js/util"; | ||
import { TableGroup } from "./forms/Groups"; | ||
import { useConfirm } from "../hooks/confirm"; | ||
import nlsHPCC from "src/nlsHPCC"; | ||
import { HolyGrail } from "../layouts/HolyGrail"; | ||
|
||
const logger = scopedLogger("src-react/components/DaliImport.tsx"); | ||
|
||
const myDaliService = new DaliService({ baseUrl: "" }); | ||
|
||
interface DaliImportProps { | ||
} | ||
|
||
export const DaliImport: React.FunctionComponent<DaliImportProps> = ({ | ||
|
||
}) => { | ||
|
||
const [columns, setColumns] = React.useState<IColumn[]>([]); | ||
const [items, setItems] = React.useState<any[]>([]); | ||
const [xml, setXml] = React.useState<string>(""); | ||
const [path, setPath] = React.useState<string>(""); | ||
const [add, setAdd] = React.useState(false); | ||
|
||
const [DaliPromptConfirm, setDaliPromptConfirm] = useConfirm({ | ||
title: nlsHPCC.DaliAdmin, | ||
message: nlsHPCC.DaliPromptConfirm, | ||
onSubmit: React.useCallback(() => { | ||
myDaliService.Import({ XML: xml, Path: path, Add: add }).then(response => { | ||
const data = csvParse(response.Result); | ||
setColumns(data.columns.map((col, idx) => { | ||
return { | ||
key: col, | ||
name: col, | ||
fieldName: col, | ||
minWidth: 100 | ||
}; | ||
})); | ||
setItems(data); | ||
}).catch(err => logger.error(err)); | ||
}, [xml, path, add]) | ||
}); | ||
|
||
const onSubmit = React.useCallback(() => { | ||
setDaliPromptConfirm(true); | ||
}, [setDaliPromptConfirm]); | ||
|
||
return <HolyGrail | ||
header={<span><TableGroup fields={{ | ||
"XML": {label: nlsHPCC.XML, type: "string", value: xml}, | ||
"Path": { label: nlsHPCC.Path, type: "string", value: path }, | ||
"Add": { label: nlsHPCC.Add, type: "checkbox", value: add }, | ||
}} onChange={(id, value) => { | ||
switch (id) { | ||
case "XML": | ||
setXml(value); | ||
break; | ||
case "Path": | ||
setPath(value); | ||
break; | ||
case "Add": | ||
setAdd(value); | ||
break; | ||
default: | ||
logger.debug(`${id}: ${value}`); | ||
} | ||
}} /><DefaultButton onClick={onSubmit} text={nlsHPCC.Submit} /></span>} | ||
main={<SizeMe monitorHeight>{({ size }) => { | ||
const height = `${size.height}px`; | ||
return <div style={{ position: "relative", width: "100%", height: "100%" }}> | ||
<div style={{ position: "absolute", width: "100%", height: `${size.height}px` }}> | ||
<DetailsList compact={true} | ||
items={items} | ||
columns={columns} | ||
setKey="key" | ||
layoutMode={DetailsListLayoutMode.justified} | ||
selectionPreservedOnEmptyClick={true} | ||
styles={{ root: { height, minHeight: height, maxHeight: height } }} | ||
/> | ||
<DaliPromptConfirm /> | ||
</div> | ||
</div>; | ||
}}</SizeMe>} | ||
/>; | ||
}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am curious why the csvParse() is used in DaliImport and DaliDelete and the parser.parse() is used for DaliAdd and DaliCount. In DaliCount, the response.Result is an integer. In DaliAdd/DaliDelete/DaliImport, the response.Result is a string.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For DaliCount using csvparse causes an error where WsDali.CountResponse.Result: number but WsDali.CountRequest.Path?: string... which is why we are using the parser.parse().
DaliAdd was switched back to csvParse, that was an error.