diff --git a/Projects/Governance/Icons/pool-class.png b/Projects/Governance/Icons/pool-class.png new file mode 100644 index 000000000..d573c891d Binary files /dev/null and b/Projects/Governance/Icons/pool-class.png differ diff --git a/Projects/Governance/Icons/pool-weight-vote.png b/Projects/Governance/Icons/pool-weight-vote.png new file mode 100644 index 000000000..f13a9dc29 Binary files /dev/null and b/Projects/Governance/Icons/pool-weight-vote.png differ diff --git a/Projects/Governance/Icons/pool.png b/Projects/Governance/Icons/pool.png new file mode 100644 index 000000000..14bfad9d7 Binary files /dev/null and b/Projects/Governance/Icons/pool.png differ diff --git a/Projects/Governance/Icons/pools.png b/Projects/Governance/Icons/pools.png new file mode 100644 index 000000000..d9e46d9a4 Binary files /dev/null and b/Projects/Governance/Icons/pools.png differ diff --git a/Projects/Governance/Schemas/App-Schema/asset-vote.json b/Projects/Governance/Schemas/App-Schema/asset-weight-vote.json similarity index 100% rename from Projects/Governance/Schemas/App-Schema/asset-vote.json rename to Projects/Governance/Schemas/App-Schema/asset-weight-vote.json diff --git a/Projects/Governance/Schemas/App-Schema/asset.json b/Projects/Governance/Schemas/App-Schema/asset.json index 4a982e0b2..5209c2fb0 100644 --- a/Projects/Governance/Schemas/App-Schema/asset.json +++ b/Projects/Governance/Schemas/App-Schema/asset.json @@ -34,16 +34,13 @@ "config": true }, "initialValues": { - "config": "{\n \"description\": \"\", \"relativeWeight\": 0 \n}" + "config": "{\n \"description\": \"\" \n}" }, "addLeftIcons": true, "level": 2, "attachingRules": { "compatibleTypes": "->Asset Class->Asset->" }, - "referencingRules": { - "compatibleTypes": "->Team->Position->" - }, "propertyNameAtParent": "assets", "childrenNodesProperties": [ { diff --git a/Projects/Governance/Schemas/App-Schema/assets.json b/Projects/Governance/Schemas/App-Schema/assets.json index 1f986969d..899e739a1 100644 --- a/Projects/Governance/Schemas/App-Schema/assets.json +++ b/Projects/Governance/Schemas/App-Schema/assets.json @@ -25,10 +25,7 @@ ], "isHierarchyHead": true, "addLeftIcons": true, - "level": 1, - "attachingRules": { - "compatibleTypes": "->Superalgos Release->" - }, + "level": 0, "childrenNodesProperties": [ { "name": "assetClasses", diff --git a/Projects/Governance/Schemas/App-Schema/feature-vote.json b/Projects/Governance/Schemas/App-Schema/feature-weight-vote.json similarity index 100% rename from Projects/Governance/Schemas/App-Schema/feature-vote.json rename to Projects/Governance/Schemas/App-Schema/feature-weight-vote.json diff --git a/Projects/Governance/Schemas/App-Schema/feature.json b/Projects/Governance/Schemas/App-Schema/feature.json index 20f539b60..f2e4fdf4e 100644 --- a/Projects/Governance/Schemas/App-Schema/feature.json +++ b/Projects/Governance/Schemas/App-Schema/feature.json @@ -34,16 +34,13 @@ "config": true }, "initialValues": { - "config": "{\n \"description\": \"\", \"relativeWeight\": 0 \n}" + "config": "{\n \"description\": \"\" \n}" }, "addLeftIcons": true, "level": 2, "attachingRules": { "compatibleTypes": "->Feature Class->Feature->" }, - "referencingRules": { - "compatibleTypes": "->Team->Position->" - }, "propertyNameAtParent": "features", "childrenNodesProperties": [ { diff --git a/Projects/Governance/Schemas/App-Schema/features.json b/Projects/Governance/Schemas/App-Schema/features.json index 4c627c4db..fe2ae1110 100644 --- a/Projects/Governance/Schemas/App-Schema/features.json +++ b/Projects/Governance/Schemas/App-Schema/features.json @@ -25,10 +25,7 @@ ], "isHierarchyHead": true, "addLeftIcons": true, - "level": 1, - "attachingRules": { - "compatibleTypes": "->Superalgos Release->" - }, + "level": 0, "childrenNodesProperties": [ { "name": "featureClasses", diff --git a/Projects/Governance/Schemas/App-Schema/governance-project.json b/Projects/Governance/Schemas/App-Schema/governance-project.json index 6d16e914d..18228bc6c 100644 --- a/Projects/Governance/Schemas/App-Schema/governance-project.json +++ b/Projects/Governance/Schemas/App-Schema/governance-project.json @@ -1,6 +1,12 @@ { "type": "Governance Project", "menuItems": [ + { + "action": "Add UI Object", + "label": "Add Pools", + "relatedUiObject": "Pools", + "actionFunction": "payload.executeAction" + }, { "action": "Add UI Object", "label": "Add Assets", @@ -15,8 +21,8 @@ }, { "action": "Add UI Object", - "label": "Add Oranization Chart", - "relatedUiObject": "Oranization Chart", + "label": "Add Organization Chart", + "relatedUiObject": "Organization Chart", "actionFunction": "payload.executeAction" }, { diff --git a/Projects/Governance/Schemas/App-Schema/governance-structure.json b/Projects/Governance/Schemas/App-Schema/organization-chart.json similarity index 69% rename from Projects/Governance/Schemas/App-Schema/governance-structure.json rename to Projects/Governance/Schemas/App-Schema/organization-chart.json index 90faa2fac..7b4146af4 100644 --- a/Projects/Governance/Schemas/App-Schema/governance-structure.json +++ b/Projects/Governance/Schemas/App-Schema/organization-chart.json @@ -1,6 +1,12 @@ { - "type": "Oranization Chart", + "type": "Organization Chart", "menuItems": [ + { + "action": "Add UI Object", + "actionFunction": "payload.executeAction", + "label": "Add Team", + "relatedUiObject": "Team" + }, { "action": "Add UI Object", "label": "Add Position", @@ -17,11 +23,16 @@ "actionFunction": "payload.executeAction" } ], - "isTitleAllwaysVisible": false, "isHierarchyHead": true, "addLeftIcons": true, "level": 0, "childrenNodesProperties": [ + { + "name": "teams", + "type": "array", + "childType": "Team", + "autoAdd": false + }, { "name": "positions", "type": "array", diff --git a/Projects/Governance/Schemas/App-Schema/pool-class.json b/Projects/Governance/Schemas/App-Schema/pool-class.json new file mode 100644 index 000000000..8d525e812 --- /dev/null +++ b/Projects/Governance/Schemas/App-Schema/pool-class.json @@ -0,0 +1,62 @@ +{ + "type": "Pool Class", + "menuItems": [ + { + "action": "Configure", + "actionFunction": "uiObject.configEditor.activate", + "label": "Configure", + "iconPathOn": "configuration", + "iconPathOff": "configuration" + }, + { + "action": "Add UI Object", + "actionFunction": "payload.executeAction", + "label": "Add Pool Class", + "relatedUiObject": "Pool Class" + }, + { + "action": "Add UI Object", + "actionFunction": "payload.executeAction", + "label": "Add Pool", + "relatedUiObject": "Pool" + }, + { + "action": "Delete UI Object", + "askConfirmation": true, + "confirmationLabel": "Confirm to Delete", + "label": "Delete", + "iconPathOn": "delete-entity", + "iconPathOff": "delete-entity", + "actionFunction": "payload.executeAction" + } + ], + "editors": { + "config": true + }, + "initialValues": { + "config": "{\n \"description\": \"\", \"relativeWeight\": 0 \n}" + }, + "addLeftIcons": true, + "level": 2, + "attachingRules": { + "compatibleTypes": "->Pools->Pool Class->" + }, + "referencingRules": { + "compatibleTypes": "->Team->Position->" + }, + "propertyNameAtParent": "poolClasses", + "childrenNodesProperties": [ + { + "name": "poolClasses", + "type": "array", + "childType": "Pool Class", + "autoAdd": false + }, + { + "name": "pools", + "type": "array", + "childType": "Pool", + "autoAdd": false + } + ] +} \ No newline at end of file diff --git a/Projects/Governance/Schemas/App-Schema/pool-weight-vote.json b/Projects/Governance/Schemas/App-Schema/pool-weight-vote.json new file mode 100644 index 000000000..d10f0e9a2 --- /dev/null +++ b/Projects/Governance/Schemas/App-Schema/pool-weight-vote.json @@ -0,0 +1,42 @@ +{ + "type": "Pool Weight Vote", + "menuItems": [ + { + "action": "Configure", + "actionFunction": "uiObject.configEditor.activate", + "label": "Configure", + "iconPathOn": "configuration", + "iconPathOff": "configuration" + }, + { + "action": "Delete UI Object", + "askConfirmation": true, + "confirmationLabel": "Confirm to Delete", + "label": "Delete", + "iconPathOn": "delete-entity", + "iconPathOff": "delete-entity", + "actionFunction": "payload.executeAction" + } + ], + "title": [ + "Use Reference Parent Parent Parent Parent", + "Use Reference Parent Parent Parent", + "Use Reference Parent Parent", + "Use Reference Parent" + ], + "editors": { + "config": true + }, + "initialValues": { + "config": "{\n \"description\": \"\"\n}" + }, + "addLeftIcons": true, + "level": 2, + "attachingRules": { + "compatibleTypes": "->Votes Switch->" + }, + "referencingRules": { + "compatibleTypes": "->Pool Class->Pool->" + }, + "propertyNameAtParent": "poolWeightVotes" +} \ No newline at end of file diff --git a/Projects/Governance/Schemas/App-Schema/pool.json b/Projects/Governance/Schemas/App-Schema/pool.json new file mode 100644 index 000000000..8d8919fb9 --- /dev/null +++ b/Projects/Governance/Schemas/App-Schema/pool.json @@ -0,0 +1,62 @@ +{ + "type": "Pool", + "menuItems": [ + { + "action": "Configure", + "actionFunction": "uiObject.configEditor.activate", + "label": "Configure", + "iconPathOn": "configuration", + "iconPathOff": "configuration" + }, + { + "action": "Add UI Object", + "actionFunction": "payload.executeAction", + "label": "Add Pool Class", + "relatedUiObject": "Pool Class" + }, + { + "action": "Add UI Object", + "actionFunction": "payload.executeAction", + "label": "Add Pool", + "relatedUiObject": "Pool" + }, + { + "action": "Delete UI Object", + "askConfirmation": true, + "confirmationLabel": "Confirm to Delete", + "label": "Delete", + "iconPathOn": "delete-entity", + "iconPathOff": "delete-entity", + "actionFunction": "payload.executeAction" + } + ], + "editors": { + "config": true + }, + "initialValues": { + "config": "{\n \"description\": \"\"\n}" + }, + "addLeftIcons": true, + "level": 2, + "attachingRules": { + "compatibleTypes": "->Pool Class->Pool->" + }, + "referencingRules": { + "compatibleTypes": "->Organization Chart->Assets->Features->" + }, + "propertyNameAtParent": "pools", + "childrenNodesProperties": [ + { + "name": "poolClasses", + "type": "array", + "childType": "Pool Class", + "autoAdd": false + }, + { + "name": "pools", + "type": "array", + "childType": "Pool", + "autoAdd": false + } + ] +} \ No newline at end of file diff --git a/Projects/Governance/Schemas/App-Schema/pools.json b/Projects/Governance/Schemas/App-Schema/pools.json new file mode 100644 index 000000000..bdecce6f7 --- /dev/null +++ b/Projects/Governance/Schemas/App-Schema/pools.json @@ -0,0 +1,56 @@ +{ + "type": "Pools", + "menuItems": [ + { + "action": "Configure", + "actionFunction": "uiObject.configEditor.activate", + "label": "Configure", + "iconPathOn": "configuration", + "iconPathOff": "configuration" + }, + { + "action": "Add UI Object", + "actionFunction": "payload.executeAction", + "label": "Add Pool Class", + "relatedUiObject": "Pool Class" + }, + { + "action": "Add UI Object", + "actionFunction": "payload.executeAction", + "label": "Add Pool", + "relatedUiObject": "Pool" + }, + { + "action": "Delete UI Object", + "askConfirmation": true, + "confirmationLabel": "Confirm to Delete", + "label": "Delete", + "iconPathOn": "delete-entity", + "iconPathOff": "delete-entity", + "actionFunction": "payload.executeAction" + } + ], + "editors": { + "config": true + }, + "initialValues": { + "config": "{\n \"token\": \"\"\n}" + }, + "isHierarchyHead": true, + "addLeftIcons": true, + "level": 0, + "childrenNodesProperties": [ + { + "name": "poolClasses", + "type": "array", + "childType": "Pool Class", + "autoAdd": false + }, + { + "name": "pools", + "type": "array", + "childType": "Pool", + "autoAdd": false + } + ] +} \ No newline at end of file diff --git a/Projects/Governance/Schemas/App-Schema/ranking-vote.json b/Projects/Governance/Schemas/App-Schema/position-weight-vote.json similarity index 100% rename from Projects/Governance/Schemas/App-Schema/ranking-vote.json rename to Projects/Governance/Schemas/App-Schema/position-weight-vote.json diff --git a/Projects/Governance/Schemas/App-Schema/ranking-position.json b/Projects/Governance/Schemas/App-Schema/position.json similarity index 91% rename from Projects/Governance/Schemas/App-Schema/ranking-position.json rename to Projects/Governance/Schemas/App-Schema/position.json index a76d6f507..e1bdf712b 100644 --- a/Projects/Governance/Schemas/App-Schema/ranking-position.json +++ b/Projects/Governance/Schemas/App-Schema/position.json @@ -34,12 +34,12 @@ "config": true }, "initialValues": { - "config": "{\n \"description\": \"\", \"relativeWeight\": 0 \n}" + "config": "{\n \"description\": \"\" \n}" }, "addLeftIcons": true, "level": 2, "attachingRules": { - "compatibleTypes": "->Oranization Chart->Position->Team->" + "compatibleTypes": "->Organization Chart->Position->Team->" }, "propertyNameAtParent": "positions", "childrenNodesProperties": [ diff --git a/Projects/Governance/Schemas/App-Schema/user-vote.json b/Projects/Governance/Schemas/App-Schema/user-vote-transfer.json similarity index 100% rename from Projects/Governance/Schemas/App-Schema/user-vote.json rename to Projects/Governance/Schemas/App-Schema/user-vote-transfer.json diff --git a/Projects/Superalgos/UI/Spaces/Floating-Space/UiObjectTitle.js b/Projects/Superalgos/UI/Spaces/Floating-Space/UiObjectTitle.js index 3b39944a8..89c2a3161 100644 --- a/Projects/Superalgos/UI/Spaces/Floating-Space/UiObjectTitle.js +++ b/Projects/Superalgos/UI/Spaces/Floating-Space/UiObjectTitle.js @@ -122,7 +122,7 @@ function newUiObjectTitle() { } case 'Use Reference Parent Type': { let nodeToUse = thisObject.payload.node.payload.referenceParent - if (nodeToUse !== undefined && nodeToUse.payload !== undefined && nodeToUse.payload.node.name !== "New " + nodeToUse.payload.node.type && nodeToUse.payload.node.name !== "My " + nodeToUse.payload.node.type) { + if (nodeToUse !== undefined && nodeToUse.payload !== undefined) { thisObject.payload.title = thisObject.payload.title + separator + nodeToUse.type thisObject.payload.node.name = thisObject.payload.node.name + separator + nodeToUse.type }