Fixes for carvel repo UI (#5248)

* Disable scope field when editing

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Move exported enums

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Disable inline in carvel

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Make getSupportedPackageRepositoryAuthTypes type-aware

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Rename css class

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Rename some conditions

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Fix typos

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Reword golang duration msg

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Disable rest of advanced params in carvel plugin

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Fix test

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Reset auth type if unsupported

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Fix test case

Signed-off-by: Antonio Gamez Diaz <[email protected]>

* Fix linter issue

Signed-off-by: Antonio Gamez Diaz <[email protected]>

Signed-off-by: Antonio Gamez Diaz <[email protected]>

Author: antgamdia

cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils.go

@@ -146,7 +146,7 @@ func buildPackageIdentifier(pkgMetadata *datapackagingv1alpha1.PackageMetadata)
 }
 
 // getRepoNameFromAnnotation gets the repo name from a string with the format "namespace/repoName",
-// for instance "default/tce-repo", and retuns just the "repoName" part, e.g., "tce-repo"
+// for instance "default/tce-repo", and returns just the "repoName" part, e.g., "tce-repo"
 func getRepoNameFromAnnotation(repoRefAnnotation string) string {
 	// falling back to a "default" repo name if using kapp controller < v0.36.1
 	// See https://github.com/vmware-tanzu/carvel-kapp-controller/pull/532

cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils_test.go

@@ -895,7 +895,7 @@ func TestFilterMetadatas(t *testing.T) {
 			},
 		},
 		{
-			name: "does not match if metadata has an unkown repo",
+			name: "does not match if metadata has an unknown repo",
 			metadatas: []*datapackagingv1alpha1.PackageMetadata{
 				{
 					ObjectMeta: metav1.ObjectMeta{

dashboard/src/actions/installedpackages.test.tsx

@@ -15,8 +15,7 @@ import {
 import { Plugin } from "gen/kubeappsapis/core/plugins/v1alpha1/plugins";
 import { InstalledPackage } from "shared/InstalledPackage";
 import { getStore, initialState } from "shared/specs/mountWrapper";
-import { IStoreState, UnprocessableEntity, UpgradeError } from "shared/types";
-import { PluginNames } from "shared/utils";
+import { IStoreState, PluginNames, UnprocessableEntity, UpgradeError } from "shared/types";
 import { getType } from "typesafe-actions";
 import actions from ".";
 

dashboard/src/actions/repos.test.tsx

@@ -24,8 +24,13 @@ import thunk from "redux-thunk";
 import { PackageRepositoriesService } from "shared/PackageRepositoriesService";
 import PackagesService from "shared/PackagesService";
 import { initialState } from "shared/specs/mountWrapper";
-import { IPkgRepoFormData, IStoreState, NotFoundError, RepositoryStorageTypes } from "shared/types";
-import { PluginNames } from "shared/utils";
+import {
+  IPkgRepoFormData,
+  IStoreState,
+  NotFoundError,
+  PluginNames,
+  RepositoryStorageTypes,
+} from "shared/types";
 import { getType } from "typesafe-actions";
 import actions from ".";
 import { convertPkgRepoDetailToSummary } from "./repos";

dashboard/src/components/AppUpgrade/AppUpgrade.test.tsx

@@ -30,9 +30,9 @@ import {
   IInstalledPackageState,
   IPackageState,
   IStoreState,
+  PluginNames,
   UpgradeError,
 } from "shared/types";
-import { PluginNames } from "shared/utils";
 import SelectRepoForm from "../SelectRepoForm/SelectRepoForm";
 import UpgradeForm from "../UpgradeForm/UpgradeForm";
 import AppUpgrade from "./AppUpgrade";

dashboard/src/components/AppView/AppView.test.tsx

@@ -28,8 +28,13 @@ import { IConfigState } from "reducers/config";
 import { InstalledPackage } from "shared/InstalledPackage";
 import PackagesService from "shared/PackagesService";
 import { getStore, mountWrapper } from "shared/specs/mountWrapper";
-import { DeleteError, FetchError, IInstalledPackageState, IStoreState } from "shared/types";
-import { PluginNames } from "shared/utils";
+import {
+  DeleteError,
+  FetchError,
+  IInstalledPackageState,
+  IStoreState,
+  PluginNames,
+} from "shared/types";
 import { getType } from "typesafe-actions";
 import AccessURLTable from "./AccessURLTable/AccessURLTable";
 import DeleteButton from "./AppControls/DeleteButton/DeleteButton";

dashboard/src/components/Catalog/CatalogItems.test.tsx

@@ -5,8 +5,7 @@ import InfoCard from "components/InfoCard";
 import { AvailablePackageSummary, Context } from "gen/kubeappsapis/core/packages/v1alpha1/packages";
 import { Plugin } from "gen/kubeappsapis/core/plugins/v1alpha1/plugins";
 import { defaultStore, mountWrapper } from "shared/specs/mountWrapper";
-import { IClusterServiceVersion } from "shared/types";
-import { PluginNames } from "shared/utils";
+import { IClusterServiceVersion, PluginNames } from "shared/types";
 import CatalogItem from "./CatalogItem";
 import CatalogItems, { ICatalogItemsProps } from "./CatalogItems";
 

dashboard/src/components/Config/PkgRepoList/PkgRepoForm.scss

@@ -7,8 +7,8 @@
   font: caption;
 }
 
-.ca-skip-tls {
-  margin-top: -1em;
+.reduced-margin-top {
+  margin-top: -0.5em;
 }
 
 /* stylelint-disable-next-line selector-class-pattern */

dashboard/src/components/Config/PkgRepoList/PkgRepoForm.test.tsx

@@ -17,9 +17,8 @@ import { act } from "react-dom/test-utils";
 import * as ReactRedux from "react-redux";
 import { IPackageRepositoryState } from "reducers/repos";
 import { defaultStore, getStore, mountWrapper } from "shared/specs/mountWrapper";
-import { IPkgRepoFormData, IStoreState } from "shared/types";
-import { PluginNames } from "shared/utils";
-import { PkgRepoForm, RepositoryStorageTypes } from "./PkgRepoForm";
+import { IPkgRepoFormData, IStoreState, PluginNames, RepositoryStorageTypes } from "shared/types";
+import { PkgRepoForm } from "./PkgRepoForm";
 
 const defaultProps = {
   onSubmit: jest.fn(),
@@ -161,6 +160,7 @@ it("shows an error creating a repo", async () => {
       <PkgRepoForm {...defaultProps} />,
     );
   });
+  wrapper.update();
   expect(wrapper.find(Alert)).toIncludeText("boom!");
 });
 
@@ -176,6 +176,7 @@ it("shows an error deleting a repo", async () => {
       <PkgRepoForm {...defaultProps} />,
     );
   });
+  wrapper.update();
   expect(wrapper.find(Alert)).toIncludeText("boom!");
 });
 
@@ -191,6 +192,7 @@ it("shows an error fetching a repo", async () => {
       <PkgRepoForm {...defaultProps} />,
     );
   });
+  wrapper.update();
   expect(wrapper.find(Alert)).toIncludeText("boom!");
 });
 
@@ -206,6 +208,7 @@ it("shows an error updating a repo", async () => {
       <PkgRepoForm {...defaultProps} />,
     );
   });
+  wrapper.update();
   expect(wrapper.find(Alert)).toIncludeText("boom!");
 });
 
@@ -525,6 +528,7 @@ it("should not show the list of OCI repositories if using a Helm repo (default)"
   wrapper.find("#kubeapps-repo-name").simulate("change", { target: { value: "helm-repo" } });
   wrapper.find("#kubeapps-repo-url").simulate("change", { target: { value: "helm.repo" } });
   wrapper.find("#kubeapps-repo-type-helm").simulate("change");
+  wrapper.update();
   expect(wrapper.find("#kubeapps-oci-repositories")).not.toExist();
 });
 
@@ -685,6 +689,7 @@ describe("when the repository info is already populated", () => {
         <PkgRepoForm {...defaultProps} packageRepoRef={packageRepoRef} />,
       );
     });
+    wrapper.update();
     expect(wrapper.find("#kubeapps-repo-skip-tls")).toBeChecked();
   });
 
@@ -703,6 +708,7 @@ describe("when the repository info is already populated", () => {
         <PkgRepoForm {...defaultProps} packageRepoRef={packageRepoRef} />,
       );
     });
+    wrapper.update();
     expect(wrapper.find("#kubeapps-repo-pass-credentials")).toBeChecked();
   });