Skip to content

Commit

Permalink
MGR-66 removed IDs from datasources and action, fixed sorting (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
@madness-inc
madness-inc committed Jul 30, 2019
1 parent 7bfb565 commit e498238
Show file tree
Hide file tree
Showing 43 changed files with 202 additions and 346 deletions.
45 changes: 23 additions & 22 deletions application-home/conf/datasources/ds-applications.xml
View file
Expand Up @@ -10,18 +10,15 @@
</permissions>
<params />
<meta-data bindClass="org.appng.api.model.Application">
<field name="id" type="int" readonly="true">
<label>id</label>
</field>
<field name="name" type="text">
<sort />
<sort prio="0" order="asc" ignore-case="true"/>
<label>name</label>
</field>
<field name="displayName" type="text">
<sort />
<label>displayName</label>
</field>
<field name="packageVersion" type="text">
<field name="applicationVersion" type="text">
<sort />
<label>version</label>
</field>
Expand All @@ -38,14 +35,14 @@
</field>
</meta-data>
<linkpanel id="actions" location="inline">
<link mode="intern" target="/applications/update/#{id}" default="true">
<link mode="intern" target="/applications/update/${current.id}" default="true">
<label>edit</label>
<icon>edit</icon>
<permissions>
<permission ref="application.edit" mode="set" />
</permissions>
</link>
<link mode="intern" target="/applications&#63;form_action=delete&#38;appid=#{id}">
<link mode="intern" target="/applications&#63;form_action=delete&#38;appid=${current.id}">
<label>delete</label>
<icon>delete</icon>
<confirmation id="application.delete.confirm" params="#{name}"></confirmation>
Expand All @@ -66,9 +63,6 @@
<param name="appid" />
</params>
<meta-data bindClass="org.appng.core.domain.ApplicationImpl">
<field name="id" type="int" readonly="true">
<label>id</label>
</field>
<field name="name" type="text" readonly="true">
<label>name</label>
</field>
Expand Down Expand Up @@ -117,28 +111,32 @@
<param name="defaultlinkanchor" />
<param name="mode" />
</params>
<meta-data bindClass="org.appng.core.domain.SiteApplication" binding="application" result-selector="${current.application.id eq appid}">
<field name="id" type="int" readonly="true">
<label>id</label>
</field>
<field name="name" type="text">
<meta-data bindClass="org.appng.core.domain.SiteApplication" result-selector="${current.application.id eq appid}">
<field name="application.name" type="text">
<sort prio="0" order="asc" ignore-case="true" />
<label>name</label>
</field>
<field name="displayName" type="text">
<field name="application.displayName" type="text">
<sort />
<label>displayName</label>
</field>
<field name="privileged" type="checkbox">
<field name="application.applicationVersion" type="text">
<sort />
<label>version</label>
</field>
<field name="application.privileged" type="checkbox">
<label>privileged</label>
</field>
<field name="fileBased" type="checkbox">
<field name="application.fileBased" type="checkbox">
<label>filebased</label>
</field>
<field name="actions" type="linkpanel">
<label>actions</label>
</field>
</meta-data>
<linkpanel id="actions" location="inline">
<link mode="intern" target="${defaultlink}?selectedappid=${current.application.id}${defaultlinkanchor}" default="true">
<link mode="intern" target="${defaultlink}?selectedappid=${current.application.id}${defaultlinkanchor}"
default="true">
<label>select</label>
<icon>edit</icon>
<permissions>
Expand All @@ -162,13 +160,16 @@
<param name="siteid" />
</params>
<meta-data bindClass="org.appng.core.domain.SiteApplication">
<field name="application.id" type="int">
<label>id</label>
</field>
<field name="application.name" type="text">
<sort prio="0" order="asc" name="name" ignore-case="true"/>
<label>name</label>
</field>
<field name="application.displayName" type="text">
<sort name="displayName"/>
<label>displayName</label>
</field>
<field name="application.applicationVersion" type="text">
<sort name="applicationVersion"/>
<label>version</label>
</field>
<field name="active" type="image">
Expand Down
11 changes: 4 additions & 7 deletions application-home/conf/datasources/ds-connections.xml
View file
Expand Up @@ -16,9 +16,6 @@
<param name="editTab" />
</params>
<meta-data bindClass="org.appng.core.domain.DatabaseConnection">
<field name="id" type="int" hidden="true">
<label>id</label>
</field>
<field name="type" type="text">
<label>type</label>
</field>
Expand Down Expand Up @@ -52,21 +49,21 @@
</linkpanel>

<linkpanel id="actions" location="inline">
<link mode="intern" target="${editLink}#{id}${editTab}" default="true">
<link mode="intern" target="${editLink}${current.id}${editTab}" default="true">
<label>edit</label>
<icon>edit</icon>
</link>
<link mode="intern" target="${deleteLink}#{id}">
<link mode="intern" target="${deleteLink}${current.id}">
<label>delete</label>
<icon>delete</icon>
<condition expression="${not empty deleteLink}" />
<confirmation id="connection.delete.confirm" params="#{name}" />
</link>
<link mode="intern" target="${testLink}#{id}${linkTab}">
<link mode="intern" target="${testLink}${current.id}${linkTab}">
<label>test</label>
<icon>start</icon>
</link>
<link mode="intern" target="${resetLink}#{id}">
<link mode="intern" target="${resetLink}${current.id}">
<label>reset</label>
<icon>reload</icon>
<condition expression="${not empty resetLink}" />
Expand Down
4 changes: 2 additions & 2 deletions application-home/conf/datasources/ds-jars.xml
View file
Expand Up @@ -18,7 +18,7 @@
<condition expression="${siteId ne null}" />
</field>
<field name="fileName" type="text">
<sort />
<sort prio="0" order="asc" ignore-case="true"/>
<label>name</label>
</field>
<field name="version" type="date" format="yyyy-MM-dd HH:mm:ss">
Expand Down Expand Up @@ -52,7 +52,7 @@
</permissions>
<meta-data bindClass="org.appng.core.model.JarInfo">
<field name="fileName" type="text">
<sort />
<sort prio="0" order="asc" ignore-case="true"/>
<label id="name" />
</field>
<field name="version" type="date" format="yyyy-MM-dd HH:mm:ss">
Expand Down
12 changes: 3 additions & 9 deletions application-home/conf/datasources/ds-permissions.xml
View file
Expand Up @@ -12,11 +12,8 @@
<param name="appid" />
</params>
<meta-data bindClass="org.appng.core.domain.PermissionImpl">
<field name="id" type="int">
<label>id</label>
</field>
<field name="name" type="text">
<sort />
<sort prio="0" order="asc" ignore-case="true"/>
<label>name</label>
</field>
<field name="description" type="text">
Expand All @@ -39,15 +36,15 @@
</link>
</linkpanel>
<linkpanel id="actions" location="inline">
<link mode="intern" target="/applications/update/${appid}/permission/update/#{id}#tab_permissions" default="true">
<link mode="intern" target="/applications/update/${appid}/permission/update/${current.id}#tab_permissions" default="true">
<label>edit</label>
<icon>edit</icon>
<permissions>
<permission ref="permission.edit" mode="set" />
</permissions>
</link>
<link mode="intern"
target="/applications/update/${appid}&#63;form_action=delete-permission&#38;permissionid=#{id}#tab_permissions">
target="/applications/update/${appid}&#63;form_action=delete-permission&#38;permissionid=${current.id}#tab_permissions">
<label>delete</label>
<icon>delete</icon>
<confirmation id="permission.delete.confirm" params="#{name}"/>
Expand All @@ -69,9 +66,6 @@
<param name="permissionid" />
</params>
<meta-data bindClass="org.appng.core.domain.PermissionImpl">
<field name="id" type="int" readonly="true">
<label>id</label>
</field>
<field name="name" type="text">
<label>name</label>
</field>
Expand Down
20 changes: 10 additions & 10 deletions application-home/conf/datasources/ds-repositories.xml
View file
Expand Up @@ -27,27 +27,30 @@
</permissions>
<params />
<meta-data bindClass="org.appng.core.domain.RepositoryImpl">
<field name="id" type="text" readonly="true">
<label>id</label>
</field>
<field name="name" type="text">
<sort prio="0" order="asc" ignore-case="true"/>
<label>name</label>
</field>
<field name="repositoryType" type="text">
<sort />
<label>type</label>
</field>
<field name="repositoryMode" type="text">
<sort />
<label>mode</label>
</field>
<field name="published" type="image">
<sort />
<label>published</label>
<icon condition="${current.published}">led_orange</icon>
<icon condition="${not current.published}"></icon>
</field>
<field name="uri" type="text" displayLength="60">
<sort />
<label>uri</label>
</field>
<field name="active" type="image">
<sort />
<label>active</label>
<icon condition="${current.active}">led_green</icon>
<icon condition="${not current.active}">led_red</icon>
Expand All @@ -66,22 +69,22 @@
</link>
</linkpanel>
<linkpanel id="actions" location="inline">
<link mode="intern" target="/repositories/update/#{id}#tab_update">
<link mode="intern" target="/repositories/update/${current.id}#tab_update">
<label>edit</label>
<icon>edit</icon>
<permissions>
<permission ref="repository.edit" mode="set" />
</permissions>
</link>
<link mode="intern" target="/repositories&#63;form_action=delete-repository&#38;repositoryid=#{id}">
<link mode="intern" target="/repositories&#63;form_action=delete-repository&#38;repositoryid=${current.id}">
<label>delete</label>
<icon>delete</icon>
<confirmation id="repository.delete.confirm" params="#{name}" />
<permissions>
<permission ref="repository.delete" mode="set" />
</permissions>
</link>
<link target="/repositories/installation/#{id}&#63;form_action=reload" mode="intern">
<link target="/repositories/installation/${current.id}&#63;form_action=reload" mode="intern">
<label>reload</label>
<icon>reload</icon>
<confirmation id="repository.reload.confirm" params="#{name}" />
Expand All @@ -90,7 +93,7 @@
<permission ref="repository.reload" mode="set" />
</permissions>
</link>
<link mode="intern" target="/repositories/installation/#{id}#tab_packages" default="true">
<link mode="intern" target="/repositories/installation/${current.id}#tab_packages" default="true">
<label>installation</label>
<icon>deploy</icon>
<condition expression="${current.active}" />
Expand All @@ -112,9 +115,6 @@
<param name="repositoryid" />
</params>
<meta-data bindClass="org.appng.application.manager.form.RepositoryForm" binding="repository">
<field name="id" type="text" readonly="true">
<label>id</label>
</field>
<field name="name" type="text">
<label>name</label>
</field>
Expand Down
16 changes: 8 additions & 8 deletions application-home/conf/datasources/ds-resources.xml
View file
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<datasources xmlns="http://www.appng.org/schema/platform"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<datasources xmlns="http://www.appng.org/schema/platform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.appng.org/schema/platform http://www.appng.org/schema/platform/appng-platform.xsd">

<datasource id="resources">
Expand All @@ -15,32 +14,33 @@
</params>
<meta-data bindClass="org.appng.api.model.Resource">
<field name="name" type="text" readonly="true">
<sort />
<label>name</label>
</field>
<field name="resourceType" type="text" readonly="true">
<sort />
<label>type</label>
</field>
<field name="size" type="int" readonly="true">
<sort />
<label>size</label>
</field>
<field name="version" type="date" readonly="true"
format="yyyy-MM-dd HH:mm:ss">
<field name="version" type="date" readonly="true" format="yyyy-MM-dd HH:mm:ss">
<sort />
<label>version</label>
</field>
<field type="linkpanel" name="actions">
<label>actions</label>
</field>
</meta-data>
<linkpanel location="top" id="others">
<link target="/applications/update/${appid}/resource/upload#tab_resources"
mode="intern">
<link target="/applications/update/${appid}/resource/upload#tab_resources" mode="intern">
<label>upload</label>
<icon>upload</icon>
</link>
</linkpanel>
<linkpanel id="actions" location="inline">
<link mode="intern"
target="/applications/update/${appid}/resource/update/${current.id}#tab_resources">
<link mode="intern" target="/applications/update/${appid}/resource/update/${current.id}#tab_resources">
<label>view</label>
<icon>edit</icon>
<condition expression="${'JAR' ne current.resourceType.name()}" />
Expand Down
12 changes: 3 additions & 9 deletions application-home/conf/datasources/ds-roles.xml
View file
Expand Up @@ -13,11 +13,8 @@
<param name="roleid" />
</params>
<meta-data bindClass="org.appng.api.model.Role" result-selector="${current.id eq roleid}">
<field name="id" type="int" readonly="true">
<label>id</label>
</field>
<field name="name" type="text">
<sort />
<sort prio="0" order="asc" ignore-case="true"/>
<label>name</label>
</field>
<field name="description" type="text">
Expand All @@ -40,15 +37,15 @@
</link>
</linkpanel>
<linkpanel id="actions" location="inline">
<link mode="intern" target="/applications/update/${appid}/role/update/#{id}#tab_roles" default="true">
<link mode="intern" target="/applications/update/${appid}/role/update/${current.id}#tab_roles" default="true">
<label>edit</label>
<icon>edit</icon>
<permissions>
<permission ref="role.edit" mode="set" />
</permissions>
</link>
<link mode="intern"
target="/applications/update/${appid}&#63;form_action=delete-role&#38;roleid=#{id}#tab_roles">
target="/applications/update/${appid}&#63;form_action=delete-role&#38;roleid=${current.id}#tab_roles">
<label>delete</label>
<icon>delete</icon>
<confirmation id="role.delete.confirm" params="#{name}"/>
Expand All @@ -70,9 +67,6 @@
<param name="id" />
</params>
<meta-data binding="role" bindClass="org.appng.application.manager.form.RoleForm">
<field name="id" type="int" readonly="true">
<label>id</label>
</field>
<field name="name" type="text">
<label>name</label>
</field>
Expand Down

0 comments on commit e498238

Please sign in to comment.