Add-ons dashboards fixes

demo-smart/index.html

@@ -168,6 +168,11 @@
           >cc-addon-header.smart-keycloak</a
         >
       </li>
+      <li>
+        <a class="definition-link" href="?definition=cc-addon-info.smart-keycloak&smart-mode=keycloak"
+          >cc-addon-info.smart-keycloak</a
+        >
+      </li>
       <li>
         <a class="definition-link" href="?definition=cc-addon-credentials-beta.smart-keycloak&smart-mode=keycloak">
           cc-addon-credentials-beta.smart-keycloak
@@ -278,11 +283,6 @@
           >cc-addon-header.smart-config-provider</a
         >
       </li>
-      <li>
-        <a class="definition-link" href="?definition=cc-addon-info.smart-config-provider&smart-mode=config-provider"
-          >cc-addon-info.smart-config-provider</a
-        >
-      </li>
     </ul>
 
     <div class="context-buttons">
@@ -319,7 +319,6 @@
         "ownerId":"orga_3547a882-d464-4c34-8168-add4b3e0c135",
         "addonId":"addon_e41d1602-9ec0-43ce-811a-1f47efc2c962",
         "logsUrlPattern":"/organisations/orga_3547a882-d464-4c34-8168-add4b3e0c135/addons/:id/logs",
-          "scalabilityUrlPattern": "/organisations/orga_3547a882-d464-4c34-8168-add4b3e0c135/applications/:id/settings",
         "grafanaLink": {
             "base": "https://grafana.services.clever-cloud.com",
             "console": "https://console.clever-cloud.com"
@@ -334,7 +333,6 @@
         "ownerId":"orga_3547a882-d464-4c34-8168-add4b3e0c135",
         "addonId":"addon_1efdc7b6-234b-4517-9402-3413a2968229",
         "logsUrlPattern":"/organisations/orga_3547a882-d464-4c34-8168-add4b3e0c135/addons/:id/logs",
-          "scalabilityUrlPattern": "/organisations/orga_3547a882-d464-4c34-8168-add4b3e0c135/applications/:id/settings",
         "grafanaLink": {
             "base": "https://grafana.services.clever-cloud.com",
             "console": "https://console.clever-cloud.com"
@@ -349,7 +347,6 @@
         "ownerId":"orga_3547a882-d464-4c34-8168-add4b3e0c135",
         "addonId":"addon_ce389853-4632-4508-aaa1-cd6ae287046c",
         "logsUrlPattern":"/organisations/orga_3547a882-d464-4c34-8168-add4b3e0c135/addons/:id/logs",
-          "scalabilityUrlPattern": "/organisations/orga_3547a882-d464-4c34-8168-add4b3e0c135/applications/:id/settings",
         "grafanaLink": {
             "base": "https://grafana.services.clever-cloud.com",
             "console": "https://console.clever-cloud.com"

src/components/cc-addon-credentials-beta/cc-addon-credentials-beta.js

@@ -1,6 +1,7 @@
 import { LitElement, css, html } from 'lit';
 import { iconRemixInformationFill as iconInfo } from '../../assets/cc-remix.icons.js';
 import { fakeString } from '../../lib/fake-strings.js';
+import { isStringEmpty } from '../../lib/utils.js';
 import { i18n } from '../../translations/translation.js';
 import '../cc-addon-credentials-content/cc-addon-credentials-content.js';
 import '../cc-block-details/cc-block-details.js';
@@ -67,6 +68,8 @@ export class CcAddonCredentialsBeta extends LitElement {
         return i18n('cc-addon-credentials-beta.choice.api');
       case 'apm':
         return i18n('cc-addon-credentials-beta.choice.apm');
+      case 'cli':
+        return i18n('cc-addon-credentials-beta.choice.cli');
       case 'default':
         return i18n('cc-addon-credentials-beta.choice.default');
       case 'direct':
@@ -136,9 +139,11 @@ export class CcAddonCredentialsBeta extends LitElement {
               ></cc-addon-credentials-content>
             `
           : ''}
-        <div slot="footer-right">
-          <cc-link .href="${activeTab.docLink.href}" .icon="${iconInfo}">${activeTab.docLink.text}</cc-link>
-        </div>
+        ${!isStringEmpty(activeTab.docLink?.href)
+          ? html` <div slot="footer-right">
+              <cc-link .href="${activeTab.docLink.href}" .icon="${iconInfo}">${activeTab.docLink.text}</cc-link>
+            </div>`
+          : ''}
       </cc-block>
     `;
   }

src/components/cc-addon-credentials-beta/cc-addon-credentials-beta.smart-elastic.js

@@ -1,9 +1,7 @@
 import { getAddon as getAddonProvider } from '@clevercloud/client/esm/api/v2/providers.js';
 import { ONE_SECOND } from '@clevercloud/client/esm/with-cache.js';
-import { getDocUrl } from '../../lib/dev-hub-url.js';
 import { sendToApi } from '../../lib/send-to-api.js';
 import { defineSmartComponent } from '../../lib/smart/define-smart-component.js';
-import { i18n } from '../../translations/translation.js';
 import '../cc-smart-container/cc-smart-container.js';
 import { CcAddonCredentialsBetaClient } from './cc-addon-credentials-beta.client.js';
 import './cc-addon-credentials-beta.js';
@@ -27,12 +25,8 @@ const LOADING_STATE = {
           value: 'fake-skeleton',
         },
       ],
-      docLink: {
-        text: i18n('cc-addon-credentials-beta.doc-link.elastic'),
-        href: getDocUrl('/addons/elastic'),
-      },
     },
-    kibana: {
+    apm: {
       content: [
         {
           code: 'user',
@@ -42,13 +36,13 @@ const LOADING_STATE = {
           code: 'password',
           value: 'fake-skeleton',
         },
+        {
+          code: 'token',
+          value: 'fake-skeleton',
+        },
       ],
-      docLink: {
-        text: i18n('cc-addon-credentials-beta.doc-link.elastic-kibana'),
-        href: getDocUrl('/addons/elastic/#kibana'),
-      },
     },
-    apm: {
+    kibana: {
       content: [
         {
           code: 'user',
@@ -58,15 +52,7 @@ const LOADING_STATE = {
           code: 'password',
           value: 'fake-skeleton',
         },
-        {
-          code: 'token',
-          value: 'fake-skeleton',
-        },
       ],
-      docLink: {
-        text: i18n('cc-addon-credentials-beta.doc-link.elastic-apm'),
-        href: getDocUrl('/addons/elastic/#elastic-apm'),
-      },
     },
   },
 };
@@ -105,28 +91,28 @@ defineSmartComponent({
           (state) => {
             state.type = 'loaded';
             // Build tabs object with only enabled services
-            /** @type {Record<string, {content: AddonCredential[], docLink: {text: string, href: string}}>} */
+            /** @type {Record<string, {content: AddonCredential[]}>} */
             const updatedTabs = {
               elastic: {
                 ...state.tabs.elastic,
                 content: elastic,
               },
             };
 
-            if (kibana != null) {
-              updatedTabs.kibana = {
-                ...state.tabs.kibana,
-                content: kibana,
-              };
-            }
-
             if (apm != null) {
               updatedTabs.apm = {
                 ...state.tabs.apm,
                 content: apm,
               };
             }
 
+            if (kibana != null) {
+              updatedTabs.kibana = {
+                ...state.tabs.kibana,
+                content: kibana,
+              };
+            }
+
             state.tabs = updatedTabs;
           },
         );
@@ -162,7 +148,7 @@ class Api extends CcAddonCredentialsBetaClient {
   }
 
   /**
-   * @param {'elastic' | 'kibana' | 'apm'} tabType
+   * @param {'elastic' | 'apm' | 'kibana'} tabType
    * @return {Promise<AddonCredential[]>}
    */
   async getCredentials(tabType) {
@@ -183,30 +169,30 @@ class Api extends CcAddonCredentialsBetaClient {
             value: addonProvider.config.password,
           },
         ];
-      case 'kibana':
+      case 'apm':
         return [
           {
             code: 'user',
-            value: addonProvider.config.kibana_user,
+            value: addonProvider.config.apm_user,
           },
           {
             code: 'password',
-            value: addonProvider.config.kibana_password,
+            value: addonProvider.config.apm_password,
+          },
+          {
+            code: 'token',
+            value: addonProvider.config.apm_auth_token,
           },
         ];
-      case 'apm':
+      case 'kibana':
         return [
           {
             code: 'user',
-            value: addonProvider.config.apm_user,
+            value: addonProvider.config.kibana_user,
           },
           {
             code: 'password',
-            value: addonProvider.config.apm_password,
-          },
-          {
-            code: 'token',
-            value: addonProvider.config.apm_auth_token,
+            value: addonProvider.config.kibana_password,
           },
         ];
     }

src/components/cc-addon-credentials-beta/cc-addon-credentials-beta.smart-materia-kv.js

@@ -1,7 +1,5 @@
-import { getDocUrl } from '../../lib/dev-hub-url.js';
 import { sendToApi } from '../../lib/send-to-api.js';
 import { defineSmartComponent } from '../../lib/smart/define-smart-component.js';
-import { i18n } from '../../translations/translation.js';
 import '../cc-smart-container/cc-smart-container.js';
 import { CcAddonCredentialsBetaClient } from './cc-addon-credentials-beta.client.js';
 import './cc-addon-credentials-beta.js';
@@ -25,10 +23,6 @@ const LOADING_STATE = {
           value: 'fake-skeleton',
         },
       ],
-      docLink: {
-        text: i18n('cc-addon-credentials-beta.doc-link.materia-kv'),
-        href: getDocUrl('/addons/materia-kv'),
-      },
     },
   },
 };