Skip to content

Commit

Permalink
fix: Made the maven build run again (Needed to fix the dependency to …
Browse files Browse the repository at this point in the history
…primereact to 10.12.1 as 10.13.0 seems to have a regression.
  • Loading branch information
chrisdutz committed Jan 20, 2024
1 parent 9b4f01b commit ef67e41
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 4 deletions.
2 changes: 1 addition & 1 deletion plc4j/tools/ui/frontend/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"axios": "^1.6.2",
"primeflex": "^3.3.1",
"primeicons": "^6.0.1",
"primereact": "^10.3.0",
"primereact": "10.2.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "^9.0.4",
Expand Down
20 changes: 19 additions & 1 deletion plc4j/tools/ui/frontend/frontend/src/components/DeviceDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import {Device} from "../generated/plc4j-tools-ui-frontend.ts";
import {Dialog} from "primereact/dialog";
import {Button} from "primereact/button";
import {InputText} from "primereact/inputtext";
import withWidth from "@mui/material/Hidden/withWidth";
import {DataTable} from "primereact/datatable";
import {Column} from "primereact/column";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export default function NavigationTree({treeItems}: NavigationTreeProps) {
const treeNodes: TreeNode[] = treeItems.map(value => createTreeNode(value, new Counter()))
return (
<div>
<DeviceDialog device={dialogDevice.current} visible={showDeviceDialog} />
<DeviceDialog device={dialogDevice.current} visible={showDeviceDialog} onSave={console.log} onCancel={console.log} />
<ContextMenu model={menu} ref={cm}/>
<Tree value={treeNodes}
selectionMode="single"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
/* tslint:disable */
/* eslint-disable */
// Generated using typescript-generator version 3.2.1263 on 2024-01-19 18:01:48.
// Generated using typescript-generator version 3.2.1263 on 2024-01-20 11:37:19.

export interface Device {
id: number;
Expand Down

0 comments on commit ef67e41

Please sign in to comment.