Skip to content

Commit

Permalink
get rid of useGet in Add Modules and add skips
Browse files Browse the repository at this point in the history
  • Loading branch information
mrCherry97 committed Jan 28, 2025
1 parent b39e2e4 commit 9e5f3f2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
21 changes: 9 additions & 12 deletions src/components/KymaModules/KymaModulesAddModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ import { useCallback, useEffect, useState } from 'react';
import { MessageStrip } from '@ui5/webcomponents-react';
import { spacing } from '@ui5/webcomponents-react-base';
import { useTranslation } from 'react-i18next';
import { useGet } from 'shared/hooks/BackendAPI/useGet';
import { ResourceForm } from 'shared/ResourceForm';
import { Spinner } from 'shared/components/Spinner/Spinner';
import ModulesCard from './ModulesCard';
import './KymaModulesAddModule.scss';
import { cloneDeep } from 'lodash';
import {
useModulesReleaseQuery,
useModuleTemplatesQuery,
} from './kymaModulesQueries';

import './KymaModulesAddModule.scss';

export default function KymaModulesAddModule({
resourceName,
Expand All @@ -21,10 +25,6 @@ export default function KymaModulesAddModule({
}) {
const { t } = useTranslation();

const modulesResourceUrl = `/apis/operator.kyma-project.io/v1beta2/moduletemplates`;

const modulesReleaseMetaResourceUrl = `/apis/operator.kyma-project.io/v1beta2/modulereleasemetas`;

const [resource, setResource] = useState(cloneDeep(kymaResource));

const [selectedModules, setSelectedModules] = useState([]);
Expand All @@ -48,13 +48,10 @@ export default function KymaModulesAddModule({
}
}, [setKymaResource, kymaResource, selectedModules, activeKymaModules]);

const { data: modules } = useGet(modulesResourceUrl, {
pollingInterval: 3000,
const { data: moduleReleaseMetas } = useModulesReleaseQuery({
skip: !resourceName,
});

const { data: moduleReleaseMetas } = useGet(modulesReleaseMetaResourceUrl, {
pollingInterval: 3000,
const { data: moduleTemplates } = useModuleTemplatesQuery({
skip: !resourceName,
});

Expand Down Expand Up @@ -99,7 +96,7 @@ export default function KymaModulesAddModule({
);
}

const modulesAddData = modules?.items.reduce((acc, module) => {
const modulesAddData = moduleTemplates?.items.reduce((acc, module) => {
const name = module.metadata.labels['operator.kyma-project.io/module-name'];
const existingModule = acc.find(item => item.name === name);
const isAlreadyInstalled = initialUnchangedResource?.spec?.modules?.find(
Expand Down
6 changes: 4 additions & 2 deletions src/components/KymaModules/KymaModulesList.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,13 @@ export default function KymaModulesList({

const namespace = 'kyma-system';

const { data: moduleReleaseMetas } = useModulesReleaseQuery(!resourceName);
const { data: moduleReleaseMetas } = useModulesReleaseQuery({
skip: !resourceName,
});
const {
data: moduleTemplates,
loading: moduleTemplateLoading,
} = useModuleTemplatesQuery(!resourceName);
} = useModuleTemplatesQuery({ skip: !resourceName });

const crdUrl = `/apis/apiextensions.k8s.io/v1/customresourcedefinitions`;
const { data: crds } = useGet(crdUrl, {
Expand Down
4 changes: 2 additions & 2 deletions src/components/KymaModules/kymaModulesQueries.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export function useKymaQuery() {
};
}

export function useModuleTemplatesQuery(skip = false) {
export function useModuleTemplatesQuery({ skip = false }) {
const modulesResourceUrl = `/apis/operator.kyma-project.io/v1beta2/moduletemplates`;

const { data, loading } = useGet(modulesResourceUrl, {
Expand All @@ -52,7 +52,7 @@ export function useModuleTemplatesQuery(skip = false) {
};
}

export function useModulesReleaseQuery(skip = false) {
export function useModulesReleaseQuery({ skip = false }) {
const modulesReleaseMetaResourceUrl = `/apis/operator.kyma-project.io/v1beta2/modulereleasemetas`;

const { data, loading } = useGet(modulesReleaseMetaResourceUrl, {
Expand Down

0 comments on commit 9e5f3f2

Please sign in to comment.