Revert "Add ignore button to agent tooltip in service discovery"

Revert submission 126627

Reason for revert: Breaking GUI E2E tests

Reverted changes: /q/submissionid:126627

Change-Id: I33ffd9d97fca8350a26f10d573a203a4e45c92c8

Author: okin

cmk/gui/wato/pages/services.py

@@ -65,7 +65,7 @@
 from cmk.gui.utils.popups import MethodAjax
 from cmk.gui.utils.roles import UserPermissionSerializableConfig
 from cmk.gui.utils.transaction_manager import transactions
-from cmk.gui.utils.urls import DocReference, makeuri_contextless
+from cmk.gui.utils.urls import doc_reference_url, DocReference, makeuri_contextless
 from cmk.gui.view_utils import format_plugin_output, LabelRenderType, render_labels
 from cmk.gui.wato.pages.hosts import ModeEditHost
 from cmk.gui.watolib.activate_changes import ActivateChanges, get_pending_changes_tooltip
@@ -789,10 +789,10 @@ def _render_agent_download_tooltip(self, output: str) -> None:
             component_name="cmk-agent-download",
             data=asdict(
                 AgentDownload(
-                    user_id=str(user.id),
                     output=output,
                     site=self._host.site_id(),
                     server_per_site=get_server_per_site(active_config, AgentDownloadServerPerSite),
+                    docs_url=doc_reference_url(DocReference.WATO_AGENT_CMK),
                     agent_slideout=get_agent_slideout(
                         hostname=hostname,
                         save_host=False,

packages/cmk-frontend-vue/src/setup/AgentDownloadApp.vue

@@ -15,10 +15,10 @@ import AgentDownloadDialog from '@/setup/AgentDownloadDialog.vue'
 const { _t } = usei18n()
 
 const props = defineProps<{
-  user_id: string
   output: string
   site: string
   server_per_site: Array<AgentDownloadServerPerSite>
+  docs_url: string
   agent_slideout: AgentSlideout
 }>()
 
@@ -47,19 +47,18 @@ if (props.output.includes(noTlsSearchTerm)) {
   slideInButtonTitle.value = _t('Provide TLS connection')
 }
 
-const hideButtonTitle = _t('Ignore for this host')
+const docsButtonTitle = _t('Read Checkmk user guide')
 const siteServer = props.server_per_site.find((item) => item.site_id === props.site)?.server ?? ''
 </script>
 
 <template>
   <AgentDownloadDialog
-    :user-id="props.user_id"
     :dialog-title="dialogTitle"
     :dialog-message="dialogMessage"
-    :dialog-close-icon-title="_t('Close for now')"
     :slide-in-title="slideInTitle"
     :slide-in-button-title="slideInButtonTitle"
-    :hide-button-title="hideButtonTitle"
+    :docs-button-title="docsButtonTitle"
+    :docs-url="docs_url"
     :close-button-title="_t('Close & run service discovery')"
     :agent-slideout="agent_slideout"
     :is-not-registered="output.includes(notRegisteredSearchTerm)"

packages/cmk-frontend-vue/src/setup/AgentDownloadDialog.vue

@@ -9,10 +9,8 @@ import { TooltipArrow } from 'radix-vue'
 import { ref } from 'vue'
 
 import type { TranslatedString } from '@/lib/i18nString'
-import usePersistentRef from '@/lib/usePersistentRef'
 
 import CmkDialog from '@/components/CmkDialog.vue'
-import CmkIcon from '@/components/CmkIcon'
 import CmkSlideInDialog from '@/components/CmkSlideInDialog.vue'
 import CmkTooltip, {
   CmkTooltipContent,
@@ -23,13 +21,12 @@ import CmkTooltip, {
 import AgentSlideOutContent from '@/mode-host/agent-connection-test/components/AgentSlideOutContent.vue'
 
 interface Props {
-  userId: string
   dialogTitle: TranslatedString
   dialogMessage: TranslatedString
-  dialogCloseIconTitle: TranslatedString
   slideInTitle: TranslatedString
   slideInButtonTitle: TranslatedString
-  hideButtonTitle: TranslatedString
+  docsButtonTitle: TranslatedString
+  docsUrl: string
   closeButtonTitle: TranslatedString
   agentSlideout: AgentSlideout
   isNotRegistered: boolean
@@ -41,10 +38,11 @@ const props = defineProps<Props>()
 
 const slideInOpen = ref(false)
 
-const localStorageKey = `service-discovery-${props.userId}-${props.agentSlideout.host_name}-hidden`
-const tooltipHidden = usePersistentRef(localStorageKey, false, (v) => v as boolean)
-const tooltipClosed = ref(false)
+const openDocs = () => {
+  window.open(props.docsUrl, '_blank')
+}
 
+const tooltipOpen = ref(true)
 // The rescan button always contains the current js call with all needed
 // params. Solution is not the best but without VUE on the setup page we have
 // limited options to solve this.
@@ -58,7 +56,7 @@ const triggerRescan = () => {
 
 <template>
   <CmkTooltipProvider>
-    <CmkTooltip :open="!tooltipHidden && !tooltipClosed" class="tooltip">
+    <CmkTooltip :open="tooltipOpen" class="tooltip">
       <CmkTooltipTrigger as="span"></CmkTooltipTrigger>
       <CmkTooltipContent
         align="center"
@@ -72,13 +70,7 @@ const triggerRescan = () => {
           :height="6"
         />
         <!-- eslint-disable-next-line vue/no-bare-strings-in-template -->
-        <CmkIcon
-          :title="dialogCloseIconTitle"
-          class="tooltip-close"
-          name="close"
-          size="small"
-          @click.stop="tooltipClosed = true"
-        ></CmkIcon>
+        <button class="tooltip-close" @click.prevent="tooltipOpen = false">×</button>
         <CmkDialog
           :title="dialogTitle"
           :message="dialogMessage"
@@ -91,9 +83,9 @@ const triggerRescan = () => {
               variant: 'info'
             },
             {
-              title: hideButtonTitle,
+              title: docsButtonTitle,
               onclick: () => {
-                tooltipHidden = true
+                openDocs()
               },
               variant: 'optional'
             }
@@ -123,7 +115,7 @@ const triggerRescan = () => {
       :setup-error="false"
       :agent-installed="isNotRegistered"
       :is-push-mode="false"
-      @close="((slideInOpen = false), (tooltipHidden = true), triggerRescan())"
+      @close="((slideInOpen = false), (tooltipOpen = false), triggerRescan())"
     />
   </CmkSlideInDialog>
 </template>

packages/cmk-shared-typing/source/setup.json

@@ -21,7 +21,6 @@
     "agent_download": {
       "type": "object",
       "properties": {
-        "user_id": { "type": "string" },
         "output": { "type": "string" },
         "site": { "type": "string" },
         "server_per_site": {
@@ -30,9 +29,10 @@
             "$ref": "#/$defs/agent_download_server_per_site"
           }
         },
+        "docs_url": { "type": "string" },
         "agent_slideout": { "$ref": "agent_slideout.json" }
       },
-      "required": ["user_id", "site", "server_per_site", "agent_slideout"]
+      "required": ["site", "server_per_site", "docs_url", "agent_slideout"]
     }
   }
 }