Merge pull request #154 from sapcc/forbid_autogrowth_fix

restrict forbid autogrowth setting to committable resources

Author: VoigtS

.changeset/grumpy-numbers-love.md

@@ -0,0 +1,5 @@
+---
+"@sapcc/limes-ui": patch
+---
+
+restrict forbid autogrowth setting to committable resources

src/components/mainView/Resource.js

@@ -21,7 +21,7 @@ import { CustomZones, PanelType } from "../../lib/constants";
 import { Button, Stack } from "@cloudoperators/juno-ui-components";
 import { Link } from "react-router";
 import { ProjectBadges } from "../shared/LimesBadges";
-import { isAZUnaware } from "../../lib/utils";
+import { isAZUnaware, getResourceDurations } from "../../lib/utils";
 import ResourceBarBuilder from "../resourceBar/ResourceBarBuilder";
 import useResetCommitment from "../../hooks/useResetCommitment";
 import HistoricalUsage from "./subComponents/HistoricalUsage";
@@ -93,6 +93,7 @@ const Resource = (props) => {
     tracksQuota,
   } = props;
   const { unit: unitName, editableResource } = resource;
+  const isCommittable = getResourceDurations(resource).length > 0 ? true : false;
   const { scope } = globalStore();
   const displayName = t(resource.name);
   const { isEditing } = createCommitmentStore();
@@ -170,7 +171,7 @@ const Resource = (props) => {
           {isAZUnaware(props.resource.per_az) && (
             <ProjectBadges az={props.resource.per_az[0]} unit={unitName} displayValues={true} />
           )}
-          {scope.isProject() && editableResource && <ForbidAutogrowth {...forbidAutogrowthForwardProps} />}
+          {scope.isProject() && isCommittable && <ForbidAutogrowth {...forbidAutogrowthForwardProps} />}
         </Stack>
       )}
       <ResourceBarBuilder

src/components/mainView/Resource.test.js

@@ -45,6 +45,9 @@ describe("Resource tests", () => {
       commitmentSum: 10,
       editableResource: true,
       per_az: [["az1", { projects_usage: 10 }]],
+      commitment_config: {
+        durations: ["1 year"],
+      },
     };
     let forwardProps = {
       area: "testArea",
@@ -64,7 +67,7 @@ describe("Resource tests", () => {
         </StoreProvider>
       </PortalProvider>
     );
-    const { result } = await waitFor(() => {
+    const { rerender, result } = await waitFor(() => {
       return renderHook(
         () => ({
           globalStore: globalStore(),
@@ -73,18 +76,24 @@ describe("Resource tests", () => {
         { wrapper }
       );
     });
-
-    // Project level
+    // The forbidAutogrowth edit option is available at the project level.
     act(() => {
       result.current.globalStoreActions.setScope(scope);
     });
-    // The forbidAutogrowthSwitch edit option is available for project level.
+    expect(screen.queryByTestId("forbidAutogrowthSwitch")).toBeInTheDocument();
+    expect(screen.getByTestId("edit/testResource")).toBeInTheDocument();
+    expect(screen.queryByTestId("setMaxQuotaPanel")).not.toBeInTheDocument();
+
+    // The forbidAutogrowth edit option is only available for committable resources.
+    delete res.commitment_config;
+    rerender();
     act(() => {
       result.current.globalStoreActions.setScope(scope);
     });
-    expect(screen.queryByTestId("forbidAutogrowthSwitch")).toBeInTheDocument();
+    expect(screen.queryByTestId("forbidAutogrowthSwitch")).not.toBeInTheDocument();
     expect(screen.getByTestId("edit/testResource")).toBeInTheDocument();
     expect(screen.queryByTestId("setMaxQuotaPanel")).not.toBeInTheDocument();
+    res.commitment_config = { durations: ["1 year"] };
 
     // Domain level allows setting Max-Quota.
     scope = new Scope({ domainID: "456" });

src/components/project/ProjectQuotaDetails.js

@@ -53,10 +53,10 @@ const ProjectQuotaDetails = (props) => {
             <ToolTipWrapper
               trigger={<Icon data-testid="forbidAutogrowthInfo" icon="warning" size="18" />}
               content={
-                <div>
-                  <div>Pay-As-You-Go is disabled on project level.</div>
-                  <div>This setting is more restrictive than Max-Quota.</div>
-                </div>
+                <span>
+                  Pay-As-You-Go is disabled on project level. <br />
+                  This setting is more restrictive than Max-Quota.
+                </span>
               }
             />
           )}