Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New release - GCJ W1 #14768

Merged
merged 8 commits into from
Jan 7, 2025
2 changes: 1 addition & 1 deletion packages/manager/apps/billing/src/app.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default async (containerEl, shellClient) => {
const moduleName = 'BillingApp';

const routingConfig = /* @ngInject */ ($urlRouterProvider) => {
$urlRouterProvider.otherwise('/billing');
$urlRouterProvider.otherwise('/');
};

const trackingConfig = /* @ngInject */ (atInternetConfigurationProvider) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ const helpRoot = 'https://help.ovhcloud.com/csm';
const homeIndex = '-home?id=csm_index';
const support = `${helpRoot}?id=csm_cases_requests&ovhSubsidiary=`;

const cloud_changelog = 'https://github.com/orgs/ovh/projects/16/views/6';
const hosting_and_collab_changelog = 'https://github.com/orgs/ovh/projects/18/views/2';

export interface ContentURLS {
help: {
Expand All @@ -12,6 +14,8 @@ export interface ContentURLS {
support?: string;
status: string;
marketplace?: string;
cloud_changelog?:string;
hosting_and_collab_changelog?:string;
}

type URLLinks = {
Expand All @@ -37,6 +41,8 @@ const urls: URLLinks = {
support,
status: 'https://www.status-ovhcloud.com/',
marketplace: 'https://marketplace.ovhcloud.com/',
cloud_changelog,
hosting_and_collab_changelog,
},
CA: {
help: {
Expand All @@ -50,12 +56,16 @@ const urls: URLLinks = {
},
support,
status: 'https://www.status-ovhcloud.com/',
cloud_changelog,
hosting_and_collab_changelog,
},
US: {
help: {
US: 'https://us.ovhcloud.com/support',
},
status: 'https://status.us.ovhcloud.com/',
cloud_changelog,
hosting_and_collab_changelog,
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ const createTicketSupportIndex = '?id=csm_get_help';
const ticketsSupportIndex = '?id=csm_cases_requests';
const supportSubsidiary = 'ovhSubsidiary=';

const cloud_changelog = 'https://github.com/orgs/ovh/projects/16/views/6';
const hosting_and_collab_changelog = 'https://github.com/orgs/ovh/projects/18/views/2';

interface UsefulLinks {
help: {
[key in string]: string;
Expand All @@ -15,6 +18,8 @@ interface UsefulLinks {
tickets: (sub: string) => string;
};
tasks: string;
cloud_changelog?: string;
hosting_and_collab_changelog?: string;
}
type UsefulLinkConstants = {
[key in Region]: UsefulLinks;
Expand All @@ -41,6 +46,8 @@ const consts: UsefulLinkConstants = {
tickets: (sub: string) => `${helpRoot}${ticketsSupportIndex}&${supportSubsidiary}${sub}`
},
tasks: 'https://www.status-ovhcloud.com/',
cloud_changelog,
hosting_and_collab_changelog,
},
CA: {
help: {
Expand All @@ -57,12 +64,16 @@ const consts: UsefulLinkConstants = {
tickets: (sub: string) => `${helpRoot}${ticketsSupportIndex}&${supportSubsidiary}${sub}`
},
tasks: 'https://www.status-ovhcloud.com/',
cloud_changelog,
hosting_and_collab_changelog,
},
US: {
help: {
US: 'https://us.ovhcloud.com/support',
},
tasks: '',
cloud_changelog,
hosting_and_collab_changelog,
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { ODS_ICON_NAME} from '@ovhcloud/ods-components'


import getOdsIcon from '../getOdsIcon';
import OvhProductName from '@ovh-ux/ovh-product-icons/utils/OvhProductNameEnum';
import { getSvgIcon } from '../getSvgIcon';

interface UseUsefulLinks {
getUsefulLinks(): UsefulLink[];
Expand All @@ -28,6 +30,20 @@ const useUsefulLinks = (): UseUsefulLinks => {
const getUsefulLinks = (): UsefulLink[] => {
const trackingPrefix = 'hub::sidebar::useful-links';
return [
{
id: 'cloud_changelog',
external: true,
href: constants[region]?.cloud_changelog,
tracking: `${trackingPrefix}::go-to-cloud-changelog`,
icon: getSvgIcon(OvhProductName.CLOUD_CHANGELOG)
},
{
id: 'hosting_and_collab_changelog',
external: true,
href: constants[region]?.hosting_and_collab_changelog,
tracking: `${trackingPrefix}::go-to-hosting-and-collab-changelog`,
icon: getSvgIcon(OvhProductName.HOSTING_CHANGELOG)
},
{
id: 'helpCenter',
external: true,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { SvgIconWrapper } from '@ovh-ux/ovh-product-icons/utils/SvgIconWrapper';

export const getSvgIcon = (iconName: string): JSX.Element => {
return <SvgIconWrapper name={iconName} height={24} width={24} className='block' />;
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ const AssistanceSidebar: React.FC<ComponentProps<AssistanceProps>> = ({
node.url = urls.get(node.url as keyof ContentURLS);
}
switch (node.id) {
case 'cloud_changelog':
node.onClick = () => trackNode('cloud_changelog');
break;
case 'hosting_and_collab_changelog':
node.onClick = () => trackNode('hosting_and_collab_changelog');
break;
case 'marketplace':
node.onClick = () => trackNode('marketplace');
break;
Expand All @@ -49,14 +55,14 @@ const AssistanceSidebar: React.FC<ComponentProps<AssistanceProps>> = ({
node.isExternal = true;
break;
case 'tickets':
node.onClick = () => trackNode('assistance_support_tickets');
node.url = isEUOrCA ? node.url : null;
node.routing = !isEUOrCA ? {
application: 'dedicated',
hash: '#/ticket',
} : null;
node.isExternal = isEUOrCA;
break;
node.onClick = () => trackNode('assistance_support_tickets');
node.url = isEUOrCA ? node.url : null;
node.routing = !isEUOrCA ? {
application: 'dedicated',
hash: '#/ticket',
} : null;
node.isExternal = isEUOrCA;
break;
case 'assistance_status':
node.onClick = () => trackNode('assistance_status');
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ export const assistanceTree: Node = {
id: 'assistance',
translation: 'sidebar_assistance_title',
children: [
{
id: 'cloud_changelog',
translation: 'sidebar_cloud_changelog',
url: 'cloud_changelog',
count: false,
isExternal: true,
},
{
id: 'hosting_and_collab_changelog',
translation: 'sidebar_hosting_and_collab_changelog',
url: 'hosting_and_collab_changelog',
count: false,
isExternal: true,
},
{
id: 'marketplace',
translation: 'sidebar_marketplace',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,7 @@
"sidebar_veeam_backup": "Managed Veeam for VCD",
"sidebar_all_veeam_backup": "Alle Dienste",
"sidebar_vmware_vsphere": "Managed VMware vSphere",
"sidebar_vmware_vcd": "Managed VCD"
"sidebar_vmware_vcd": "Managed VCD",
"sidebar_cloud_changelog": "Cloud Changelog",
"sidebar_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,7 @@
"sidebar_veeam_backup": "Managed Veeam for VCD",
"sidebar_all_veeam_backup": "All services",
"sidebar_vmware_vsphere": "Managed VMware vSphere",
"sidebar_vmware_vcd": "Managed VCD"
"sidebar_vmware_vcd": "Managed VCD",
"sidebar_cloud_changelog": "Cloud Changelog",
"sidebar_hosting_and_collab_changelog": "Changelog Hosting &amp; Collab"
}
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,7 @@
"sidebar_veeam_backup": "Managed Veeam for VCD",
"sidebar_all_veeam_backup": "Todos los servicios",
"sidebar_vmware_vsphere": "Managed VMware vSphere",
"sidebar_vmware_vcd": "Managed VCD"
"sidebar_vmware_vcd": "Managed VCD",
"sidebar_cloud_changelog": "Cloud Changelog",
"sidebar_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@
"sidebar_security_identity_operations_iam": "Identity & Access Management",
"sidebar_security_identity_operations_logs": "Logs Data Platform",
"sidebar_marketplace": "Marketplace",
"sidebar_cloud_changelog": "Cloud Changelog",
"sidebar_hosting_and_collab_changelog": "Hosting & Collab Changelog",
"sidebar_assistance_title": "Liens utiles",
"sidebar_assistance_help_center": "Centre d'aide",
"sidebar_assistance_tickets": "Mes demandes d'assistance",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@
"sidebar_security_identity_operations_iam": "Identity & Access Management",
"sidebar_security_identity_operations_logs": "Logs Data Platform",
"sidebar_marketplace": "Marketplace",
"sidebar_cloud_changelog": "Cloud Changelog",
"sidebar_hosting_and_collab_changelog": "Hosting & Collab Changelog",
"sidebar_assistance_title": "Liens utiles",
"sidebar_assistance_help_center": "Centre d'aide",
"sidebar_assistance_tickets": "Mes demandes d'assistance",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,7 @@
"sidebar_veeam_backup": "Managed Veeam for VCD",
"sidebar_all_veeam_backup": "Tutti i servizi",
"sidebar_vmware_vsphere": "Managed VMware vSphere",
"sidebar_vmware_vcd": "Managed VCD"
"sidebar_vmware_vcd": "Managed VCD",
"sidebar_cloud_changelog": "Cloud Changelog",
"sidebar_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,7 @@
"sidebar_veeam_backup": "Managed Veeam for VCD",
"sidebar_all_veeam_backup": "Wszystkie usługi",
"sidebar_vmware_vsphere": "Managed VMware vSphere",
"sidebar_vmware_vcd": "Managed VCD"
"sidebar_vmware_vcd": "Managed VCD",
"sidebar_cloud_changelog": "Cloud Changelog",
"sidebar_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,7 @@
"sidebar_veeam_backup": "Managed Veeam for VCD",
"sidebar_all_veeam_backup": "Todos os serviços",
"sidebar_vmware_vsphere": "Managed VMware vSphere",
"sidebar_vmware_vcd": "Managed VCD"
"sidebar_vmware_vcd": "Managed VCD",
"sidebar_cloud_changelog": "Cloud Changelog",
"sidebar_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"user_account_menu_my_contacts": "Meine Kontakte",
"user_account_menu_my_payment_methods": "Meine Zahlungsarten",
"user_account_menu_my_identity_documents": "Meine Ausweisdokumente",
"user_account_menu_my_assistance_tickets": "Meine Support-Anfragen"
"user_account_menu_my_assistance_tickets": "Meine Support-Anfragen",
"user_account_menu_useful_links_cloud_changelog": "Cloud Changelog",
"user_account_menu_useful_links_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"user_account_menu_my_contacts": "My contacts",
"user_account_menu_my_payment_methods": "My payment methods",
"user_account_menu_my_identity_documents": "My identity documents",
"user_account_menu_my_assistance_tickets": "My support tickets "
"user_account_menu_my_assistance_tickets": "My support tickets ",
"user_account_menu_useful_links_cloud_changelog": "Cloud Changelog",
"user_account_menu_useful_links_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"user_account_menu_my_contacts": "Mis contactos",
"user_account_menu_my_payment_methods": "Mis formas de pago",
"user_account_menu_my_identity_documents": "Mis documentos de identidad",
"user_account_menu_my_assistance_tickets": "Mis solicitudes de asistencia"
"user_account_menu_my_assistance_tickets": "Mis solicitudes de asistencia",
"user_account_menu_useful_links_cloud_changelog": "Cloud Changelog",
"user_account_menu_useful_links_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
"user_account_menu_useful_links_tasks": "État du réseau et incidents",
"user_account_menu_useful_links_tickets": "Mes demandes d'assistance",
"user_account_menu_useful_links_createTicket": "Créer un ticket",
"user_account_menu_useful_links_cloud_changelog": "Cloud Changelog",
"user_account_menu_useful_links_hosting_and_collab_changelog": "Hosting & Collab Changelog",
"user_account_menu_beta_feedback": "Donnez votre avis !",
"user_account_menu_beta_feedback_text": "Aidez-nous à améliorer OVHcloud"
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
"user_account_menu_useful_links_tasks": "État du réseau et incidents",
"user_account_menu_useful_links_tickets": "Mes demandes d'assistance",
"user_account_menu_useful_links_createTicket": "Créer un ticket",
"user_account_menu_useful_links_cloud_changelog": "Cloud Changelog",
"user_account_menu_useful_links_hosting_and_collab_changelog": "Hosting & Collab Changelog",
"user_account_menu_beta_feedback": "Donnez votre avis !",
"user_account_menu_beta_feedback_text": "Aidez-nous à améliorer OVHcloud"
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"user_account_menu_my_contacts": "I miei contatti",
"user_account_menu_my_payment_methods": "I miei metodi di pagamento",
"user_account_menu_my_identity_documents": "I miei documenti d'identità",
"user_account_menu_my_assistance_tickets": "Le mie richieste di assistenza"
"user_account_menu_my_assistance_tickets": "Le mie richieste di assistenza",
"user_account_menu_useful_links_cloud_changelog": "Cloud Changelog",
"user_account_menu_useful_links_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"user_account_menu_my_contacts": "Moje kontakty",
"user_account_menu_my_payment_methods": "Moje sposoby płatności",
"user_account_menu_my_identity_documents": "Moje dokumenty tożsamości",
"user_account_menu_my_assistance_tickets": "Moje zgłoszenia"
"user_account_menu_my_assistance_tickets": "Moje zgłoszenia",
"user_account_menu_useful_links_cloud_changelog": "Cloud Changelog",
"user_account_menu_useful_links_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"user_account_menu_my_contacts": "Contactos",
"user_account_menu_my_payment_methods": "Os meus métodos de pagamento",
"user_account_menu_my_identity_documents": "Documentos de identificação",
"user_account_menu_my_assistance_tickets": "Os meus pedidos de assistência"
"user_account_menu_my_assistance_tickets": "Os meus pedidos de assistência",
"user_account_menu_useful_links_cloud_changelog": "Cloud Changelog",
"user_account_menu_useful_links_hosting_and_collab_changelog": "Hosting &amp; Collab Changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
data-translate="{{'user_account_identity_documents_proof_tile_heading_' + $ctrl.proof}}"
></h4>
<p
class="d-flex align-items-center my-1 text-danger"
class="d-flex align-items-center my-1 oui-heading_6 oui-color-p-500"
data-ng-if="$ctrl.extended"
data-translate="{{'user_account_identity_documents_proof_tile_extended_' + $ctrl.proof}}"
></p>
Expand Down
Loading
Loading