webui: move service action panel actions to action dropdown

2 files changed, 22 insertions, 29 deletions

diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index b2f4c283f..82f9ab3b3 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -117,11 +117,6 @@ return {
                 },
                 {
                     name: 'provisioning',
-                    action_panel: {
-                        $factory: IPA.action_panel,
-                        name: 'provisioning_actions',
-                        actions: ['unprovision']
-                    },
                     fields: [
                         {
                             $type: 'service_provisioning_status',
@@ -132,14 +127,6 @@ return {
                 },
                 {
                     name: 'certificate',
-                    action_panel: {
-                        $factory: IPA.action_panel,
-                        name: 'cert_actions',
-                        actions: [
-                            'request_cert', 'view_cert', 'get_cert',
-                            'revoke_cert', 'restore_cert'
-                        ]
-                    },
                     fields: [
                         {
                             $type: 'certificate_status',
@@ -157,6 +144,14 @@ return {
                 'cert_revoke',
                 'cert_restore'
             ],
+            header_actions: [
+                'unprovision',
+                'request_cert',
+                'view_cert',
+                'get_cert',
+                'revoke_cert',
+                'restore_cert'
+            ],
             state: {
                 evaluators: [
                     IPA.service.has_keytab_evaluator,
diff --git a/ipatests/test_webui/test_service.py b/ipatests/test_webui/test_service.py
index 9a2d6f904..c882a1cad 100644
--- a/ipatests/test_webui/test_service.py
+++ b/ipatests/test_webui/test_service.py
@@ -90,7 +90,6 @@ class test_service(sevice_tasks):
         data = self.prep_data()
         pkey = data.get('pkey')
         csr = self.load_csr(csr_path)
-        panel = 'cert_actions'
         host = self.config.get('ipa_server')
         realm = self.config.get('ipa_realm')
 
@@ -100,35 +99,35 @@ class test_service(sevice_tasks):
         self.assert_visible("div[name='certificate-missing']")
 
         # cert request
-        self.action_panel_action(panel, 'request_cert')
+        self.action_list_action('request_cert', confirm=False)
         self.fill_text('textarea.certificate', csr)
         self.dialog_button_click('issue')
         self.wait_for_request(n=2, d=0.5)
         self.assert_visible("div[name='certificate-valid']")
 
         # cert view
-        self.action_panel_action(panel, 'view_cert')
+        self.action_list_action('view_cert', confirm=False)
         self.wait()
         self.assert_text("tbody tr:nth-child(2) td:nth-child(2)", host)
         self.assert_text("tbody tr:nth-child(3) td:nth-child(2)", realm)
         self.dialog_button_click('close')
 
         # cert get
-        self.action_panel_action(panel, 'get_cert')
+        self.action_list_action('get_cert', confirm=False)
         self.wait()
         # We don't know the cert text, so at least open and close the dialog
         self.dialog_button_click('close')
 
-        ## cert revoke
-        self.action_panel_action(panel, 'revoke_cert')
+        # cert revoke
+        self.action_list_action('revoke_cert', confirm=False)
         self.wait()
         self.select('select', '6')
         self.dialog_button_click('ok')
         self.wait_for_request(n=2)
         self.assert_visible("div[name='certificate-revoked']")
 
-        ## cert restore
-        self.action_panel_action(panel, 'restore_cert')
+        # cert restore
+        self.action_list_action('restore_cert', confirm=False)
         self.wait()
         self.dialog_button_click('ok')
         self.wait_for_request(n=2)
@@ -155,13 +154,12 @@ class test_service(sevice_tasks):
         self.add_record(ENTITY, data)
         self.navigate_to_record(pkey)
 
-        panel = 'cert_actions'
-        self.assert_action_panel_action(panel, 'request_cert', visible=False)
-        self.assert_action_panel_action(panel, 'revoke_cert', visible=False)
-        self.assert_action_panel_action(panel, 'restore_cert', visible=False)
+        self.assert_action_list_action('request_cert', visible=False)
+        self.assert_action_list_action('revoke_cert', visible=False)
+        self.assert_action_list_action('restore_cert', visible=False)
 
-        self.assert_action_panel_action(panel, 'view_cert', enabled=False)
-        self.assert_action_panel_action(panel, 'get_cert', enabled=False)
+        self.assert_action_list_action('view_cert', enabled=False)
+        self.assert_action_list_action('get_cert', enabled=False)
 
         self.navigate_by_breadcrumb('Services')
         self.delete_record(pkey, data.get('del'))
@@ -171,8 +169,8 @@ class test_service(sevice_tasks):
         pkey = self.get_http_pkey()
 
         self.navigate_to_record(pkey)
-        self.assert_action_panel_action(panel, 'view_cert')
-        self.assert_action_panel_action(panel, 'get_cert')
+        self.assert_action_list_action('view_cert')
+        self.assert_action_list_action('get_cert')
 
     @screenshot
     def test_kerberos_flags(self):