Skip to content

Commit

Permalink
Merge pull request #9871 from ovh/sync/master-develop
Browse files Browse the repository at this point in the history
Sync/master develop
  • Loading branch information
anooparveti authored Aug 22, 2023
2 parents aaa6e07 + 7e20fcc commit ee198ff
Show file tree
Hide file tree
Showing 331 changed files with 4,457 additions and 943 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
dist
node_modules
packages/manager/tools/sao-ovh-manager-module/template/src
packages/manager/tools/sao-ovh-manager-module/template/apiv2/src
packages/manager/tools/sao-ovh-manager-module/template/default/src
packages/manager/tools/sao-ovh-manager-app/template
packages/manager/core/generator/app/templates
packages/components/ovh-shell
Expand Down
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=cobalt-donkey
sonar.projectVersion=hafnium-elk-1

sonar.exclusions=node_modules/**, **/node_modules/**, **/dist/**, **/semantic/**, **/coverage/**
sonar.coverage.exclusions=**/*.spec.js
Expand Down
8 changes: 8 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,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [5.10.4](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-10)

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





## [5.10.3](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-07-24)

**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.10.3",
"version": "5.10.4",
"private": true,
"description": "ATInternet tracking library wrapper for AngularJS",
"keywords": [
Expand Down Expand Up @@ -35,7 +35,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.4.3"
"@ovh-ux/ovh-at-internet": "^0.5.0"
},
"devDependencies": {
"@ovh-ux/component-rollup-config": "^12.0.2"
Expand Down
11 changes: 11 additions & 0 deletions packages/components/ng-ovh-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [14.0.20](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-17)


### Bug Fixes

* **pci:** scroll top at object page init ([#9667](https://github.com/ovh/manager/issues/9667)) ([276137a](https://github.com/ovh/manager/commit/276137adec9fc2d95a708dacc93b0da9add1113a))





## [14.0.19](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-01-19)

**Note:** Version bump only for package @ovh-ux/ng-ovh-utils
Expand Down
2 changes: 1 addition & 1 deletion packages/components/ng-ovh-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ovh-ux/ng-ovh-utils",
"version": "14.0.19",
"version": "14.0.20",
"description": "[DEPRECATED] A collection of directives for AngularJS.",
"keywords": [
"angularjs",
Expand Down
2 changes: 2 additions & 0 deletions packages/components/ng-ovh-utils/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import tooltipBox from './tooltipBox/tooltipBox';
import triStateCheckbox from './triStateCheckbox/triStateCheckbox';
import wizard from './wizard/wizard';
import wizardForm from './wizardForm/wizardForm';
import scroll from './scroll/scroll';

const moduleName = 'ngOvhUtils';

Expand All @@ -43,6 +44,7 @@ angular.module(moduleName, [
poll,
popover,
price,
scroll,
storage,
tooltipBox,
triStateCheckbox,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export default /* @ngInject */ function scrollTopDirective(ScrollService) {
return {
restrict: 'A',
link() {
ScrollService.scrollTop();
},
};
}
36 changes: 36 additions & 0 deletions packages/components/ng-ovh-utils/src/scroll/scroll-service.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/**
* @type service
* @name ovhServices:ScrollService
* @description
* Provide scroll methods
* @example
* # Usage
* <code:js>
* export default class PciStoragesContainersContainerController {
* */ /* @ngInject */ /*
* constructor(ScrollService) {
* this.ScrollService = ScrollService
* }
*
* $onInit() {
* ScrollService.scrollTop();
* };
*};
*
* </code>
*/
export default /* @ngInject */ function scrollService(
$document,
$timeout,
$anchorScroll,
) {
this.scrollTop = function scrollTop() {
$document[0].body.style.setProperty('height', 'auto', 'important');
$document[0].body.style.setProperty('overflow', 'auto');
$anchorScroll();
$timeout(function() {
$document[0].body.style.removeProperty('height');
$document[0].body.style.removeProperty('overflow');
});
};
}
12 changes: 12 additions & 0 deletions packages/components/ng-ovh-utils/src/scroll/scroll.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import angular from 'angular';
import scrollService from './scroll-service';
import scrollTopDirective from './scroll-directive';

const moduleName = 'ua.scroll';

angular
.module(moduleName, ['ui.router'])
.service('ScrollService', scrollService)
.directive('ovhScrollTop', scrollTopDirective);

export default moduleName;
8 changes: 8 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,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.4](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-10)

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





## [0.2.3](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-07-24)

**Note:** Version bump only for package @ovh-ux/ng-shell-tracking
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.2.3",
"version": "0.2.4",
"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-shell-tracking' --include-dependencies -- yarn run dev:watch"
},
"dependencies": {
"@ovh-ux/ovh-at-internet": "^0.4.3"
"@ovh-ux/ovh-at-internet": "^0.5.0"
},
"devDependencies": {
"@ovh-ux/component-rollup-config": "^10.0.0 || ^11.0.0"
Expand Down
11 changes: 11 additions & 0 deletions packages/components/ng-ui-router-breadcrumb/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.2.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-17)


### Features

* fix old generator and add apiv2 generator ([#9844](https://github.com/ovh/manager/issues/9844)) ([60011de](https://github.com/ovh/manager/commit/60011de7ffff69d6ba2f228bd244f9d32b308908))





## [1.1.8](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-01-19)

**Note:** Version bump only for package @ovh-ux/ng-ui-router-breadcrumb
Expand Down
2 changes: 1 addition & 1 deletion packages/components/ng-ui-router-breadcrumb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ovh-ux/ng-ui-router-breadcrumb",
"version": "1.1.8",
"version": "1.2.0",
"description": "Display a breadcrumb based on the UI-Router state declaration.",
"keywords": [
"angularjs",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ export default class BreadcrumbService {
this.breadcrumb = [];

while (state.parent && !hideBreadcrumb) {
const breadcrumbPrefixResolvable = state.resolvables.find(
(resolvable) => resolvable.token === 'breadcrumbPrefix',
);
const breadcrumbResolvable = state.resolvables.find(
(resolvable) => resolvable.token === 'breadcrumb',
);
Expand Down Expand Up @@ -57,6 +60,21 @@ export default class BreadcrumbService {
});
}

if (breadcrumbPrefixResolvable) {
transition
.injector(state.name)
.getAsync('breadcrumbPrefix')
.then((prefixes) => {
prefixes.forEach(({ name, url }, index) =>
this.breadcrumb.splice(index, 0, {
name,
url,
active: false,
}),
);
});
}

state = state.parent.self.$$state();
}

Expand Down
11 changes: 11 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,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.5.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-10)


### Features

* sms marketing consent ([#9797](https://github.com/ovh/manager/issues/9797)) ([5ca7626](https://github.com/ovh/manager/commit/5ca7626097dc31ef1b3565626ebc024cc816a150))





## [0.4.3](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-07-24)

**Note:** Version bump only for package @ovh-ux/ovh-at-internet
Expand Down
2 changes: 1 addition & 1 deletion 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.4.3",
"version": "0.5.0",
"private": true,
"description": "ATInternet tracking library for OVHcloud.",
"keywords": [
Expand Down
3 changes: 3 additions & 0 deletions packages/components/ovh-at-internet/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ export const AT_INTERNET_CUSTOM_PROPS: Record<string, string> = {
pciCreationNumProjects: 'pci_number_of_project',
pciCreationNumProjects3: 'pci_number_of_project',
orderStatus: 'order_status',
accountEmailConsent: 'account_email_consent',
accountSmsConsent: 'account_sms_consent',
accountPhoneType: 'account_phone_type',
};

export const TMS_SCRIPT_URL = 'https://analytics.ovh.com/ovh/ovh_manager.js';
Expand Down
8 changes: 8 additions & 0 deletions packages/components/ovh-shell/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.1.1](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-10)

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





# [2.1.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-07-24)


Expand Down
4 changes: 2 additions & 2 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": "2.1.0",
"version": "2.1.1",
"private": true,
"description": "Communication and interaction between applications",
"repository": {
Expand All @@ -25,7 +25,7 @@
},
"dependencies": {
"@ovh-ux/manager-config": "^7.1.0",
"@ovh-ux/ovh-at-internet": "^0.4.3",
"@ovh-ux/ovh-at-internet": "^0.5.0",
"@ovh-ux/ovh-reket": "^2.0.0",
"@ovh-ux/request-tagger": "^0.1.1",
"@ovh-ux/url-builder": "^1.1.1",
Expand Down
16 changes: 16 additions & 0 deletions packages/manager/apps/carbon-calculator/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.4](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-17)

**Note:** Version bump only for package @ovh-ux/manager-carbon-calculator-app





## [0.1.3](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-10)

**Note:** Version bump only for package @ovh-ux/manager-carbon-calculator-app





## [0.1.2](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-08)


Expand Down
10 changes: 5 additions & 5 deletions packages/manager/apps/carbon-calculator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ovh-ux/manager-carbon-calculator-app",
"version": "0.1.2",
"version": "0.1.4",
"private": true,
"description": "OVHcloud CarbonCalculator app",
"repository": {
Expand All @@ -25,19 +25,19 @@
"@ovh-ux/manager-core": "^12.0.0 || ^13.0.0",
"@ovh-ux/manager-error-page": "^2.3.1",
"@ovh-ux/manager-ng-layout-helpers": "^2.7.0",
"@ovh-ux/ng-at-internet": "^5.10.2",
"@ovh-ux/ng-at-internet": "^5.10.4",
"@ovh-ux/ng-at-internet-ui-router-plugin": "^3.2.3",
"@ovh-ux/ng-ovh-api-wrappers": "^5.0.0",
"@ovh-ux/ng-ovh-feature-flipping": "^1.0.7",
"@ovh-ux/ng-ovh-http": "^5.0.0",
"@ovh-ux/ng-ovh-request-tagger": "^1.1.7",
"@ovh-ux/ng-ovh-sso-auth": "^4.6.3",
"@ovh-ux/ng-ovh-swimming-poll": "^5.0.6",
"@ovh-ux/ng-shell-tracking": "^0.2.1",
"@ovh-ux/ng-shell-tracking": "^0.2.4",
"@ovh-ux/ng-translate-async-loader": "^2.1.5",
"@ovh-ux/ng-ui-router-breadcrumb": "^1.1.7",
"@ovh-ux/ng-ui-router-breadcrumb": "^1.2.0",
"@ovh-ux/request-tagger": "^0.1.1",
"@ovh-ux/shell": "^2.0.0",
"@ovh-ux/shell": "^2.1.1",
"@ovh-ux/ui-kit": "^6.3.0",
"@uirouter/angularjs": "^1.0.23",
"angular": "^1.7.5",
Expand Down
16 changes: 16 additions & 0 deletions packages/manager/apps/cda/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.7.18](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-17)

**Note:** Version bump only for package @ovh-ux/manager-cda-app





## [1.7.17](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-10)

**Note:** Version bump only for package @ovh-ux/manager-cda-app





## [1.7.16](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-01)

**Note:** Version bump only for package @ovh-ux/manager-cda-app
Expand Down
Loading

0 comments on commit ee198ff

Please sign in to comment.