Skip to content

Commit

Permalink
Merge pull request #11217 from ovh/sync/master-develop
Browse files Browse the repository at this point in the history
Sync/master develop
  • Loading branch information
anooparveti authored Mar 18, 2024
2 parents b43344b + 2c92b74 commit 92cd40a
Show file tree
Hide file tree
Showing 496 changed files with 11,002 additions and 3,479 deletions.
2 changes: 1 addition & 1 deletion .sonarcloud.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sonar.projectName=manager
sonar.sources=.
sonar.sourceEncoding=UTF-8
sonar.ws.timeout=60
sonar.projectVersion=tellurium-gnu-2
sonar.projectVersion=mercury-cheetah-2

sonar.exclusions=node_modules/**, **/node_modules/**, **/dist/**, **/semantic/**, **/coverage/**, **/static/**
sonar.coverage.exclusions=**/*.spec.js
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module.exports = {
'^.+\\.module\\.(css|sass|scss)$',
'<rootDir>/node_modules/(?!lodash-es|@stencil)',
],
testPathIgnorePatterns: ['/node_modules/', '/apps/pci-vouchers/'],
moduleNameMapper: {
'^.+\\.module\\.(css|sass|scss)$': 'identity-obj-proxy',
'.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$':
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"start": "node -r esm scripts/start-application.js",
"test:jest": "jest --runInBand",
"test": "yarn lint",
"test:turbo": "turbo run test",
"test:scripts": "make test",
"test:playwright:run": "lerna run test:e2e:script --concurrency 1"
},
Expand Down
32 changes: 32 additions & 0 deletions packages/components/ng-at-internet/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,38 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [5.11.7](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-13)

**Note:** Version bump only for package @ovh-ux/ng-at-internet





## [5.11.6](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-11)

**Note:** Version bump only for package @ovh-ux/ng-at-internet





## [5.11.5](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-07)

**Note:** Version bump only for package @ovh-ux/ng-at-internet





## [5.11.4](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-07)

**Note:** Version bump only for package @ovh-ux/ng-at-internet





## [5.11.3](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-02-21)

**Note:** Version bump only for package @ovh-ux/ng-at-internet
Expand Down
4 changes: 2 additions & 2 deletions packages/components/ng-at-internet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ovh-ux/ng-at-internet",
"version": "5.11.3",
"version": "5.11.7",
"private": true,
"description": "ATInternet tracking library wrapper for AngularJS",
"keywords": [
Expand Down Expand Up @@ -36,7 +36,7 @@
"start:watch": "lerna exec --stream --parallel --scope='@ovh-ux/ng-at-internet' --include-dependencies -- yarn run dev:watch"
},
"dependencies": {
"@ovh-ux/ovh-at-internet": "^0.10.0"
"@ovh-ux/ovh-at-internet": "^0.12.0"
},
"devDependencies": {
"@ovh-ux/component-rollup-config": "^13.0.1"
Expand Down
32 changes: 32 additions & 0 deletions packages/components/ng-shell-tracking/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,38 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.5.4](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-13)

**Note:** Version bump only for package @ovh-ux/ng-shell-tracking





## [0.5.3](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-11)

**Note:** Version bump only for package @ovh-ux/ng-shell-tracking





## [0.5.2](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-07)

**Note:** Version bump only for package @ovh-ux/ng-shell-tracking





## [0.5.1](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-07)

**Note:** Version bump only for package @ovh-ux/ng-shell-tracking





# [0.5.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-02-21)


Expand Down
4 changes: 2 additions & 2 deletions packages/components/ng-shell-tracking/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ovh-ux/ng-shell-tracking",
"version": "0.5.0",
"version": "0.5.4",
"private": true,
"description": "ATInternet tracking library wrapper for AngularJS",
"keywords": [
Expand Down Expand Up @@ -37,7 +37,7 @@
"start:watch": "lerna exec --stream --parallel --scope='@ovh-ux/ng-shell-tracking' --include-dependencies -- yarn run dev:watch"
},
"dependencies": {
"@ovh-ux/ovh-at-internet": "^0.10.0"
"@ovh-ux/ovh-at-internet": "^0.12.0"
},
"devDependencies": {
"@ovh-ux/component-rollup-config": "^13.0.1"
Expand Down
41 changes: 41 additions & 0 deletions packages/components/ovh-at-internet/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,47 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.12.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-13)


### Features

* pci vouchers app in reactjs ([d6821ce](https://github.com/ovh/manager/commit/d6821cecd3bde7d884054d8e782e9a1e9dbfddac))





## [0.11.2](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-11)

**Note:** Version bump only for package @ovh-ux/ovh-at-internet





## [0.11.1](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-07)


### Reverts

* Revert "feat(*): pci vouchers app in reactjs" ([b62c1a8](https://github.com/ovh/manager/commit/b62c1a8b1cfe63dbc420b660667209c324ffa9ab))





# [0.11.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-07)


### Features

* pci vouchers app in reactjs ([ad08ee4](https://github.com/ovh/manager/commit/ad08ee4618d6243328eee76af7d1bd459a1a7d83))





# [0.10.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-02-21)


Expand Down
4 changes: 2 additions & 2 deletions packages/components/ovh-at-internet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ovh-ux/ovh-at-internet",
"version": "0.10.0",
"version": "0.12.0",
"private": true,
"description": "ATInternet tracking library for OVHcloud.",
"keywords": [
Expand Down Expand Up @@ -35,7 +35,7 @@
"start:watch": "lerna exec --stream --parallel --scope='@ovh-ux/manager-config' --include-dependencies -- yarn run dev:watch"
},
"dependencies": {
"@ovh-ux/manager-config": "^7.3.0",
"@ovh-ux/manager-config": "^7.3.1",
"@types/lodash-es": "^4.17.5",
"lodash-es": "^4.17.15"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/ovh-at-internet/src/track.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export interface LegacyTrackingData {
chapter1?: string;
chapter2?: string;
chapter3?: string;
level2: string;
level2?: string;
page?: any;
[key: string]: any;
}
Expand Down
41 changes: 41 additions & 0 deletions packages/components/ovh-shell/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,47 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.4.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-13)


### Features

* pci vouchers app in reactjs ([d6821ce](https://github.com/ovh/manager/commit/d6821cecd3bde7d884054d8e782e9a1e9dbfddac))





## [3.3.2](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-11)

**Note:** Version bump only for package @ovh-ux/shell





## [3.3.1](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-07)


### Reverts

* Revert "feat(*): pci vouchers app in reactjs" ([b62c1a8](https://github.com/ovh/manager/commit/b62c1a8b1cfe63dbc420b660667209c324ffa9ab))





# [3.3.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-03-07)


### Features

* pci vouchers app in reactjs ([ad08ee4](https://github.com/ovh/manager/commit/ad08ee4618d6243328eee76af7d1bd459a1a7d83))





# [3.2.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2024-02-28)


Expand Down
8 changes: 4 additions & 4 deletions packages/components/ovh-shell/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ovh-ux/shell",
"version": "3.2.0",
"version": "3.4.0",
"private": true,
"description": "Communication and interaction between applications",
"repository": {
Expand All @@ -23,10 +23,10 @@
"start:watch": "lerna exec --stream --parallel --scope='@ovh-ux/shell' --include-dependencies -- npm run dev:watch --if-present"
},
"dependencies": {
"@ovh-ux/manager-config": "^7.3.0",
"@ovh-ux/ovh-at-internet": "^0.10.0",
"@ovh-ux/manager-config": "^7.3.1",
"@ovh-ux/ovh-at-internet": "^0.12.0",
"@ovh-ux/ovh-reket": "^2.1.1",
"@ovh-ux/request-tagger": "^0.1.1",
"@ovh-ux/request-tagger": "^0.2.0",
"@ovh-ux/url-builder": "^1.1.1",
"@types/react": "^18.0.0",
"dompurify": "^2.3.3",
Expand Down
7 changes: 5 additions & 2 deletions packages/components/ovh-shell/src/client/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { getHeaders } from '@ovh-ux/request-tagger';
import ShellClient from './shell-client';
import StandaloneShellClient from './standalone-shell-client';
import IFrameMessageBus from '../message-bus/iframe';
import { ShellClientApi } from './api';

function fetchApplications(): Promise<Record<string, Application>> {
return useReket(true).get('/applications', {
Expand Down Expand Up @@ -89,7 +90,9 @@ export function initStandaloneClientApi(
return client.init().then(() => client.getApi());
}

export default function init(applicationId: ApplicationId) {
export default async function init(
applicationId: ApplicationId,
): Promise<ShellClientApi> {
let initPromise;

if (isTopLevelApplication()) {
Expand All @@ -100,7 +103,7 @@ export default function init(applicationId: ApplicationId) {
initPromise = initIFrameClientApi(applicationId);
}

return initPromise.then((shellApi) => {
return initPromise.then(async (shellApi) => {
shellApi.ux.resetAccountSidebar();
return shellApi.environment
.setApplication(applicationId)
Expand Down
2 changes: 1 addition & 1 deletion packages/manager-components/.storybook/i18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import i18n from 'i18next';
import { initReactI18next } from 'react-i18next';

i18n.use(initReactI18next).init({
fallbackLng: 'fr-FR',
fallbackLng: 'fr_FR',
interpolation: {
escapeValue: false,
},
Expand Down
21 changes: 13 additions & 8 deletions packages/manager-components/.storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import React, { Suspense, useEffect } from 'react';
import { I18nextProvider } from 'react-i18next';
import { odsSetup } from '@ovhcloud/ods-common-core';

import { Preview } from '@storybook/react';
import '../src/tailwind/theme.css';
import '@ovhcloud/ods-theme-blue-jeans/dist/index.css';
import i18n from './i18n';

import '@ovhcloud/ods-theme-blue-jeans';

odsSetup();

const preview: Preview = {
parameters: {
actions: { argTypesRegex: '^on[A-Z].*' },
Expand Down Expand Up @@ -44,14 +49,14 @@ export const globalTypes = {
toolbar: {
icon: 'globe',
items: [
{ value: 'fr-FR', title: 'Francais' },
{ value: 'en-GB', title: 'English' },
{ value: 'de-DE', title: 'Deutsch' },
{ value: 'es-ES', title: 'Espagne' },
{ value: 'it-IT', title: 'Italy' },
{ value: 'pt-PT', title: 'Portugal' },
{ value: 'pl-PL', title: 'Poland' },
{ value: 'fr-CA', title: 'Canada' },
{ value: 'fr_FR', title: 'Francais' },
{ value: 'en_GB', title: 'English' },
{ value: 'de_DE', title: 'Deutsch' },
{ value: 'es_ES', title: 'Espagne' },
{ value: 'it_IT', title: 'Italy' },
{ value: 'pt_PT', title: 'Portugal' },
{ value: 'pl_PL', title: 'Poland' },
{ value: 'fr_CA', title: 'Canada' },
],
showName: true,
},
Expand Down
18 changes: 18 additions & 0 deletions packages/manager-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.5.0](https://github.com/ovh/manager/compare/@ovhcloud/[email protected]...@ovhcloud/[email protected]) (2024-03-13)

### Features

- pci vouchers app in reactjs ([d6821ce](https://github.com/ovh/manager/commit/d6821cecd3bde7d884054d8e782e9a1e9dbfddac))

## [1.4.1](https://github.com/ovh/manager/compare/@ovhcloud/[email protected]...@ovhcloud/[email protected]) (2024-03-07)

### Reverts

- Revert "feat(\*): pci vouchers app in reactjs" ([b62c1a8](https://github.com/ovh/manager/commit/b62c1a8b1cfe63dbc420b660667209c324ffa9ab))

# [1.4.0](https://github.com/ovh/manager/compare/@ovhcloud/[email protected]...@ovhcloud/[email protected]) (2024-03-07)

### Features

- pci vouchers app in reactjs ([ad08ee4](https://github.com/ovh/manager/commit/ad08ee4618d6243328eee76af7d1bd459a1a7d83))

# [1.3.0](https://github.com/ovh/manager/compare/@ovhcloud/[email protected]...@ovhcloud/[email protected]) (2024-02-28)

### Features
Expand Down
4 changes: 2 additions & 2 deletions packages/manager-components/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module.exports = {
testMatch: ['<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}'],
testEnvironment: 'jsdom',
transformIgnorePatterns: [
'node_modules/(?!lodash-es|@ovh-ux|@ovhcloud|@stencil)',
],
setupFilesAfterEnv: ['./jest.setup.ts'],
collectCoverageFrom: ['src/components/**/**.component.tsx'],
collectCoverageFrom: ['src/components/**/*.component.tsx'],
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
testMatch: ['<rootDir>/src/components/**/**/*.spec.tsx'],
moduleNameMapper: {
'.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$':
'<rootDir>/src/_mock_/images.tsx',
Expand Down
Loading

0 comments on commit 92cd40a

Please sign in to comment.