Add-ons dashboards fixes

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

@@ -12,7 +12,7 @@ const LOADING_STATE = {
     api: {
       content: [
         {
-          code: 'httpUrl',
+          code: 'url',
           value: 'fake-skeleton',
         },
         {
@@ -153,7 +153,7 @@ class Api extends CcAddonCredentialsBetaClient {
       case 'api':
         return [
           {
-            code: 'httpUrl',
+            code: 'url',
             value: `https://${addonCluster.url}:${addonCluster.web_tls_port}`,
           },
           {

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

@@ -25,7 +25,6 @@ const credentialsToDisplayAsString = new Set([
   'initial-user',
   'open-api-url',
   'url',
-  'httpUrl',
 ]);
 /** @type {Set<AddonCredential['code']>} */
 const credentialsToDisplayAsInput = new Set([
@@ -132,8 +131,6 @@ export class CcAddonCredentialsContent extends LitElement {
         return i18n('cc-addon-credentials-content.code.open-api-url');
       case 'url':
         return i18n('cc-addon-credentials-content.code.url');
-      case 'httpUrl':
-        return i18n('cc-addon-credentials-content.code.http-url');
       default:
         return code;
     }

src/components/cc-addon-credentials-content/cc-addon-credentials-content.types.d.ts

@@ -50,5 +50,4 @@ type AddonCredentialCode =
   | 'tenant-namespace'
   | 'initial-user'
   | 'open-api-url'
-  | 'url'
-  | 'httpUrl';
+  | 'url';

src/components/cc-addon-info/cc-addon-info.smart-elastic.js

@@ -1,4 +1,5 @@
 import { getAddon as getAddonProvider } from '@clevercloud/client/esm/api/v2/providers.js';
+import { getGrafanaOrganisation } from '@clevercloud/client/esm/api/v4/saas.js';
 import { ONE_SECOND } from '@clevercloud/client/esm/with-cache.js';
 import { getDocUrl } from '../../lib/dev-hub-url.js';
 import { formatAddonFeatures } from '../../lib/product.js';
@@ -193,6 +194,32 @@ class Api extends CcAddonInfoClient {
     );
   }
 
+  /**
+   * @param {Object} parameters
+   * @param {string} parameters.realId
+   * @param {AbortSignal} parameters.signal
+   * @returns {Promise<string>}
+   */
+  _getGrafanaClusterLink({ realId, signal }) {
+    return getGrafanaOrganisation({ id: this._ownerId })
+      .then(sendToApi({ apiConfig: this._apiConfig, signal }))
+      .then((grafanaOrg) => {
+        const grafanaClusterLink = new URL('/d/elasticsearch/elasticsearch-cluster', this._grafanaLink.base);
+        grafanaClusterLink.searchParams.set('orgId', grafanaOrg.id);
+        grafanaClusterLink.searchParams.set('var-SELECT_APP', realId);
+        return grafanaClusterLink.toString();
+      })
+      .catch(
+        /** @param {Error & { response?: { status?: number }}} error */
+        (error) => {
+          if (error.response?.status === 404) {
+            return this._grafanaLink.console;
+          }
+          throw error;
+        },
+      );
+  }
+
   /**
    * @returns {Promise<{ rawAddon: RawAddon, addonProvider: ElasticAddonInfo, grafanaAppLink: string }>}
    */
@@ -201,7 +228,7 @@ class Api extends CcAddonInfoClient {
     const addonProvider = await this._getAddonProvider(rawAddon.provider.id);
     const grafanaAppLink =
       this._grafanaLink != null
-        ? await this._getGrafanaAppLink({ resourceId: rawAddon.realId, signal: this._signal })
+        ? await this._getGrafanaClusterLink({ realId: rawAddon.realId, signal: this._signal })
         : null;
 
     return { rawAddon, addonProvider, grafanaAppLink };

src/translations/translations.en.js

@@ -215,7 +215,6 @@ export const translations = {
   'cc-addon-credentials-content.code.direct-port': `Direct port`,
   'cc-addon-credentials-content.code.direct-uri': `Direct URI`,
   'cc-addon-credentials-content.code.host': `Host`,
-  'cc-addon-credentials-content.code.http-url': `URL:port`,
   'cc-addon-credentials-content.code.initial-password': `Initial password`,
   'cc-addon-credentials-content.code.initial-user': `Initial User`,
   'cc-addon-credentials-content.code.network-group-multi-instances': `Secured multi-instances`,
@@ -662,7 +661,7 @@ export const translations = {
     `,
   'cc-env-var-form.cli.content.list-var-command': `List environment variables:`,
   'cc-env-var-form.description.config-provider': /** @param {{addonName: string}} _ */ ({ addonName }) =>
-    sanitize`These variables will be injected as environment variables in applications that have the add-on <strong>${addonName}</strong> in their service dependencies.<br>Every time you update your changes, all the dependent applications will be automatically restarted.`,
+    sanitize`These values will be injected as environment variables in applications that have the add-on <strong>${addonName}</strong> in their service dependencies.<br>Every time you update your changes, all the dependent applications will be automatically restarted.`,
   'cc-env-var-form.description.env-var': /** @param {{appName: string}} _ */ ({ appName }) =>
     sanitize`These variables will be injected as environment variables in the application <strong>${appName}</strong>.`,
   'cc-env-var-form.description.exposed-config': /** @param {{appName: string}} _ */ ({ appName }) =>

src/translations/translations.fr.js

@@ -226,7 +226,6 @@ export const translations = {
   'cc-addon-credentials-content.code.direct-port': `Port direct`,
   'cc-addon-credentials-content.code.direct-uri': `URI directe`,
   'cc-addon-credentials-content.code.host': `Hôte`,
-  'cc-addon-credentials-content.code.http-url': `URL:port`,
   'cc-addon-credentials-content.code.initial-password': `Mot de passe initial`,
   'cc-addon-credentials-content.code.initial-user': `Utilisateur initial`,
   'cc-addon-credentials-content.code.network-group-multi-instances': `Multi-instances sécurisé`,
@@ -670,7 +669,7 @@ export const translations = {
     `,
   'cc-env-var-form.cli.content.list-var-command': `Lister les variables d'environnement\u00A0:`,
   'cc-env-var-form.description.config-provider': /** @param {{addonName: string}} _ */ ({ addonName }) =>
-    sanitize`Ces seront injectées en tant que variables d'environnement dans les applications qui ont l'add-on <strong>${addonName}</strong> dans leurs services liés.<br>À chaque fois que vous mettez à jour les changements, toutes les applications dépendantes seront redémarrées automatiquement.`,
+    sanitize`Ces valeurs seront injectées en tant que variables d'environnement dans les applications qui ont l'add-on <strong>${addonName}</strong> dans leurs services liés.<br>À chaque fois que vous mettez à jour les changements, toutes les applications dépendantes seront redémarrées automatiquement.`,
   'cc-env-var-form.description.env-var': /** @param {{appName: string}} _ */ ({ appName }) =>
     sanitize`Ces variables seront injectées en tant que variables d'environnement dans l'application <strong>${appName}</strong>.`,
   'cc-env-var-form.description.exposed-config': /** @param {{appName: string}} _ */ ({ appName }) =>