Cherry-picked MGR-139 from 1.20.x

appNG · Jul 29, 2022 · 5e94aea · 5e94aea
1 parent b7a4882
commit 5e94aea
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 15 deletions.
diff --git a/src/test/resources/xml/RepositoriesTest-testPackages.xml b/src/test/resources/xml/RepositoriesTest-testPackages.xml
@@ -64,6 +64,45 @@
 				<option value="*" name="pf" />
 			</selection>
 		</selectionGroup>
-		<resultset chunk="0" chunkname="packages" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="-1" hits="0" />
+        <resultset chunk="0" chunkname="packages" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="1">
+            <result>
+                <field name="name" type="text">
+                    <value>appng-manager</value>
+                </field>
+                <field name="displayName" type="text">
+                    <value>Manager</value>
+                </field>
+                <field name="type" type="text">
+                    <value>APPLICATION</value>
+                </field>
+                <field name="latestRelease" type="text">
+                    <value></value>
+                </field>
+                <field name="latestSnapshot" type="text">
+                    <value>1.20.0-SNAPSHOT</value>
+                </field>
+                <field name="installedVersion" type="text">
+                    <value></value>
+                </field>
+                <field name="installedVersion" type="image">
+                    <value></value>
+                    <icon type="class">led_red</icon>
+                </field>
+                <linkpanel id="actions" location="inline">
+                    <link id="actions[1]" mode="intern" target="/repositories/installation/1/appng-manager#tab_packages" default="true">
+                        <label id="package.showVersions">Show package versions</label>
+                        <icon>edit</icon>
+                    </link>
+                    <link id="actions[2]" mode="intern" target="" disabled="true">
+                        <label id="install.latestrelease">Install latest release</label>
+                        <icon>d_release</icon>
+                    </link>
+                    <link id="actions[3]" mode="intern" target="/repositories/installation/1?act=install&amp;packagename=appng-manager&amp;packageversion=1.20.0-SNAPSHOT">
+                        <label id="install.latestsnapshot">Install latest snapshot</label>
+                        <icon>d_snapshot</icon>
+                    </link>
+                </linkpanel>
+            </result>
+        </resultset>
 	</data>
 </datasource>
diff --git a/src/test/resources/xml/SitesTest-testShowSites.xml b/src/test/resources/xml/SitesTest-testShowSites.xml
@@ -96,7 +96,7 @@
                 <icon>reload</icon>
                 <confirmation id="site.reload.confirm" params="#{name}">Reload site #{name}?</confirmation>
             </link>
-            <link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;siteid=${current.id}">
+            <link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;sitename=${current.name}">
                 <condition expression="${current.state.name() eq 'STARTED'}"/>
                 <permissions>
                     <permission ref="site.reload" mode="set"></permission>
@@ -142,29 +142,28 @@
                     <icon type="class">led_green</icon>
                 </field>
                 <field name="running" type="image">
-                    <value>true</value>
-                    <icon type="class">led_green</icon>
+                    <value>false</value>
+                    <icon type="class">led_red</icon>
                 </field>
                 <field name="startupTime" type="date">
                     <value></value>
                 </field>
                 <linkpanel id="actions" location="inline">
-                    <link id="actions[2]" mode="intern" target="/sites?act=stop&amp;siteid=1">
-                        <label id="site.stop">Stop</label>
-                        <icon>deactivate</icon>
-                        <confirmation id="site.stop.confirm" params="#{name}">Stop site localhost?</confirmation>
+                    <link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=1">
+                        <label id="site.start">Start</label>
+                        <icon>activate</icon>
                     </link>
                     <link id="actions[3]" mode="intern" target="/sites/update/1" default="true">
                         <label id="edit">Edit</label>
                         <icon>edit</icon>
                     </link>
-                    <link id="actions[5]" mode="intern" target="/sites?act=reload&amp;siteid=1">
-                        <label id="reload">Reload</label>
-                        <icon>reload</icon>
-                        <confirmation id="site.reload.confirm" params="#{name}">Reload site localhost?</confirmation>
+                    <link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=1">
+                        <label id="delete">Delete</label>
+                        <icon>delete</icon>
+                        <confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "site1"?</confirmation>
                     </link>
-                    <link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;siteid=1">
-                        <label id="reload.template">Reload Template</label>
+                    <link id="actions[5]" mode="intern" target="" disabled="true">
+                        <label id="reload">Reload</label>
                         <icon>reload</icon>
                     </link>
                 </linkpanel>

diff --git a/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml b/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
@@ -96,7 +96,7 @@
                 <icon>reload</icon>
                 <confirmation id="site.reload.confirm" params="#{name}">Reload site #{name}?</confirmation>
             </link>
-            <link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;siteid=${current.id}">
+            <link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;sitename=${current.name}">
                 <condition expression="${current.state.name() eq 'STARTED'}"/>
                 <permissions>
                     <permission ref="site.reload" mode="set"></permission>