Skip to content

OCPBUGS-77016: fix type as K8sResourceKind assertion in createKnatifyPage #16044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cajieh wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −13
Open

OCPBUGS-77016: fix type as K8sResourceKind assertion in createKnatifyPage #16044

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions frontend/packages/knative-plugin/src/components/knatify/CreateKnatifyPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type { DeployImageFormData } from '@console/dev-console/src/components/im
import NamespacedPage, {
NamespacedPageVariants,
} from '@console/dev-console/src/components/NamespacedPage';
import type { WatchK8sResults, WatchK8sResultsObject } from '@console/dynamic-plugin-sdk';
import type { WatchK8sResults } from '@console/dynamic-plugin-sdk';
import { useActivePerspective } from '@console/dynamic-plugin-sdk';
import { LoadingBox, history } from '@console/internal/components/utils';
import { useK8sWatchResources } from '@console/internal/components/utils/k8s-watch-hook';
Expand All @@ -27,9 +27,10 @@ import {
} from '../../utils/knatify-utils';
import KnatifyForm from './KnatifyForm';

// eslint-disable-next-line @typescript-eslint/naming-convention
type watchResource = {
[key: string]: K8sResourceKind[] | K8sResourceKind;
type WatchedResources = {
projects: K8sResourceKind[];
imageStream: K8sResourceKind[];
workloadResource?: K8sResourceKind;
};

const CreateKnatifyPage: FunctionComponent = () => {
Expand Down Expand Up @@ -72,7 +73,7 @@ const CreateKnatifyPage: FunctionComponent = () => {
[namespace, kind, appName],
);

const resources: WatchK8sResults<watchResource> = useK8sWatchResources<watchResource>(
const resources: WatchK8sResults<WatchedResources> = useK8sWatchResources<WatchedResources>(
watchedResources,
);

Expand Down Expand Up @@ -127,20 +128,15 @@ const CreateKnatifyPage: FunctionComponent = () => {
{isResourceLoaded ? (
<Formik
initialValues={getInitialValuesKnatify(
getKnatifyWorkloadData(resources?.workloadResource?.data as K8sResourceKind, hpa),
getKnatifyWorkloadData(resources.workloadResource?.data, hpa),
namespace,
resources?.imageStream?.data as K8sResourceKind[],
resources.imageStream.data,
)}
validationSchema={deployValidationSchema(t)}
onSubmit={handleSubmit}
onReset={history.goBack}
>
{(formikProps) => (
<KnatifyForm
{...formikProps}
projects={resources?.projects as WatchK8sResultsObject<K8sResourceKind[]>}
/>
)}
{(formikProps) => <KnatifyForm {...formikProps} projects={resources.projects} />}
</Formik>
) : (
<LoadingBox />
Expand Down