Skip to content

Commit

Permalink
Merge pull request #27 from mmarkwort/issue/25_StringListSupport
Browse files Browse the repository at this point in the history 
Added support for list with primitive types
  • Loading branch information
@dbeuchler
dbeuchler authored Nov 10, 2020
2 parents 8dca014 + 7c3ac49 commit ad9df9a
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 26 deletions.
107 changes: 81 additions & 26 deletions ...Moryx.Runtime.Maintenance.Web.UI/src/modules/components/ConfigEditor/CollectionEditor.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,14 @@ import Icon from "@mdi/react";
import * as React from "react";
import { Button, ButtonGroup, Col, Collapse, Container, DropdownItem, DropdownMenu, DropdownToggle, Input, Row } from "reactstrap";
import Entry from "../../models/Entry";
import { EntryValueType } from "../../models/EntryValueType";
import BooleanEditor from "./BooleanEditor";
import ByteEditor from "./ByteEditor";
import CollapsibleEntryEditorBase, { CollapsibleEntryEditorBasePropModel } from "./CollapsibleEntryEditorBase";
import ConfigEditor from "./ConfigEditor";
import EnumEditor from "./EnumEditor";
import NumberEditor from "./NumberEditor";
import StringEditor from "./StringEditor";

interface CollectionEditorStateModel {
SelectedEntry: string;
Expand Down Expand Up @@ -74,6 +80,35 @@ export default class CollectionEditor extends CollapsibleEntryEditorBase<Collect
}

public preRenderConfigEditor(entry: Entry): React.ReactNode {
if (!Entry.isClassOrCollection(entry)) {
switch (entry.Value.Type) {
case EntryValueType.Byte: {
return (<ByteEditor Entry={entry} IsReadOnly={this.props.IsReadOnly} />);
}
case EntryValueType.Boolean: {
return (<BooleanEditor Entry={entry} IsReadOnly={this.props.IsReadOnly} />);
}
case EntryValueType.Int16:
case EntryValueType.UInt16:
case EntryValueType.Int32:
case EntryValueType.UInt32:
case EntryValueType.Int64:
case EntryValueType.UInt64:
case EntryValueType.Single:
case EntryValueType.Double: {
return (<NumberEditor Entry={entry} IsReadOnly={this.props.IsReadOnly} />);
}
case EntryValueType.String: {
return (<StringEditor Entry={entry} IsReadOnly={this.props.IsReadOnly} />);
}
case EntryValueType.Enum: {
return (<EnumEditor Entry={entry} IsReadOnly={this.props.IsReadOnly} />);
}
}

return (<span>Not implemented yet: {entry.Value.Type}</span>);
}

return <ConfigEditor ParentEntry={entry}
Entries={entry.SubEntries}
Root={this.props.Root}
Expand All @@ -87,32 +122,52 @@ export default class CollectionEditor extends CollapsibleEntryEditorBase<Collect
<Collapse isOpen={this.props.IsExpanded}>
<Container fluid={true} className="no-padding up-space down-space">
{
this.props.Entry.SubEntries.map((entry, idx) =>
<div key={idx}>
<Row className="table-row down-space">
<Col md={6} className="no-padding">{entry.DisplayName}</Col>
<Col md={6} className="no-padding">
<ButtonGroup>
<Button color="secondary" onClick={() => this.props.navigateToEntry(entry)}>
<Icon path={mdiFolderOpen} className="icon right-space" />
Open
</Button>
<Button color="secondary" onClick={() => this.toggleCollapsible(entry.UniqueIdentifier)}>
<Icon path={mdiChevronDown} className="icon right-space" />
Expand
</Button>
<Button color="secondary" onClick={() => this.removeEntry(entry)} disabled={this.props.Entry.Value.IsReadOnly || this.props.IsReadOnly}>
<Icon path={mdiTrashCanOutline} className="icon right-space" />
Remove
</Button>
</ButtonGroup>
</Col>
</Row>
<Collapse isOpen={this.isExpanded(entry.UniqueIdentifier)}>
{this.preRenderConfigEditor(entry)}
</Collapse>
</div>,
)
this.props.Entry.SubEntries.map((entry, idx) => {
if (Entry.isClassOrCollection(entry)) {
return (
<div key={idx}>
<Row className="table-row down-space">
<Col md={6} className="no-padding">{entry.DisplayName}</Col>
<Col md={6} className="no-padding">
<ButtonGroup>
<Button color="secondary" onClick={() => this.props.navigateToEntry(entry)}>
<Icon path={mdiFolderOpen} className="icon right-space" />
Open
</Button>
<Button color="secondary" onClick={() => this.toggleCollapsible(entry.UniqueIdentifier)}>
<Icon path={mdiChevronDown} className="icon right-space" />
Expand
</Button>
<Button color="secondary" onClick={() => this.removeEntry(entry)} disabled={this.props.Entry.Value.IsReadOnly || this.props.IsReadOnly}>
<Icon path={mdiTrashCanOutline} className="icon right-space" />
Remove
</Button>
</ButtonGroup>
</Col>
</Row>
<Collapse isOpen={this.isExpanded(entry.UniqueIdentifier)}>
{this.preRenderConfigEditor(entry)}
</Collapse>
</div>
);
} else {
return (
<div key={idx}>
<Row className="table-row down-space">
<Col md={6} className="no-padding">{this.preRenderConfigEditor(entry)}</Col>
<Col md={6} className="no-padding">
<ButtonGroup>
<Button color="secondary" onClick={() => this.removeEntry(entry)} disabled={this.props.Entry.Value.IsReadOnly || this.props.IsReadOnly}>
<Icon path={mdiTrashCanOutline} className="icon right-space" />
Remove
</Button>
</ButtonGroup>
</Col>
</Row>
</div>
);
}
})
}
<Row>
<Col md={12} className="no-padding">
Expand Down
5 changes: 5 additions & 0 deletions src/Moryx.Runtime.Maintenance.Web.UI/src/modules/models/Entry.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import uuidv1 = require("uuid/v1");
import Config from "./Config";
import EntryValidation from "./EntryValidation";
import EntryValue from "./EntryValue";
import { EntryValueType } from "./EntryValueType";

export default class Entry {
public DisplayName: string;
Expand All @@ -27,6 +28,10 @@ export default class Entry {
this.Validation = new EntryValidation();
}

public static isClassOrCollection(entry: Entry): boolean {
return entry.Value.Type === EntryValueType.Class || entry.Value.Type === EntryValueType.Collection;
}

public static entryChain(entry: Entry): Entry[] {
const entryChain: Entry[] = [entry];
let currentEntry = entry;
Expand Down

0 comments on commit ad9df9a

Please sign in to comment.