Skip to content

Commit c47c212

Browse files
Merge branch 'develop' into M3-9591
2 parents 78fe6ce + d44ac32 commit c47c212

152 files changed

Lines changed: 1192 additions & 490 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

packages/api-v4/src/cloudpulse/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export type DimensionFilterOperatorType =
99
| 'startswith'
1010
| 'endswith';
1111
export type AlertDefinitionType = 'system' | 'user';
12-
export type AlertStatusType = 'enabled' | 'disabled';
12+
export type AlertStatusType = 'enabled' | 'disabled' | 'in progress' | 'failed';
1313
export type CriteriaConditionType = 'ALL';
1414
export type MetricUnitType =
1515
| 'number'
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Removed
3+
---
4+
5+
Migrate Drawer to ui package ([#11789](https://github.com/linode/manager/pull/11789))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Removed
3+
---
4+
5+
Moved the entire `sort-by.ts` (excluding sortByUTFDate) to `utilities` package ([#11846](https://github.com/linode/manager/pull/11846))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@linode/manager': Tests
3+
---
4+
5+
Add unit tests for `sortByUTFDate` utility ([#11846](https://github.com/linode/manager/pull/11846))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Removed
3+
---
4+
5+
Migrate hooks from `manager` to `utilities` package ([#11850](https://github.com/linode/manager/pull/11850))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Upcoming Features
3+
---
4+
5+
Restrict enable/disable actions in alerts action menu based on alert status at `AlertsActionMenu.ts` ([#11860](https://github.com/linode/manager/pull/11860))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Tests
3+
---
4+
5+
Fix VPC test failures when factory default region does not exist ([#11862](https://github.com/linode/manager/pull/11862))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Tests
3+
---
4+
5+
Fix Google Pay test failures when using Braintree sandbox environment ([#11863](https://github.com/linode/manager/pull/11863))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Fixed
3+
---
4+
5+
Navigation for metrics and alerts under Monitor at `PrimaryNav.tsx` ([#11869](https://github.com/linode/manager/pull/11869))

packages/manager/cypress/e2e/core/billing/google-pay.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ const mockPaymentMethodsExpired: PaymentMethod[] = [
5252
];
5353

5454
const pastDueExpiry = 'Expired 07/20';
55-
const braintreeURL = 'https://client-analytics.braintreegateway.com/*';
55+
const braintreeURL =
56+
'https://+(payments.braintree-api.com|payments.sandbox.braintree-api.com)/*';
5657

5758
describe('Google Pay', () => {
5859
it('adds google pay method', () => {

0 commit comments

Comments
 (0)