diff --git a/README.md b/README.md index f132a27..b9d1fdb 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,6 @@ yarn start ### License -Copyright (c) 2013 - 2020 Basic Primitives Inc +Copyright (c) 2013 - 2021 Basic Primitives Inc * [Non-commercial - Free](http://creativecommons.org/licenses/by-nc/3.0/) * [Commercial and government licenses](http://www.basicprimitives.com/license.pdf) diff --git a/client/package.json b/client/package.json index 2dedfa1..ddc4f5b 100644 --- a/client/package.json +++ b/client/package.json @@ -15,8 +15,8 @@ "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", "axios": "^0.21.0", - "basicprimitives": "^6.0.3", - "basicprimitivesreact": "^6.0.3", + "basicprimitives": "^6.1.0", + "basicprimitivesreact": "^6.1.1", "blob-stream": "^0.1.3", "clsx": "^1.1.1", "codemirror": "^5.58.2", diff --git a/client/src/components/Options/ItemsOrderOption.js b/client/src/components/Options/ItemsOrderOption.js index 18e6621..1d60a2a 100644 --- a/client/src/components/Options/ItemsOrderOption.js +++ b/client/src/components/Options/ItemsOrderOption.js @@ -18,7 +18,7 @@ const SortableItem = SortableElement(({ value }) => ( - {items.map((value, index) => ( + {items && items.map((value, index) => ( ))} @@ -28,7 +28,7 @@ class ItemsOrderOption extends Component { static propTypes = { onChange: PropTypes.func.isRequired, propertyName: PropTypes.string.isRequired, - items: PropTypes.arrayOf(PropTypes.any.isRequired).isRequired // eslint-disable-line react/forbid-prop-types + items: PropTypes.arrayOf(PropTypes.any.isRequired) // eslint-disable-line react/forbid-prop-types }; constructor(props) { diff --git a/client/src/components/Options/options.js b/client/src/components/Options/options.js index a9d2e6c..d7d9e4e 100644 --- a/client/src/components/Options/options.js +++ b/client/src/components/Options/options.js @@ -84,7 +84,25 @@ const GroupTitlesOptions = { { optionType: "DropDownBoxConfig", name: "groupTitleFontSize", caption: "Font size", options: ["8px", "10px", "12px", "14px", "16px", "18px", "20px"], valueType: "string" }, { optionType: "DropDownBoxConfig", name: "groupTitleFontWeight", caption: "Font Weight", options: ["normal", "bold"], valueType: "string" }, { optionType: "DropDownBoxConfig", name: "groupTitleFontStyle", caption: "Font Style", options: ["normal", "italic"], valueType: "string" }, - { optionType: "DropDownBoxConfig", name: "groupTitleFontFamily", caption: "Font Style", options: ["Arial", "Verdana", "Times New Roman", "Serif", "Courier"], valueType: "string" }, + { optionType: "DropDownBoxConfig", name: "groupTitleFontFamily", caption: "Font Style", options: ["Arial", "Verdana", "Times New Roman", "Serif", "Courier"], valueType: "string" } + ] +}; +const LevelTitlesOptions = { + title: "Level Titles", + namespace: "config", + options: [ + { optionType: "RadioBoxConfig", name: "levelTitlePlacementType", caption: "Placement", options: AdviserPlacementType, valueType: "number" }, + { optionType: "DropDownBoxConfig", name: "levelTitlePanelSize", caption: "Level titles panel width", options: [24, 48, 72], valueType: "number" }, + { optionType: "CheckBoxConfig", name: "levelTitlePlaceInside", caption: "Place titles inside view port area" }, + { optionType: "RadioBoxConfig", name: "levelTitleOrientation", caption: "Orientation", options: TextOrientationType, valueType: "number" }, + { optionType: "RadioBoxConfig", name: "levelTitleVerticalAlignment", caption: "Vertical Alignment", options: VerticalAlignmentType, valueType: "number" }, + { optionType: "RadioBoxConfig", name: "levelTitleHorizontalAlignment", caption: "Horizontal Alignment", options: HorizontalAlignmentType, valueType: "number" }, + { optionType: "DropDownBoxConfig", name: "levelTitleColor", caption: "Background Color", options: Colors, valueType: "string" }, + { optionType: "DropDownBoxConfig", name: "levelTitleFontColor", caption: "Font Color", options: Colors, valueType: "string" }, + { optionType: "DropDownBoxConfig", name: "levelTitleFontSize", caption: "Font size", options: ["8px", "10px", "12px", "14px", "16px", "18px", "20px"], valueType: "string" }, + { optionType: "DropDownBoxConfig", name: "levelTitleFontWeight", caption: "Font Weight", options: ["normal", "bold"], valueType: "string" }, + { optionType: "DropDownBoxConfig", name: "levelTitleFontStyle", caption: "Font Style", options: ["normal", "italic"], valueType: "string" }, + { optionType: "DropDownBoxConfig", name: "levelTitleFontFamily", caption: "Font Style", options: ["Arial", "Verdana", "Times New Roman", "Serif", "Courier"], valueType: "string" } ] }; const MarkersOptions = { @@ -251,9 +269,11 @@ const ItemLayoutOptions = { AdviserPartner: 8 }, valueType: "number" }, { optionType: "RadioBoxConfig", name: "adviserPlacementType", caption: "Placement", options: AdviserPlacementType, valueType: "number" }, - { optionType: "RadioBoxConfig", name: "childrenPlacementType", caption: "Children Layout", options: ChildrenPlacementType, valueType: "number" } - // { optionType: "CheckBoxConfig", name: "placeAdvisersAboveChildren", caption: "Place advisers above children" }, - // { optionType: "CheckBoxConfig", name: "placeAssistantsAboveChildren", caption: "Place assistants above children" } + { optionType: "RadioBoxConfig", name: "childrenPlacementType", caption: "Children Layout", options: ChildrenPlacementType, valueType: "number" }, + { optionType: "DropDownBoxConfig", name: "levelOffset", caption: "Level Offset", options: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], valueType: "number", isNullable: true } + //{ optionType: "CheckBoxConfig", name: "placeAdvisersAboveChildren", caption: "Place advisers above children" }, + //{ optionType: "CheckBoxConfig", name: "placeAssistantsAboveChildren", caption: "Place assistants above children" } + ] }; @@ -272,6 +292,7 @@ const Options = { DefaultTemplateOptions, ConnectorAnnotationOptions, GroupTitlesOptions, + LevelTitlesOptions, MarkersOptions, IntervalsOptions, ConnectorsOptions, diff --git a/client/src/components/index.js b/client/src/components/index.js index 765a9a6..45cb63c 100644 --- a/client/src/components/index.js +++ b/client/src/components/index.js @@ -23,6 +23,7 @@ export const OptionsPanel = optionsPanel; export const AutoLayoutOptions = options.AutoLayoutOptions; export const DefaultTemplateOptions = options.DefaultTemplateOptions; export const GroupTitlesOptions = options.GroupTitlesOptions; +export const LevelTitlesOptions = options.LevelTitlesOptions; export const MarkersOptions = options.MarkersOptions; export const IntervalsOptions = options.IntervalsOptions; export const ConnectorsOptions = options.ConnectorsOptions; diff --git a/client/src/containers/CrossTeamGroup/CrossTeamGroup.js b/client/src/containers/CrossTeamGroup/CrossTeamGroup.js index 2f0ac5f..fe0a12b 100644 --- a/client/src/containers/CrossTeamGroup/CrossTeamGroup.js +++ b/client/src/containers/CrossTeamGroup/CrossTeamGroup.js @@ -33,6 +33,7 @@ import useStyles from './styles'; import { AutoLayoutOptions, DefaultTemplateOptions, GroupTitlesOptions, + LevelTitlesOptions, MarkersOptions, IntervalsOptions, ConnectorsOptions, @@ -250,6 +251,7 @@ function CrossTeamGroup() { optionsPanelConfig={[ AutoLayoutOptions, DefaultTemplateOptions, GroupTitlesOptions, + LevelTitlesOptions, MarkersOptions, IntervalsOptions, ConnectorsOptions, diff --git a/client/src/containers/TechTree/TechTree.js b/client/src/containers/TechTree/TechTree.js index b16b53c..a5832d7 100644 --- a/client/src/containers/TechTree/TechTree.js +++ b/client/src/containers/TechTree/TechTree.js @@ -31,6 +31,7 @@ import { FamilyLayoutOptions, DefaultTemplateOptions, ConnectorAnnotationOptions, GroupTitlesOptions, + LevelTitlesOptions, MarkersOptions, IntervalsOptions, ConnectorsOptions, @@ -150,20 +151,22 @@ function TechTree() { config={{ ...config, annotations: (config.annotations && config.annotations.map(annotation => { - const { label, title } = annotation; - if (label != null) { - const { badge, color, title } = annotation.label; - return { - ...annotation, - label: <>
{badge}
{title} + if(annotation.annotationType !== AnnotationType.Level) { + const { label, title } = annotation; + if (label != null) { + const { badge, color, title } = annotation.label; + return { + ...annotation, + label: <>
{badge}
{title} + } } - } - if (title != null) { - return { - ...annotation, - title:
{title}
+ if (title != null) { + return { + ...annotation, + title:
{title}
+ } } } return annotation; @@ -229,6 +232,7 @@ function TechTree() { DefaultTemplateOptions, ConnectorAnnotationOptions, GroupTitlesOptions, + LevelTitlesOptions, MarkersOptions, IntervalsOptions, ConnectorsOptions, diff --git a/client/src/containers/VerticalLayout/VerticalLayout.js b/client/src/containers/VerticalLayout/VerticalLayout.js index 6103887..ffacb10 100644 --- a/client/src/containers/VerticalLayout/VerticalLayout.js +++ b/client/src/containers/VerticalLayout/VerticalLayout.js @@ -36,6 +36,7 @@ import useStyles from './styles'; import { AutoLayoutOptions, DefaultTemplateOptions, GroupTitlesOptions, + LevelTitlesOptions, MarkersOptions, IntervalsOptions, ConnectorsOptions, @@ -265,6 +266,7 @@ function VerticalLayout() { optionsPanelConfig={[ AutoLayoutOptions, DefaultTemplateOptions, GroupTitlesOptions, + LevelTitlesOptions, MarkersOptions, IntervalsOptions, ConnectorsOptions, diff --git a/client/src/redux/modules/demos/crossteamgroup.js b/client/src/redux/modules/demos/crossteamgroup.js index c65f494..73a074d 100644 --- a/client/src/redux/modules/demos/crossteamgroup.js +++ b/client/src/redux/modules/demos/crossteamgroup.js @@ -2,7 +2,7 @@ import { OrgConfig, TemplateConfig, Size, Thickness, PageFitMode, Enabled, ShapeType, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType, ChildrenPlacementType, Visibility, SelectionPathMode, Colors, AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType, - ElbowType, PlacementType, NavigationMode, GraphicsType} from 'basicprimitives'; + ElbowType, PlacementType, NavigationMode, GraphicsType, AnnotationType} from 'basicprimitives'; const LOAD = 'redux-example/crossteamgroup/LOAD'; const LOAD_SUCCESS = 'redux-example/crossteamgroup/LOAD_SUCCESS'; @@ -220,11 +220,30 @@ export default function reducer(state = initialState, action = {}) { const { config: { scale } } = state; const { config: defaultConfig } = initialState; const config = action.result; + + var annotations = []; + for(var index = 0; index < 10; index+=1) { + annotations.push({ + annotationType: AnnotationType.Level, + levels: [index], + title: "Level " + index, + titleColor: Colors.RoyalBlue, + offset: new Thickness(0, 4, 0, -5), + lineWidth: new Thickness(0, 0, 0, 0), + opacity: (index % 2 > 0 ? 0.08 : 0), + borderColor: Colors.Black, + fillColor: Colors.Gray, + lineType: LineType.Dotted + }) + } + const newConfig = { ...defaultConfig, ...config, + annotations, scale }; + return { ...state, loading: false, diff --git a/client/src/redux/modules/demos/techtree.js b/client/src/redux/modules/demos/techtree.js index 34fdde0..aea5cd2 100644 --- a/client/src/redux/modules/demos/techtree.js +++ b/client/src/redux/modules/demos/techtree.js @@ -100,6 +100,20 @@ const initialState = { groupTitleFontWeight: 'normal', groupTitleFontStyle: 'normal', + /* level title options */ + levelTitlePanelSize: 24, + levelTitlePlaceInside: false, + levelTitlePlacementType: AdviserPlacementType.Left, + levelTitleOrientation: TextOrientationType.Auto, + levelTitleVerticalAlignment: VerticalAlignmentType.Middle, + levelTitleHorizontalAlignment: HorizontalAlignmentType.Center, + levelTitleFontSize: '12px', + levelTitleFontFamily: 'Arial', + levelTitleColor: Colors.RoyalBlue, + levelTitleFontColor: Colors.White, + levelTitleFontWeight: 'normal', + levelTitleFontStyle: 'normal', + /* Family Diagram Specific Options */ neighboursSelectionMode: NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses, groupByType: GroupByType.Parents, @@ -209,8 +223,19 @@ function getAnnotations(config) { const { items } = config; if (Array.isArray(items)) { var annotations = []; + /* create level annotations to show levels of nodes */ + for(var index = 0; index < 20; index+=1) { + annotations.push({ + annotationType: AnnotationType.Level, + levels: [index], + title: "Level " + index, + offset: new Thickness(0, -1, 0, -1), + opacity: (index % 2 > 0 ? 0.2 : 0) + }) + } + // Populate annotations to visualize family ordering references - for (var index = 0; index < items.length; index += 1) { + for (index = 0; index < items.length; index += 1) { var item = items[index]; if (item.relativeItem != null) { annotations.push(new ConnectorAnnotationConfig({ diff --git a/client/src/redux/modules/demos/verticallayoutorganizationalchart.js b/client/src/redux/modules/demos/verticallayoutorganizationalchart.js index 1310484..e44f0a0 100644 --- a/client/src/redux/modules/demos/verticallayoutorganizationalchart.js +++ b/client/src/redux/modules/demos/verticallayoutorganizationalchart.js @@ -92,6 +92,20 @@ const initialState = { groupTitleFontWeight: 'normal', groupTitleFontStyle: 'normal', + /* level title options */ + levelTitlePanelSize: 24, + levelTitlePlaceInside: false, + levelTitlePlacementType: AdviserPlacementType.Left, + levelTitleOrientation: TextOrientationType.Auto, + levelTitleVerticalAlignment: VerticalAlignmentType.Middle, + levelTitleHorizontalAlignment: HorizontalAlignmentType.Center, + levelTitleFontSize: '12px', + levelTitleFontFamily: 'Arial', + levelTitleColor: Colors.RoyalBlue, + levelTitleFontColor: Colors.White, + levelTitleFontWeight: 'normal', + levelTitleFontStyle: 'normal', + /* Intervals */ normalLevelShift: 20, dotLevelShift: 30, diff --git a/client/yarn.lock b/client/yarn.lock index 25e9b60..ed2bdf1 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2862,17 +2862,17 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -basicprimitives@6.0.3, basicprimitives@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/basicprimitives/-/basicprimitives-6.0.3.tgz#8cd72565aa2c4f05acc216a48d0d571bf975b9d4" - integrity sha512-q7jiMXQvgUv++t0YDCUEWjIF+rjVaJhfwdlZaXoUMVtb/pfaf0BrbpLgjTsVQPkMNW+p2+y+joHCgBpD6SMEQA== +basicprimitives@6.1.0, basicprimitives@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/basicprimitives/-/basicprimitives-6.1.0.tgz#1c3c036f25b27b053b5e886e7e771ff05550361f" + integrity sha512-tsxBraeJrGjb0mA177H2f+8ykhrTroFZ2XBLCBb+WHcvR6KsN2s+UR1OptyusvnCZAQkx907U9xhhDqMAF1tNA== -basicprimitivesreact@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/basicprimitivesreact/-/basicprimitivesreact-6.0.3.tgz#cd21d423e9b93b0427c6094669f22b52ead3c101" - integrity sha512-OYFwvzVDQiWQwun7Y7l38sFuGrqlLeVMzt8nt25A7C/Hgg5c29gHHKybQJQhv4EeSeTYsNxv2YLr1onzcx07Bw== +basicprimitivesreact@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/basicprimitivesreact/-/basicprimitivesreact-6.1.1.tgz#82e3f9c1762eaee42f7112dda5366f76f3ca2119" + integrity sha512-FQkH3aaMbMRBzrRnctP5uCfyPr4fVL6b8urCc9S8TfAtgvRjWw4gYT68NHm9F6iNJJbsoIjDVHY4XqcxfkrYBQ== dependencies: - basicprimitives "6.0.3" + basicprimitives "6.1.0" resize-observer-polyfill "^1.5.1" batch@0.6.1: diff --git a/server/package.json b/server/package.json index e0c0f6a..2fd27c5 100644 --- a/server/package.json +++ b/server/package.json @@ -27,7 +27,7 @@ "@feathersjs/rest-client": "^1.3.2", "@feathersjs/socketio": "^3.0.1", "@feathersjs/socketio-client": "^1.0.1", - "basicprimitives": "6.0.3", + "basicprimitives": "6.1.0", "compression": "^1.6.2", "cookie-parser": "^1.4.3", "cookies-js": "^1.2.3", diff --git a/server/src/services/demoorganizationalcharts/data/matrixlayout.js b/server/src/services/demoorganizationalcharts/data/matrixlayout.js index ecdb1d7..b3571e2 100644 --- a/server/src/services/demoorganizationalcharts/data/matrixlayout.js +++ b/server/src/services/demoorganizationalcharts/data/matrixlayout.js @@ -21,7 +21,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -51,7 +51,7 @@ module.exports = { itemType: ItemType.Adviser, adviserPlacementType: AdviserPlacementType.Right, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -81,7 +81,7 @@ module.exports = { itemType: ItemType.Assistant, adviserPlacementType: AdviserPlacementType.Right, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -111,7 +111,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Right, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -141,7 +141,7 @@ module.exports = { itemType: ItemType.Adviser, adviserPlacementType: AdviserPlacementType.Left, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -171,7 +171,7 @@ module.exports = { itemType: ItemType.Assistant, adviserPlacementType: AdviserPlacementType.Right, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -201,7 +201,7 @@ module.exports = { itemType: ItemType.Assistant, adviserPlacementType: AdviserPlacementType.Right, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -231,7 +231,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -261,7 +261,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Matrix, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -291,7 +291,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -321,7 +321,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -351,7 +351,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -381,7 +381,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -411,7 +411,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -441,7 +441,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -471,7 +471,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -501,7 +501,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -531,7 +531,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -561,7 +561,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -591,7 +591,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -621,7 +621,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -651,7 +651,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -681,7 +681,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -711,7 +711,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -741,7 +741,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -771,7 +771,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -801,7 +801,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -831,7 +831,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -861,7 +861,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -891,7 +891,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -921,7 +921,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -951,7 +951,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -981,7 +981,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1011,7 +1011,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1041,7 +1041,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Matrix, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1071,7 +1071,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1101,7 +1101,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1131,7 +1131,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1161,7 +1161,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1191,7 +1191,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1221,7 +1221,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1251,7 +1251,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1281,7 +1281,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1311,7 +1311,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1341,7 +1341,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1371,7 +1371,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1401,7 +1401,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1431,7 +1431,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1461,7 +1461,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1491,7 +1491,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1521,7 +1521,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1551,7 +1551,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1581,7 +1581,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1611,7 +1611,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1641,7 +1641,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1671,7 +1671,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1701,7 +1701,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1731,7 +1731,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1761,7 +1761,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1791,7 +1791,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1821,7 +1821,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1851,7 +1851,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1881,7 +1881,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1911,7 +1911,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1941,7 +1941,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -1971,7 +1971,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2001,7 +2001,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2031,7 +2031,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2061,7 +2061,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2091,7 +2091,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2121,7 +2121,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2151,7 +2151,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2181,7 +2181,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2211,7 +2211,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2241,7 +2241,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2271,7 +2271,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2301,7 +2301,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2331,7 +2331,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2361,7 +2361,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2391,7 +2391,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2421,7 +2421,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2451,7 +2451,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2481,7 +2481,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2511,7 +2511,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2541,7 +2541,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2571,7 +2571,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2601,7 +2601,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2631,7 +2631,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2661,7 +2661,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2691,7 +2691,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2721,7 +2721,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2751,7 +2751,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2781,7 +2781,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Matrix, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2811,7 +2811,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2841,7 +2841,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2871,7 +2871,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2901,7 +2901,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2931,7 +2931,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2961,7 +2961,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -2991,7 +2991,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3021,7 +3021,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3051,7 +3051,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3081,7 +3081,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3111,7 +3111,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3141,7 +3141,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3171,7 +3171,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3201,7 +3201,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3231,7 +3231,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3261,7 +3261,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3291,7 +3291,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3321,7 +3321,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3351,7 +3351,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3381,7 +3381,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3411,7 +3411,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3441,7 +3441,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3471,7 +3471,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3501,7 +3501,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3531,7 +3531,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3561,7 +3561,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3591,7 +3591,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3621,7 +3621,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3651,7 +3651,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3681,7 +3681,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3711,7 +3711,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3741,7 +3741,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3771,7 +3771,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3801,7 +3801,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3831,7 +3831,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3861,7 +3861,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3891,7 +3891,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3921,7 +3921,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Matrix, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3951,7 +3951,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -3981,7 +3981,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4011,7 +4011,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4041,7 +4041,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4071,7 +4071,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4101,7 +4101,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4131,7 +4131,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4161,7 +4161,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4191,7 +4191,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4221,7 +4221,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4251,7 +4251,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4281,7 +4281,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4311,7 +4311,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Matrix, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4341,7 +4341,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4371,7 +4371,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4401,7 +4401,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4431,7 +4431,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4461,7 +4461,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4491,7 +4491,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4521,7 +4521,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4551,7 +4551,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4581,7 +4581,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4611,7 +4611,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4641,7 +4641,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4671,7 +4671,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4701,7 +4701,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4731,7 +4731,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4761,7 +4761,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4791,7 +4791,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4821,7 +4821,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4851,7 +4851,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4881,7 +4881,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4911,7 +4911,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4941,7 +4941,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -4971,7 +4971,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5001,7 +5001,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5031,7 +5031,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5061,7 +5061,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Matrix, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5091,7 +5091,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5121,7 +5121,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5151,7 +5151,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5181,7 +5181,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5211,7 +5211,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5241,7 +5241,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5271,7 +5271,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5301,7 +5301,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5331,7 +5331,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5361,7 +5361,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5391,7 +5391,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5421,7 +5421,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5451,7 +5451,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5481,7 +5481,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5511,7 +5511,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5541,7 +5541,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5571,7 +5571,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, @@ -5601,7 +5601,7 @@ module.exports = { itemType: ItemType.Regular, adviserPlacementType: AdviserPlacementType.Auto, childrenPlacementType: ChildrenPlacementType.Auto, - groupName: null, + groupName: null, levelOffset: null, templateName: null, showCallout: Enabled.Auto, calloutTemplateName: null, diff --git a/server/src/services/demoorganizationalcharts/data/verticallayoutorganizationalchart.js b/server/src/services/demoorganizationalcharts/data/verticallayoutorganizationalchart.js index acf5a4d..43de3e1 100644 --- a/server/src/services/demoorganizationalcharts/data/verticallayoutorganizationalchart.js +++ b/server/src/services/demoorganizationalcharts/data/verticallayoutorganizationalchart.js @@ -1,4 +1,4 @@ -const { Size, PlacementType, ItemType } = require('basicprimitives'); +const { Size, Thickness, PlacementType, ItemType, LineType, Colors, AnnotationType } = require('basicprimitives'); module.exports = { items: [ @@ -1105,5 +1105,43 @@ module.exports = { title: '14 member of L', label: '14' } + ], + annotations: [ + { + annotationType: AnnotationType.Level, + levels: [0], + title: "CEO", + titleColor: Colors.RoyalBlue, + offset: new Thickness(0, 0, 0, -1), + lineWidth: new Thickness(0, 0, 0, 0), + opacity: 0, + borderColor: Colors.Gray, + fillColor: Colors.Gray, + lineType: LineType.Dotted + }, + { + annotationType: AnnotationType.Level, + levels: [1], + title: "Management", + titleColor: Colors.RoyalBlue, + offset: new Thickness(0, 0, 0, -1), + lineWidth: new Thickness(0, 0, 0, 0), + opacity: 0.08, + borderColor: Colors.Gray, + fillColor: Colors.Gray, + lineType: LineType.Dotted + }, + { + annotationType: AnnotationType.Level, + levels: [2], + title: "Members", + titleColor: Colors.RoyalBlue, + offset: new Thickness(0, 0, 0, -1), + lineWidth: new Thickness(0, 0, 0, 0), + opacity: 0, + borderColor: Colors.Gray, + fillColor: Colors.Gray, + lineType: LineType.Dotted + } ] }; diff --git a/server/src/static/crossteamgroup.md b/server/src/static/crossteamgroup.md index 45caa79..10bbc04 100644 --- a/server/src/static/crossteamgroup.md +++ b/server/src/static/crossteamgroup.md @@ -4,6 +4,9 @@ * Custom templates * Selection check marks +### Annotations +* Level annotations - Decorate nodes having the same level in the hierarchy + ### Frame * Displays selected nodes placed outside viewport on the frame diff --git a/server/src/static/javascript b/server/src/static/javascript index b1c8e3e..bcaf8e7 160000 --- a/server/src/static/javascript +++ b/server/src/static/javascript @@ -1 +1 @@ -Subproject commit b1c8e3e00615ec8fa7774c3bf030f20ce94fd603 +Subproject commit bcaf8e7d6060e4cdd8e7d1adf8d948dd33174f11 diff --git a/server/src/static/react b/server/src/static/react index 9581614..e8d3443 160000 --- a/server/src/static/react +++ b/server/src/static/react @@ -1 +1 @@ -Subproject commit 9581614adfca5f9c8c770791625e3cabbbf4bf6f +Subproject commit e8d344342396dd3663278a40895e53daceac1fc0 diff --git a/server/src/static/techtree.md b/server/src/static/techtree.md index d7e92ba..3e75cf5 100644 --- a/server/src/static/techtree.md +++ b/server/src/static/techtree.md @@ -7,6 +7,7 @@ This alignment priority can then be used to create a full sequence, branch or ch ### Annotations * Offbeat Connector Annotations - red annotations display `primaryParent` references to enforce the hierarchy * Straight Connector Annotation - blue annotations display references enforcing the sorting of nodes within one group. +* Level annotations - Decorate nodes having the same level in the hierarchy ### General * Diagram reset diff --git a/server/src/static/verticallayoutorganizationalchart.md b/server/src/static/verticallayoutorganizationalchart.md index e63dd1d..5d94af8 100644 --- a/server/src/static/verticallayoutorganizationalchart.md +++ b/server/src/static/verticallayoutorganizationalchart.md @@ -4,14 +4,18 @@ * PDF file generation * Diagram options drawer -## Layout Flip +### Layout Flip * Places Advisers & Assistants on the left * Places group title on the right and context buttons on the left * Rotates root's group title 180 degree * Places vertical managers formation on the left of the root connection line * Aligns horizontal children formation to the left of the managers node -## Children layout +### Annotations +* Level annotations - Decorate nodes having the same level in the hierarchy + + +### Children layout Chart supports following layouts for children * Horizontal * Vertical diff --git a/server/yarn.lock b/server/yarn.lock index 0ffac66..7bc7413 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -268,10 +268,10 @@ basic-auth@~2.0.1: dependencies: safe-buffer "5.1.2" -basicprimitives@6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/basicprimitives/-/basicprimitives-6.0.3.tgz#8cd72565aa2c4f05acc216a48d0d571bf975b9d4" - integrity sha512-q7jiMXQvgUv++t0YDCUEWjIF+rjVaJhfwdlZaXoUMVtb/pfaf0BrbpLgjTsVQPkMNW+p2+y+joHCgBpD6SMEQA== +basicprimitives@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/basicprimitives/-/basicprimitives-6.1.0.tgz#1c3c036f25b27b053b5e886e7e771ff05550361f" + integrity sha512-tsxBraeJrGjb0mA177H2f+8ykhrTroFZ2XBLCBb+WHcvR6KsN2s+UR1OptyusvnCZAQkx907U9xhhDqMAF1tNA== bcryptjs@^2.3.0: version "2.4.3"