Skip to content

Commit b2ffffc

Browse files
new: STORIF-181 - Bucket metrics page created. (#13161)
* ref: STORIF-181 - BucketDetails folder cleanup. * new: STORIF-181 - Bucket metrics page created.
1 parent 9533b08 commit b2ffffc

29 files changed

+129
-170
lines changed

packages/manager/cypress/e2e/core/objectStorage/object-storage-errors.spec.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
import 'cypress-file-upload';
66
import {
77
mockGetBucketObjects,
8+
mockGetBuckets,
89
mockUploadBucketObject,
910
} from 'support/intercepts/object-storage';
1011
import { makeError } from 'support/util/errors';
1112
import { randomItem, randomLabel, randomString } from 'support/util/random';
1213

14+
import { objectStorageBucketFactory } from 'src/factories';
15+
1316
describe('object storage failure paths', () => {
1417
/*
1518
* - Tests error UI when an object upload fails.
@@ -19,6 +22,12 @@ describe('object storage failure paths', () => {
1922
it('shows error upon object upload failure', () => {
2023
const bucketLabel = randomLabel();
2124
const bucketCluster = 'us-southeast-1';
25+
const bucketMock = objectStorageBucketFactory.build({
26+
cluster: bucketCluster,
27+
hostname: `${bucketLabel}.${bucketCluster}.linodeobjects.com`,
28+
label: bucketLabel,
29+
objects: 0,
30+
});
2231
const bucketFile = randomItem([
2332
'object-storage-files/1.txt',
2433
'object-storage-files/2.jpg',
@@ -29,6 +38,7 @@ describe('object storage failure paths', () => {
2938
const bucketFilename = bucketFile.split('/')[1];
3039

3140
// Mock empty object list and failed object-url upload request.
41+
mockGetBuckets([bucketMock]).as('getBuckets');
3242
mockGetBucketObjects(bucketLabel, bucketCluster, []).as('getBucketObjects');
3343
mockUploadBucketObject(
3444
bucketLabel,
@@ -73,7 +83,14 @@ describe('object storage failure paths', () => {
7383
it('shows error upon object list retrieval failure', () => {
7484
const bucketLabel = randomLabel();
7585
const bucketCluster = 'us-southeast-1';
86+
const bucketMock = objectStorageBucketFactory.build({
87+
cluster: bucketCluster,
88+
hostname: `${bucketLabel}.${bucketCluster}.linodeobjects.com`,
89+
label: bucketLabel,
90+
objects: 0,
91+
});
7692

93+
mockGetBuckets([bucketMock]).as('getBuckets');
7794
mockGetBucketObjects(
7895
bucketLabel,
7996
bucketCluster,

packages/manager/cypress/e2e/core/objectStorage/object-storage.smoke.spec.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,27 @@ describe('object storage smoke tests', () => {
8888
it('can upload, view, and delete bucket objects - smoke', () => {
8989
const bucketLabel = randomLabel();
9090
const bucketCluster = 'us-southeast-1';
91+
const bucketMock = objectStorageBucketFactory.build({
92+
cluster: bucketCluster,
93+
hostname: `${bucketLabel}.${bucketCluster}.linodeobjects.com`,
94+
label: bucketLabel,
95+
objects: 0,
96+
});
97+
9198
const bucketContents = [
9299
'object-storage-files/1.txt',
93100
'object-storage-files/2.jpg',
94101
'object-storage-files/3.jpg',
95102
'object-storage-files/4.zip',
96103
];
97104

105+
mockGetBuckets([bucketMock]).as('getBuckets');
98106
mockGetBucketObjects(bucketLabel, bucketCluster, []).as('getBucketObjects');
99107

100108
cy.visitWithLogin(
101109
`/object-storage/buckets/${bucketCluster}/${bucketLabel}`
102110
);
111+
cy.wait('@getBuckets');
103112
cy.wait('@getBucketObjects');
104113

105114
cy.log('Upload bucket objects');

packages/manager/cypress/e2e/core/objectStorageMulticluster/bucket-details-multicluster.spec.ts

Lines changed: 0 additions & 64 deletions
This file was deleted.

packages/manager/src/features/ObjectStorage/BucketDetail/AccessSelect.data.tsx renamed to packages/manager/src/features/ObjectStorage/BucketDetail/AccessTab/AccessSelect.data.tsx

File renamed without changes.

packages/manager/src/features/ObjectStorage/BucketDetail/AccessSelect.test.tsx renamed to packages/manager/src/features/ObjectStorage/BucketDetail/AccessTab/AccessSelect.test.tsx

File renamed without changes.

packages/manager/src/features/ObjectStorage/BucketDetail/AccessSelect.tsx renamed to packages/manager/src/features/ObjectStorage/BucketDetail/AccessTab/AccessSelect.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from 'src/queries/object-storage/queries';
2121
import { getErrorStringOrDefault } from 'src/utilities/errorUtils';
2222

23-
import { bucketACLOptions, objectACLOptions } from '../utilities';
23+
import { bucketACLOptions, objectACLOptions } from '../../utilities';
2424
import { copy } from './AccessSelect.data';
2525

2626
import type {

packages/manager/src/features/ObjectStorage/BucketDetail/BucketAccess.tsx renamed to packages/manager/src/features/ObjectStorage/BucketDetail/AccessTab/BucketAccess.tsx

File renamed without changes.

packages/manager/src/features/ObjectStorage/BucketDetail/BucketProperties.styles.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

packages/manager/src/features/ObjectStorage/BucketDetail/BucketProperties.tsx

Lines changed: 0 additions & 49 deletions
This file was deleted.

packages/manager/src/features/ObjectStorage/BucketDetail/BucketSSL.test.tsx renamed to packages/manager/src/features/ObjectStorage/BucketDetail/CertificatesTab/BucketSSL.test.tsx

File renamed without changes.

0 commit comments

Comments
 (0)