Skip to content

fix: add json-digger dependency #84

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

Merged
merged 4 commits into from
Apr 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,12 @@
<resourceBase>src/test/resources/META-INF/resources</resourceBase>
</resourceBases>
</webAppConfig>
<webApp>
<resourceBases>
<resourceBase>src/main/resources/META-INF/resources</resourceBase>
<resourceBase>src/test/resources/META-INF/resources</resourceBase>
</resourceBases>
</webApp>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -525,7 +531,7 @@
<profile>
<id>v24</id>
<properties>
<vaadin.version>24.2.6</vaadin.version>
<vaadin.version>24.3.20</vaadin.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<jetty.version>11.0.12</jetty.version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package com.flowingcode.vaadin.addons.orgchart;


import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package com.flowingcode.vaadin.addons.orgchart;


import java.io.Serializable;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
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.
* See the License for the specific language governing permissions and
* 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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package com.flowingcode.vaadin.addons.orgchart.client.constants;


public interface ChartConstants {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package com.flowingcode.vaadin.addons.orgchart.client.enums;


/**
* Enumeration of the directions that the organization chart can have. <br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
* #%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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/

package com.flowingcode.vaadin.addons.orgchart.extra;

/**
Expand Down
5 changes: 4 additions & 1 deletion src/main/resources/META-INF/frontend/fc-orgchart.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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`
Expand Down Expand Up @@ -93,6 +95,7 @@ class FCOrgChart extends PolymerElement {
});

window.html2canvas = html2canvas;
window.JSONDigger = JSONDigger;

// add title
var title = state.chartTitle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -17,11 +17,12 @@
* limitations under the License.
* #L%
*/


.orgchart .node {
width: 140px;
}

.orgchart .node .content {
overflow: hidden;
}
}
7 changes: 4 additions & 3 deletions src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
* #%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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/

package com.flowingcode.vaadin.addons;

import com.vaadin.flow.component.html.Div;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
* #%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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/

package com.flowingcode.vaadin.addons.orgchart;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
* #%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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/

package com.flowingcode.vaadin.addons.orgchart;

import com.vaadin.flow.component.orderedlayout.VerticalLayout;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
* #%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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/

package com.flowingcode.vaadin.addons.orgchart;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
* #%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.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/

package com.flowingcode.vaadin.addons.orgchart;

import java.util.Arrays;
Expand Down
Loading