diff --git a/pom.xml b/pom.xml index 39cdbd8..f252f27 100644 --- a/pom.xml +++ b/pom.xml @@ -260,6 +260,12 @@ src/test/resources/META-INF/resources + + + src/main/resources/META-INF/resources + src/test/resources/META-INF/resources + + @@ -525,7 +531,7 @@ v24 - 24.2.6 + 24.3.20 17 17 11.0.12 diff --git a/src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChart.java b/src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChart.java index 4a6356a..f1711df 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChart.java +++ b/src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChart.java @@ -1,17 +1,15 @@ -package com.flowingcode.vaadin.addons.orgchart; - /*- * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -19,6 +17,8 @@ * limitations under the License. * #L% */ +package com.flowingcode.vaadin.addons.orgchart; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -54,6 +54,7 @@ @Tag("fc-orgchart") @JsModule("./fc-orgchart.js") @CssImport("./fc-orgchart-styles.css") +@NpmPackage(value = "json-digger", version = "2.0.2") public class OrgChart extends Div { private OrgChartItem orgChartItem; diff --git a/src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChartItem.java b/src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChartItem.java index 8f70117..27340cf 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChartItem.java +++ b/src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChartItem.java @@ -1,17 +1,15 @@ -package com.flowingcode.vaadin.addons.orgchart; - /*- * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -19,6 +17,8 @@ * limitations under the License. * #L% */ +package com.flowingcode.vaadin.addons.orgchart; + import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/OrgChartState.java b/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/OrgChartState.java index ff2ce1f..b599474 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/OrgChartState.java +++ b/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/OrgChartState.java @@ -1,17 +1,15 @@ -package com.flowingcode.vaadin.addons.orgchart.client; - /*- * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -19,6 +17,8 @@ * limitations under the License. * #L% */ +package com.flowingcode.vaadin.addons.orgchart.client; + import com.flowingcode.vaadin.addons.orgchart.client.constants.ChartConstants; import com.flowingcode.vaadin.addons.orgchart.client.enums.ChartDirectionEnum; diff --git a/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/constants/ChartConstants.java b/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/constants/ChartConstants.java index 9a20c5d..e83a902 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/constants/ChartConstants.java +++ b/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/constants/ChartConstants.java @@ -1,17 +1,15 @@ -package com.flowingcode.vaadin.addons.orgchart.client.constants; - /*- * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -19,6 +17,8 @@ * limitations under the License. * #L% */ +package com.flowingcode.vaadin.addons.orgchart.client.constants; + public interface ChartConstants { diff --git a/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/enums/ChartDirectionEnum.java b/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/enums/ChartDirectionEnum.java index 439a09d..68b6e16 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/enums/ChartDirectionEnum.java +++ b/src/main/java/com/flowingcode/vaadin/addons/orgchart/client/enums/ChartDirectionEnum.java @@ -1,17 +1,15 @@ -package com.flowingcode.vaadin.addons.orgchart.client.enums; - /*- * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -19,6 +17,8 @@ * limitations under the License. * #L% */ +package com.flowingcode.vaadin.addons.orgchart.client.enums; + /** * Enumeration of the directions that the organization chart can have.
diff --git a/src/main/java/com/flowingcode/vaadin/addons/orgchart/extra/TemplateLiteralRewriter.java b/src/main/java/com/flowingcode/vaadin/addons/orgchart/extra/TemplateLiteralRewriter.java index 72a1f41..a09dafc 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/orgchart/extra/TemplateLiteralRewriter.java +++ b/src/main/java/com/flowingcode/vaadin/addons/orgchart/extra/TemplateLiteralRewriter.java @@ -2,14 +2,14 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + package com.flowingcode.vaadin.addons.orgchart.extra; /** diff --git a/src/main/resources/META-INF/frontend/fc-orgchart.js b/src/main/resources/META-INF/frontend/fc-orgchart.js index dbcb627..2173517 100644 --- a/src/main/resources/META-INF/frontend/fc-orgchart.js +++ b/src/main/resources/META-INF/frontend/fc-orgchart.js @@ -2,7 +2,7 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,11 @@ * limitations under the License. * #L% */ + import {html, PolymerElement} from '@polymer/polymer/polymer-element.js'; import jQuery from "jquery"; import html2canvas from 'html2canvas'; +import JSONDigger from "json-digger/dist/json-digger.js"; /** * `fc-orgchart` @@ -93,6 +95,7 @@ class FCOrgChart extends PolymerElement { }); window.html2canvas = html2canvas; + window.JSONDigger = JSONDigger; // add title var title = state.chartTitle; diff --git a/src/main/resources/META-INF/resources/frontend/fc-orgchart-styles.css b/src/main/resources/META-INF/resources/frontend/fc-orgchart-styles.css index 19beda9..460a0ef 100644 --- a/src/main/resources/META-INF/resources/frontend/fc-orgchart-styles.css +++ b/src/main/resources/META-INF/resources/frontend/fc-orgchart-styles.css @@ -2,7 +2,7 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + .orgchart .node { width: 140px; @@ -24,4 +25,4 @@ .orgchart .node .content { overflow: hidden; -} \ No newline at end of file +} diff --git a/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java b/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java index a4d4d70..44c729d 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java +++ b/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java @@ -2,14 +2,14 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + package com.flowingcode.vaadin.addons; import com.vaadin.flow.component.html.Div; diff --git a/src/test/java/com/flowingcode/vaadin/addons/orgchart/BottomTopDemo.java b/src/test/java/com/flowingcode/vaadin/addons/orgchart/BottomTopDemo.java index 8655233..c1ff4aa 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/orgchart/BottomTopDemo.java +++ b/src/test/java/com/flowingcode/vaadin/addons/orgchart/BottomTopDemo.java @@ -2,14 +2,14 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + package com.flowingcode.vaadin.addons.orgchart; import java.util.Arrays; diff --git a/src/test/java/com/flowingcode/vaadin/addons/orgchart/DemoView.java b/src/test/java/com/flowingcode/vaadin/addons/orgchart/DemoView.java index 10a3853..95f40fc 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/orgchart/DemoView.java +++ b/src/test/java/com/flowingcode/vaadin/addons/orgchart/DemoView.java @@ -2,14 +2,14 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + package com.flowingcode.vaadin.addons.orgchart; import com.vaadin.flow.component.orderedlayout.VerticalLayout; diff --git a/src/test/java/com/flowingcode/vaadin/addons/orgchart/DragAndDropExportDemo.java b/src/test/java/com/flowingcode/vaadin/addons/orgchart/DragAndDropExportDemo.java index f15d9c7..2e309b8 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/orgchart/DragAndDropExportDemo.java +++ b/src/test/java/com/flowingcode/vaadin/addons/orgchart/DragAndDropExportDemo.java @@ -2,14 +2,14 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + package com.flowingcode.vaadin.addons.orgchart; import java.util.Arrays; diff --git a/src/test/java/com/flowingcode/vaadin/addons/orgchart/HybridEnhancedChartDemo.java b/src/test/java/com/flowingcode/vaadin/addons/orgchart/HybridEnhancedChartDemo.java index de5cc13..4fa2b6f 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/orgchart/HybridEnhancedChartDemo.java +++ b/src/test/java/com/flowingcode/vaadin/addons/orgchart/HybridEnhancedChartDemo.java @@ -2,14 +2,14 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + package com.flowingcode.vaadin.addons.orgchart; import java.util.Arrays; diff --git a/src/test/java/com/flowingcode/vaadin/addons/orgchart/ImageInTitleDemo.java b/src/test/java/com/flowingcode/vaadin/addons/orgchart/ImageInTitleDemo.java index 3a63cea..45186e6 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/orgchart/ImageInTitleDemo.java +++ b/src/test/java/com/flowingcode/vaadin/addons/orgchart/ImageInTitleDemo.java @@ -2,14 +2,14 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + package com.flowingcode.vaadin.addons.orgchart; import java.util.Arrays; diff --git a/src/test/java/com/flowingcode/vaadin/addons/orgchart/OrgchartDemoView.java b/src/test/java/com/flowingcode/vaadin/addons/orgchart/OrgchartDemoView.java index 0baac34..9841a13 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/orgchart/OrgchartDemoView.java +++ b/src/test/java/com/flowingcode/vaadin/addons/orgchart/OrgchartDemoView.java @@ -2,14 +2,14 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed 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. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + package com.flowingcode.vaadin.addons.orgchart; import com.flowingcode.vaadin.addons.DemoLayout; diff --git a/src/test/resources/META-INF/resources/frontend/styles/orgchart/demo-styles.css b/src/test/resources/META-INF/resources/frontend/styles/orgchart/demo-styles.css index dcd326d..d583080 100644 --- a/src/test/resources/META-INF/resources/frontend/styles/orgchart/demo-styles.css +++ b/src/test/resources/META-INF/resources/frontend/styles/orgchart/demo-styles.css @@ -2,7 +2,7 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ * #L% */ + .chart-container { position: relative; display: inline-block; diff --git a/src/test/resources/META-INF/resources/frontend/styles/orgchart/hybrid-demo-styles.css b/src/test/resources/META-INF/resources/frontend/styles/orgchart/hybrid-demo-styles.css index e2a8775..2b20bca 100644 --- a/src/test/resources/META-INF/resources/frontend/styles/orgchart/hybrid-demo-styles.css +++ b/src/test/resources/META-INF/resources/frontend/styles/orgchart/hybrid-demo-styles.css @@ -2,7 +2,7 @@ * #%L * OrgChart Add-on * %% - * Copyright (C) 2017 - 2023 Flowing Code S.A. + * Copyright (C) 2017 - 2025 Flowing Code S.A. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + .hybrid-chart .orgchart .node { width: 220px; } @@ -76,4 +77,4 @@ .hybrid-chart .orgchart .nodes.vertical .hierarchy::after, .hybrid-chart .orgchart .nodes.vertical .hierarchy::before { border-color: var(--lumo-body-text-color); -} \ No newline at end of file +}