Skip to content

add more features (DashboardLayout; denied_profiles) and validation #69

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.

Sign up for GitHub

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
rudnerbjoern merged 3 commits into from
Jun 18, 2025
Merged

add more features (DashboardLayout; denied_profiles) and validation #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4de3eb3
add denied profiles to stimulus
rudnerbjoern Jun 18, 2025
a5cfc64
add DashboardLayout
rudnerbjoern Jun 18, 2025
8e10841
add more validators
rudnerbjoern Jun 18, 2025
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
24 changes: 23 additions & 1 deletion 3.2/itop_design.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,6 +1524,20 @@
Defines the common structure: a required 'id' and metadata via alteredNode.
</xs:documentation>
</xs:annotation>
<xs:sequence minOccurs="0">
<xs:element name="denied_profiles">
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="denied_profile">
<xs:complexType>
<xs:attribute name="id" type="xs:string" use="required" />
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="id" type="xs:string" use="required" />
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
Expand Down Expand Up @@ -2727,7 +2741,15 @@
<xs:element name="definition" minOccurs="0">
<xs:complexType>
<xs:all>
<xs:element name="layout" type="xs:string" minOccurs="0" />
<xs:element name="layout" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="DashboardLayoutOneCol" />
<xs:enumeration value="DashboardLayoutTwoCols" />
<xs:enumeration value="DashboardLayoutThreeCols" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="title" type="xs:string" minOccurs="0" />
<xs:element name="cells" minOccurs="0">
<xs:complexType>
Expand Down
61 changes: 54 additions & 7 deletions test/datamodel.must-validate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@
<stimuli>
<stimulus id="1" xsi:type="StimulusUserAction" _delta="define" />
<stimulus id="2" xsi:type="StimulusInternal" _delta="delete" />
<stimulus id="3" xsi:type="StimulusUserAction">
<denied_profiles>
<denied_profile id="Support Agent" />
</denied_profiles>
</stimulus>
</stimuli>
<states>
<state id="111">
Expand Down Expand Up @@ -828,7 +833,15 @@
<rank>22.3</rank>
<definition>
<cells>
<cell id="1" />
<cell id="1">
<rank>10</rank>
<dashlets>
<dashlet id="badge1" xsi:type="DashletBadge">
<rank>10</rank>
<class>class1</class>
</dashlet>
</dashlets>
</cell>
</cells>
</definition>
<definition_file>filename</definition_file>
Expand Down Expand Up @@ -888,6 +901,28 @@
<parent>1</parent>
<rank>8</rank>
</menu>
<menu id="Typology" xsi:type="DashboardMenuNode" _delta="if_exists">
<rank>80</rank>
<parent>Catalogs</parent>
<definition>
<layout>DashboardLayoutOneCol</layout>
<title>Menu:ConfigManagement:Typology</title>
<cells>
<cell id="0" _delta="if_exists">
<dashlets>
<dashlet id="20" xsi:type="DashletBadge" _delta="define">
<rank>20</rank>
<class>class1</class>
</dashlet>
<dashlet id="21" xsi:type="DashletBadge" _delta="define">
<rank>21</rank>
<class>class2</class>
</dashlet>
</dashlets>
</cell>
</cells>
</definition>
</menu>
</menus>
<!-- ***************** User Rights ***************** -->
<user_rights>
Expand Down Expand Up @@ -1011,7 +1046,17 @@
<!-- ***************** Constants ***************** -->
<constants />
<!-- ***************** Portals ***************** -->
<portals />
<portals>
<portal id="itop-portal" _delta="define">
<!-- ID must match module_design[id] -->
<url>url</url>
<!-- portal_id must match module_design[id] -->
<rank>1.0</rank>
<handler />
<allow />
<deny />
</portal>
</portals>
<!-- ***************** Module Parameters ***************** -->
<module_parameters>
<parameters id="itop-object-copier" _delta="define">
Expand All @@ -1034,6 +1079,9 @@
</rule>
</rules>
</parameters>
<parameters id="itop-portal" _delta="define">
<lazy_loading_threshold>500</lazy_loading_threshold>
</parameters>
</module_parameters>
<!-- ***************** Module Designs ***************** -->
<module_designs />
Expand Down Expand Up @@ -1121,18 +1169,18 @@
</events>
<!-- ***************** Event Listeners ***************** -->
<event_listeners>
<event_listener id="listener-1">
<event_listener id="listener-1" _delta="define">
<event>EVENT_DISPLAY_OBJECT_DETAILS</event>
<filters>
<filter>FAQ</filter>
</filters>
<rank>10</rank>
<code>function(\Combodo\iTop\Service\EventData $oEventData) {}</code>
</event_listener>
<event_listener id="listener-2">
<event_listener id="listener-2" _delta="if_exists">
<event>EVENT_DB_COMPUTE_VALUES</event>
<filters>
<filter>FAQ</filter>
<filter _delta="define">FAQ</filter>
</filters>
<rank>20</rank>
<code>function(\Combodo\iTop\Service\EventData $oEventData) {}</code>
Expand All @@ -1143,8 +1191,7 @@
<filter>Attachment</filter>
</filters>
<rank>0</rank>
<code><![CDATA[function(Combodo\iTop\Service\Events\EventData $oEventData){ ... }]]>
</code>
<code><![CDATA[function(Combodo\iTop\Service\Events\EventData $oEventData){ ... }]]></code>
</event_listener>
</event_listeners>
</itop_design>