Added changeset: New quota properties

Author: dchyrva-akamai

packages/api-v4/.changeset/pr-13177-added-1769180577836.md

@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Added
+---
+
+New quota properties ([#13177](https://github.com/linode/manager/pull/13177))

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

@@ -20,7 +20,7 @@ export interface Quota {
   /**
    * Sets usage column to be n/a when value is false.
    */
-  has_usage: boolean;
+  has_usage?: boolean;
 
   /**
    * A unique identifier for the quota.

packages/manager/cypress/e2e/core/account/quotas-storage.spec.ts

@@ -60,6 +60,7 @@ describe('Quota workflow tests', () => {
     const mockQuotas = [
       quotaFactory.build({
         quota_id: `obj-bytes-${selectedDomain}`,
+        quota_type: 'obj-bytes',
         description: randomLabel(50),
         endpoint_type: mockSelectedEndpoint.endpoint_type,
         quota_limit: 10,
@@ -69,6 +70,7 @@ describe('Quota workflow tests', () => {
       }),
       quotaFactory.build({
         quota_id: `obj-buckets-${selectedDomain}`,
+        quota_type: 'obj-buckets',
         description: randomLabel(50),
         endpoint_type: mockSelectedEndpoint.endpoint_type,
         quota_limit: 78,
@@ -78,6 +80,7 @@ describe('Quota workflow tests', () => {
       }),
       quotaFactory.build({
         quota_id: `obj-objects-${selectedDomain}`,
+        quota_type: 'obj-objects',
         description: randomLabel(50),
         endpoint_type: mockSelectedEndpoint.endpoint_type,
         quota_limit: 400,
@@ -134,25 +137,32 @@ describe('Quota workflow tests', () => {
         },
       }).as('getFeatureFlags');
     });
+
     it('Quotas and quota usages display properly', function () {
-      cy.visitWithLogin('/account/quotas');
+      cy.visitWithLogin('/quotas');
+
       cy.wait(['@getFeatureFlags', '@getObjectStorageEndpoints']);
+
       // Quotas table placeholder text is shown
       cy.get('[data-testid="table-row-empty"]').should('be.visible');
 
       // Object Storage Endpoint field is blank
       cy.findByPlaceholderText(placeholderText)
         .should('be.visible')
         .should('be.enabled');
+
       ui.autocomplete
         .findByLabel('Object Storage Endpoint')
         .should('be.visible')
         .type(this.selectedDomain);
+
       ui.autocompletePopper
         .findByTitle(this.selectedDomain, { exact: false })
         .should('be.visible')
         .click();
+
       cy.wait(['@getQuotas', '@getQuotaUsages']);
+
       cy.get('table[data-testid="table-endpoint-quotas"]')
         .find('tbody')
         .within(() => {
@@ -200,6 +210,7 @@ describe('Quota workflow tests', () => {
       const updatedQuotas = [
         quotaFactory.build({
           quota_id: `obj-bytes-${updatedDomain}`,
+          quota_type: 'obj-bytes',
           description: randomLabel(50),
           endpoint_type: updatedEndpoint.endpoint_type,
           quota_limit: 20,
@@ -209,6 +220,7 @@ describe('Quota workflow tests', () => {
         }),
         quotaFactory.build({
           quota_id: `obj-buckets-${updatedDomain}`,
+          quota_type: 'obj-buckets',
           description: randomLabel(50),
           endpoint_type: updatedEndpoint.endpoint_type,
           quota_limit: 122,
@@ -218,6 +230,7 @@ describe('Quota workflow tests', () => {
         }),
         quotaFactory.build({
           quota_id: `obj-objects-${updatedDomain}`,
+          quota_type: 'obj-objects',
           description: randomLabel(50),
           endpoint_type: updatedEndpoint.endpoint_type,
           quota_limit: 450,

packages/manager/src/features/Account/Quotas/Quotas.test.tsx

@@ -9,6 +9,7 @@ import { Quotas } from './Quotas';
 
 const queryMocks = vi.hoisted(() => ({
   getQuotasFilters: vi.fn().mockReturnValue({}),
+  getQuotaVisibilityFilter: vi.fn().mockReturnValue({}),
   useFlags: vi.fn().mockReturnValue({}),
   useGetLocationsForQuotaService: vi.fn().mockReturnValue({}),
   useObjectStorageEndpoints: vi.fn().mockReturnValue({}),
@@ -34,6 +35,7 @@ vi.mock('@linode/queries', async () => {
 
 vi.mock('./utils', () => ({
   getQuotasFilters: queryMocks.getQuotasFilters,
+  getQuotaVisibilityFilter: queryMocks.getQuotaVisibilityFilter,
   useGetLocationsForQuotaService: queryMocks.useGetLocationsForQuotaService,
   convertResourceMetric: queryMocks.convertResourceMetric,
   pluralizeMetric: queryMocks.pluralizeMetric,

packages/manager/src/features/Account/Quotas/QuotasTable.tsx

@@ -74,7 +74,9 @@ export const QuotasTable = (props: QuotasTableProps) => {
   // This will only fetch for the paginated set
   const quotaIdsHavingUsage =
     quotas?.data
-      .filter((quota) => quota.has_usage)
+      .filter(
+        (quota) => quota.has_usage === true || quota.has_usage === undefined
+      )
       .map((quota) => quota.quota_id) ?? [];
   const quotaUsageQueries = useQueries({
     queries: quotaIdsHavingUsage.map((quotaId) =>
@@ -152,7 +154,9 @@ export const QuotasTable = (props: QuotasTableProps) => {
             filteredQuotasWithUsage.map((quota, index) => {
               return (
                 <QuotasTableRow
-                  hasUsage={quota.has_usage}
+                  hasUsage={
+                    quota.has_usage === true || quota.has_usage === undefined
+                  }
                   index={index}
                   isDataPresent={quota.usage?.usage !== null}
                   key={quota.quota_id}