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 - infra hpc enabler w42 #13556

Merged
merged 6 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default [
'UserAccount.services.doubleAuth.u2f',
'UserAccount.services.doubleAuth.backupCode',
'Alerter',
'coreConfig',
function UserAccountDoubleAuthController(
$scope,
$q,
Expand All @@ -22,13 +23,18 @@ export default [
DoubleAuthU2fService,
DoubleAuthBackupCodeService,
Alerter,
coreConfig,
) {
const {
auth: { method: authMethod },
} = coreConfig.getUser();
$scope.doubleAuth = {
sms: 'disabled',
totp: 'disabled',
u2f: 'disabled',
backupCode: 'disabled',
isLoading: false,
isConnectionSSO: authMethod === 'provider',
};

/* ===============================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,36 @@
></h4>

<div class="clearfix" data-ng-if="!has2faEnabled()">
<p
class="text-warning"
data-translate="user_account_security_double_auth_info"
></p>
<div data-ng-if="!doubleAuth.isConnectionSSO">
<p
data-translate="user_account_security_double_auth_info"
></p>

<a
data-ui-sref="app.account.user.security.mfa"
class="oui-button oui-button_primary float-right"
data-track-on="click"
data-track-name="account::security::authentication::double_authentication"
data-track-type="action"
>
<span
data-translate="user_account_security_double_auth_action_activate"
></span>
</a>
<a
data-ui-sref="app.account.user.security.mfa"
class="oui-button oui-button_primary float-right"
data-track-on="click"
data-track-name="account::security::authentication::double_authentication"
data-track-type="action"
>
<span
data-translate="user_account_security_double_auth_action_activate"
></span>
</a>
</div>
<div data-ng-if="doubleAuth.isConnectionSSO">
<p
data-translate="user_account_security_double_auth_sso_info"
></p>
<oui-button
class="float-right"
data-disabled="true"
>
<span
data-translate="user_account_security_double_auth_action_activate"
></span>
</oui-button>
</div>
</div>

<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -608,5 +608,6 @@
"user_account_ssh_keys_title": "Meine SSH-SchlΓΌssel",
"user_account_advanced_title": "Erweiterte Einstellungen",
"user_account_guides_header": "Anleitungen",
"user_account_guides_header_account_informations_guides": "Informationen zum Account"
}
"user_account_guides_header_account_informations_guides": "Informationen zum Account",
"user_account_security_double_auth_sso_info": "Die Zwei-Faktor-Authentifizierung ist bei einer Single-Sign-On-Verbindung nicht verfΓΌgbar. Hier wird bereits eine erhΓΆhte Sicherheit geboten."
}
Original file line number Diff line number Diff line change
Expand Up @@ -608,5 +608,6 @@
"user_account_ssh_keys_title": "My SSH keys",
"user_account_advanced_title": "Advanced settings",
"user_account_guides_header": "Guides",
"user_account_guides_header_account_informations_guides": "Account information"
}
"user_account_guides_header_account_informations_guides": "Account information",
"user_account_security_double_auth_sso_info": "Two-factor authentication is not available when using single sign-on (SSO), which already offers enhanced security."
}
Original file line number Diff line number Diff line change
Expand Up @@ -608,5 +608,6 @@
"user_account_ssh_keys_title": "Mis claves SSH",
"user_account_advanced_title": "ConfiguraciΓ³n avanzada",
"user_account_guides_header": "GuΓ­as",
"user_account_guides_header_account_informations_guides": "InformaciΓ³n de la cuenta"
}
"user_account_guides_header_account_informations_guides": "InformaciΓ³n de la cuenta",
"user_account_security_double_auth_sso_info": "La doble autenticaciΓ³n no estΓ‘ disponible con una conexiΓ³n Single Sign-On, que ya garantiza una seguridad reforzada."
}
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@
"user_account_security_password_title": "Mot de passe",
"user_account_security_double_auth_title": "Double authentification",
"user_account_security_double_auth_info": "Activez cette fonction pour sΓ©curiser votre compte.",
"user_account_security_double_auth_sso_info": "La double authentification n'est pas disponible avec une connexion Single Sign-On, ce qui assure dΓ©jΓ  une sΓ©curitΓ© renforcΓ©e.",
"user_account_security_double_auth_status_activate": "ActivΓ©",
"user_account_security_double_auth_action_activate": "Activer la double authentification",
"user_account_security_double_auth_error": "Oups ! Une erreur est survenue lors de la rΓ©cupΓ©ration des comptes liΓ©s Γ  la double authentification.",
Expand Down Expand Up @@ -609,4 +610,4 @@
"user_account_advanced_title": "Paramètres avancés",
"user_account_guides_header": "Guides",
"user_account_guides_header_account_informations_guides": "Informations de compte"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@
"user_account_security_password_title": "Mot de passe",
"user_account_security_double_auth_title": "Double authentification",
"user_account_security_double_auth_info": "Activez cette fonction pour sΓ©curiser votre compte.",
"user_account_security_double_auth_sso_info": "La double authentification n'est pas disponible avec une connexion Single Sign-On, ce qui assure dΓ©jΓ  une sΓ©curitΓ© renforcΓ©e.",
"user_account_security_double_auth_status_activate": "ActivΓ©",
"user_account_security_double_auth_action_activate": "Activer la double authentification",
"user_account_security_double_auth_error": "Oups ! Une erreur est survenue lors de la rΓ©cupΓ©ration des comptes liΓ©s Γ  la double authentification.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -608,5 +608,6 @@
"user_account_ssh_keys_title": "Le mie chiavi SSH",
"user_account_advanced_title": "Impostazioni avanzate",
"user_account_guides_header": "Guide",
"user_account_guides_header_account_informations_guides": "Informazioni dell'account"
}
"user_account_guides_header_account_informations_guides": "Informazioni dell'account",
"user_account_security_double_auth_sso_info": "L'autenticazione a due fattori non Γ¨ disponibile con una connessione Single Sign-On, che garantisce giΓ  una sicurezza rafforzata."
}
Original file line number Diff line number Diff line change
Expand Up @@ -608,5 +608,6 @@
"user_account_ssh_keys_title": "Moje klucze SSH",
"user_account_advanced_title": "Zaawansowane parametry",
"user_account_guides_header": "Przewodniki",
"user_account_guides_header_account_informations_guides": "Informacje o koncie"
}
"user_account_guides_header_account_informations_guides": "Informacje o koncie",
"user_account_security_double_auth_sso_info": "Weryfikacja dwuetapowa nie jest dostΔ™pna, gdy uΕΌywasz logowania Single Sign-On, ktΓ³re samo w sobie zapewnia zwiΔ™kszony poziom bezpieczeΕ„stwa."
}
Original file line number Diff line number Diff line change
Expand Up @@ -608,5 +608,6 @@
"user_account_ssh_keys_title": "Chaves SSH",
"user_account_advanced_title": "Configuraçáes avançadas",
"user_account_guides_header": "Manuais",
"user_account_guides_header_account_informations_guides": "Informaçáes da conta"
}
"user_account_guides_header_account_informations_guides": "Informaçáes da conta",
"user_account_security_double_auth_sso_info": "A dupla autenticação não estÑ disponível com uma ligação Single Sign-On, o que jÑ garante uma segurança reforçada."
}
Original file line number Diff line number Diff line change
Expand Up @@ -545,5 +545,6 @@
"common_resiliate_contact_support": "Um diesen Dienst zu kΓΌndigen, kontaktieren Sie bitte unseren Support unter <strong>+49 (0) 681 906730</strong>. Vielen Dank fΓΌr Ihr VerstΓ€ndnis.",
"core_pcc_top_guide_11_title": "Offizielle Dokumentation zu Nutanix",
"older_interface": "Altes Kundeninterface",
"core_pcc_top_guide_12_title": "Offizielle Dokumentation zu SAP HANA on Private Cloud"
"core_pcc_top_guide_12_title": "Offizielle Dokumentation zu SAP HANA on Private Cloud",
"core_pcc_top_guide_13_title": "IPs die Verbindung zum vCenter erlauben"
}
Original file line number Diff line number Diff line change
Expand Up @@ -545,5 +545,6 @@
"common_unavailable_information": "Information unavailable",
"common_resiliate_contact_support": "To cancel this service, please call our support team on: <strong>0333 370 0425</strong>. Thank you for choosing OVH.",
"core_pcc_top_guide_11_title": "Nutanix official documentation",
"core_pcc_top_guide_12_title": "SAP HANA on Private Cloud official documentation"
"core_pcc_top_guide_12_title": "SAP HANA on Private Cloud official documentation",
"core_pcc_top_guide_13_title": "Authorise IPs to connect to vCenter"
}
Original file line number Diff line number Diff line change
Expand Up @@ -545,5 +545,6 @@
"common_unavailable_information": "InformaciΓ³n no disponible",
"common_resiliate_contact_support": "Para dar de baja este servicio, puede ponerse en contacto con nuestro Soporte en el <strong>91 758 34 77</strong>. Β‘Gracias por su comprensiΓ³n!",
"core_pcc_top_guide_11_title": "DocumentaciΓ³n oficial de Nutanix",
"core_pcc_top_guide_12_title": "DocumentaciΓ³n oficial de SAP HANA on Private Cloud"
"core_pcc_top_guide_12_title": "DocumentaciΓ³n oficial de SAP HANA on Private Cloud",
"core_pcc_top_guide_13_title": "Autorizar las direcciones IP a conectarse al vCenter"
}
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@
"core_pcc_top_guide_10_title": "Documentation officielle de NSX",
"core_pcc_top_guide_11_title": "Documentation officielle de Nutanix",
"core_pcc_top_guide_12_title": "Documentation officielle de SAP HANA on Private Cloud",
"core_pcc_top_guide_13_title": "Autoriser des IP Γ  se connecter au vCenter",
"sso_modal_title": "OVH - Authentification",
"sso_modal_loading": "Chargement...",
"sso_modal_user_title": "Vous Γ©tiez connectΓ© en tant que :",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@
"core_pcc_top_guide_10_title": "Documentation officielle de NSX",
"core_pcc_top_guide_11_title": "Documentation officielle de Nutanix",
"core_pcc_top_guide_12_title": "Documentation officielle de SAP HANA on Private Cloud",
"core_pcc_top_guide_13_title": "Autoriser des IP Γ  se connecter au vCenter",
"sso_modal_title": "OVH - Authentification",
"sso_modal_loading": "Chargement...",
"sso_modal_user_title": "Vous Γ©tiez connectΓ© en tant que :",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -545,5 +545,6 @@
"common_unavailable_information": "Informazione non disponibile",
"common_resiliate_contact_support": "Per disattivare questo servizio, contatta il nostro supporto tecnico al numero <strong>02 5560 0423</strong> o apri un ticket.",
"core_pcc_top_guide_11_title": "Documentazione ufficiale di Nutanix",
"core_pcc_top_guide_12_title": "Documentazione ufficiale di SAP HANA on Private Cloud"
"core_pcc_top_guide_12_title": "Documentazione ufficiale di SAP HANA on Private Cloud",
"core_pcc_top_guide_13_title": "Autorizzare IP a connettersi al vCenter"
}
Original file line number Diff line number Diff line change
Expand Up @@ -545,5 +545,6 @@
"common_unavailable_information": "Informacja niedostΔ™pna",
"common_resiliate_contact_support": "Aby zrezygnować z tej usługi, skontaktuj się z Pomocą techniczną. Zadzwoń na numer: <strong>71 750 02 00</strong> i <strong>wybierz 3.</strong> Dziękujemy za wyrozumiałość.",
"core_pcc_top_guide_11_title": "Oficjalna dokumentacja Nutanix",
"core_pcc_top_guide_12_title": "Oficjalna dokumentacja SAP HANA on Private Cloud"
"core_pcc_top_guide_12_title": "Oficjalna dokumentacja SAP HANA on Private Cloud",
"core_pcc_top_guide_13_title": "Autoryzacja adresów IP, które mogą łączyć się z vCenter"
}
Original file line number Diff line number Diff line change
Expand Up @@ -545,5 +545,6 @@
"common_unavailable_information": "Informação indisponível",
"common_resiliate_contact_support": "Para cancelar este serviço, contacte o nosso apoio ao cliente através do <strong>+351 213 155 642</strong>. Obrigado pela sua compreensão.",
"core_pcc_top_guide_11_title": "Documentação oficial da Nutanix",
"core_pcc_top_guide_12_title": "Documentação oficial do SAP HANA on Private Cloud"
"core_pcc_top_guide_12_title": "Documentação oficial do SAP HANA on Private Cloud",
"core_pcc_top_guide_13_title": "Autorizar endereços IP a ligar-se ao vCenter"
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default class AgoraIpOrderCtrl {
}

getlowestPrice() {
const plans = this.ipCatalog.filter((plan) =>
const plans = this.ipCatalog?.filter((plan) =>
Object.values(IP_FAILOVER_PLANCODE).includes(plan.planCode),
);
plans.forEach(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export default class IpAgoraOrder {
pricingMode = 'default',
quantity = 1,
serviceName,
datacenter,
}) {
const productToOrder = {
configuration,
Expand All @@ -51,6 +52,7 @@ export default class IpAgoraOrder {
productId,
quantity,
serviceName,
datacenter,
};

if (description) {
Expand Down Expand Up @@ -95,6 +97,13 @@ export default class IpAgoraOrder {
});
}

if (datacenter) {
productToOrder.configuration.push({
label: 'datacenter',
value: datacenter,
});
}

return productToOrder;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ export const PRODUCT_TYPES = {
apiTypeName: 'VPS',
typeName: 'VPS',
},
parking: {
apiTypeName: 'parking',
typeName: 'parking',
},
};

export const IP_AGORA = {
Expand Down Expand Up @@ -67,6 +71,56 @@ export const BLOCK_ADDITIONAL_IP = 'Block Additional IP';

export { TRACKING_PREFIX, ADDITIONAL_IP, ALERT_ID, IP_FAILOVER_PLANCODE };

export const DATACENTER_TO_COUNTRY = {
PAR: 'fr',
GRA: 'fr',
SBG: 'fr',
LIM: 'de',
WAW: 'pl',
ERI: 'uk',
VIN: 'us',
HIL: 'us',
BHS: 'ca',
SGP: 'sg',
SYD: 'au',
RBX: 'fr',
YYZ: 'ca',
YNM: 'in',
CR2: 'fr',
};

export const DATACENTER_TO_REGION = {
RBX: 'eu-west-rbx',
GRA: 'eu-west-gra',
SBG: 'eu-west-sbg',
PAR: 'eu-west-par',
CR2: 'labeu-west-1-preprod',
LIM: 'eu-west-lim',
WAW: 'eu-central-waw',
ERI: 'eu-west-eri',
BHS: 'ca-east-bhs',
YYZ: 'ca-east-tor',
SGP: 'ap-southeast-sgp',
SYD: 'ap-southeast-syd',
YNM: 'ap-south-mum',
VIN: 'us-east-vin',
HIL: 'us-west-hil',
};

export const IP_LOCATION_GROUPS_BASED_ON_DATACENTER = [
{
labels: ['APAC/CANADA', 'CANADA - ASIA'],
countries: ['au', 'ca', 'sg', 'in'],
datacenter: ['SYD', 'BHS', 'YYZ', 'YNM', 'SGP'],
},
{
labels: ['EUROPE'],
countries: ['de', 'fr', 'pl', 'uk'],
datacenter: ['RBX', 'GRA', 'LIM', 'CR2', 'PAR', 'SBG', 'WAW', 'ERI'],
},
{ labels: ['USA'], countries: ['us'], datacenter: ['HIL', 'VIN'] },
];

export default {
FETCH_PRICE_MAX_TRIES,
IP_LOCATION_GROUPS,
Expand All @@ -77,4 +131,7 @@ export default {
IP_FAILOVER_PLANCODE,
BLOCK_ADDITIONAL_IP,
ALERT_ID,
DATACENTER_TO_COUNTRY,
DATACENTER_TO_REGION,
IP_LOCATION_GROUPS_BASED_ON_DATACENTER,
};
Loading
Loading