You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2024/01/20 10:42:30 UTC
(plc4x) branch feature/new-ui-tool updated (d80824ddee -> ef67e419da)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch feature/new-ui-tool
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from d80824ddee Merge remote-tracking branch 'origin/develop' into feature/new-ui-tool
new 9b4f01b307 fix: Downgraded the rat plugin as version 0.16 introduced a significant performance degradation which is currently being discussed)
new ef67e419da fix: Made the maven build run again (Needed to fix the dependency to primereact to 10.12.1 as 10.13.0 seems to have a regression.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
plc4j/tools/ui/frontend/frontend/package.json | 2 +-
.../frontend/src/components/DeviceDialog.tsx | 20 +++++++++++++++++++-
.../frontend/src/components/NavigationTree.tsx | 2 +-
.../src/generated/plc4j-tools-ui-frontend.ts | 2 +-
pom.xml | 3 ++-
5 files changed, 24 insertions(+), 5 deletions(-)
(plc4x) 02/02: fix: Made the maven build run again (Needed to fix the dependency to primereact to 10.12.1 as 10.13.0 seems to have a regression.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/new-ui-tool
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit ef67e419da42de8bc450116a71a34d325336902d
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Sat Jan 20 11:42:21 2024 +0100
fix: Made the maven build run again (Needed to fix the dependency to primereact to 10.12.1 as 10.13.0 seems to have a regression.
---
plc4j/tools/ui/frontend/frontend/package.json | 2 +-
.../frontend/src/components/DeviceDialog.tsx | 20 +++++++++++++++++++-
.../frontend/src/components/NavigationTree.tsx | 2 +-
.../src/generated/plc4j-tools-ui-frontend.ts | 2 +-
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/plc4j/tools/ui/frontend/frontend/package.json b/plc4j/tools/ui/frontend/frontend/package.json
index 8174c491e9..a8072d6321 100644
--- a/plc4j/tools/ui/frontend/frontend/package.json
+++ b/plc4j/tools/ui/frontend/frontend/package.json
@@ -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",
diff --git a/plc4j/tools/ui/frontend/frontend/src/components/DeviceDialog.tsx b/plc4j/tools/ui/frontend/frontend/src/components/DeviceDialog.tsx
index 3954427297..8c659f695b 100644
--- a/plc4j/tools/ui/frontend/frontend/src/components/DeviceDialog.tsx
+++ b/plc4j/tools/ui/frontend/frontend/src/components/DeviceDialog.tsx
@@ -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";
diff --git a/plc4j/tools/ui/frontend/frontend/src/components/NavigationTree.tsx b/plc4j/tools/ui/frontend/frontend/src/components/NavigationTree.tsx
index 299e0000c3..3bddf5e49a 100644
--- a/plc4j/tools/ui/frontend/frontend/src/components/NavigationTree.tsx
+++ b/plc4j/tools/ui/frontend/frontend/src/components/NavigationTree.tsx
@@ -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"
diff --git a/plc4j/tools/ui/frontend/frontend/src/generated/plc4j-tools-ui-frontend.ts b/plc4j/tools/ui/frontend/frontend/src/generated/plc4j-tools-ui-frontend.ts
index 07105c5f4e..72234b87c7 100644
--- a/plc4j/tools/ui/frontend/frontend/src/generated/plc4j-tools-ui-frontend.ts
+++ b/plc4j/tools/ui/frontend/frontend/src/generated/plc4j-tools-ui-frontend.ts
@@ -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;
(plc4x) 01/02: fix: Downgraded the rat plugin as version 0.16 introduced a significant performance degradation which is currently being discussed)
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/new-ui-tool
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 9b4f01b307a431b1f4d2189b085f28e45f885a86
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Sat Jan 20 11:40:14 2024 +0100
fix: Downgraded the rat plugin as version 0.16 introduced a significant performance degradation which is currently being discussed)
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a3dff35dca..0fc8a0d633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1052,7 +1052,8 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.16</version>
+ <!-- TODO: There currently is a significant performance degradation when using version 0.16 -->
+ <version>0.15</version>
<configuration>
<!--
Make rat output the files with missing licensed directly into the