Skip to content

Commit

Permalink
Merge branch 'main' into issues/205
Browse files Browse the repository at this point in the history
  • Loading branch information
Haarolean authored Mar 17, 2024
2 parents d8268a4 + 1c71043 commit 605de56
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ on:

permissions:
contents: read
actions: read
security-events: write

jobs:
analyze:
Expand Down
52 changes: 36 additions & 16 deletions frontend/src/lib/hooks/api/appConfig.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { appConfigApiClient as api } from 'lib/api';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { ApplicationConfigPropertiesKafkaClusters } from 'generated-sources';
import {
ApplicationConfig,
ApplicationConfigPropertiesKafkaClusters,
} from 'generated-sources';
import { QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';

export function useAppInfo() {
Expand All @@ -15,26 +18,43 @@ export function useAppConfig() {
return useQuery(['app', 'config'], () => api.getCurrentConfig());
}

export function useUpdateAppConfig({ initialName }: { initialName?: string }) {
function aggregateClusters(
cluster: ApplicationConfigPropertiesKafkaClusters,
existingConfig: ApplicationConfig,
initialName?: string,
deleteCluster?: boolean
): ApplicationConfigPropertiesKafkaClusters[] {
const existingClusters = existingConfig.properties?.kafka?.clusters || [];

if (!initialName) {
return [...existingClusters, cluster];
}

if (!deleteCluster) {
return existingClusters.map((c) => (c.name === initialName ? cluster : c));
}

return existingClusters.filter((c) => c.name !== initialName);
}

export function useUpdateAppConfig({
initialName,
deleteCluster,
}: {
initialName?: string;
deleteCluster?: boolean;
}) {
const client = useQueryClient();
return useMutation(
async (cluster: ApplicationConfigPropertiesKafkaClusters) => {
const existingConfig = await api.getCurrentConfig();
const existingClusters = existingConfig.properties?.kafka?.clusters || [];

let clusters: ApplicationConfigPropertiesKafkaClusters[] = [];

if (existingClusters.length > 0) {
if (!initialName) {
clusters = [...existingClusters, cluster];
} else {
clusters = existingClusters.map((c) =>
c.name === initialName ? cluster : c
);
}
} else {
clusters = [cluster];
}
const clusters = aggregateClusters(
cluster,
existingConfig,
initialName,
deleteCluster
);

const config = {
...existingConfig,
Expand Down
35 changes: 35 additions & 0 deletions frontend/src/widgets/ClusterConfigForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import Metrics from 'widgets/ClusterConfigForm/Sections/Metrics';
import CustomAuthentication from 'widgets/ClusterConfigForm/Sections/CustomAuthentication';
import Authentication from 'widgets/ClusterConfigForm/Sections/Authentication/Authentication';
import KSQL from 'widgets/ClusterConfigForm/Sections/KSQL';
import { useConfirm } from 'lib/hooks/useConfirm';

interface ClusterConfigFormProps {
hasCustomConfig?: boolean;
Expand Down Expand Up @@ -52,12 +53,36 @@ const ClusterConfigForm: React.FC<ClusterConfigFormProps> = ({

const validate = useValidateAppConfig();
const update = useUpdateAppConfig({ initialName: initialValues.name });
const deleteCluster = useUpdateAppConfig({
initialName: initialValues.name,
deleteCluster: true,
});
const confirm = useConfirm(true);

const {
value: isFormDisabled,
setTrue: disableForm,
setFalse: enableForm,
} = useBoolean();

const confirmClusterDelete = () =>
confirm('Are you sure want to delete this cluster?', async () => {
if (initialValues.name) {
const data = methods.getValues();
const config = transformFormDataToPayload(data);
try {
await deleteCluster.mutateAsync(config);
navigate('/');
} catch (error) {
showAlert('error', {
id: 'app-config-update-error',
title: 'Error updating application config',
message: 'There was an error updating the application config',
});
}
}
});

const onSubmit = async (data: ClusterConfigFormValues) => {
const config = transformFormDataToPayload(data);
try {
Expand Down Expand Up @@ -146,6 +171,16 @@ const ClusterConfigForm: React.FC<ClusterConfigFormProps> = ({
>
Submit
</Button>
{initialValues.name && (
<Button
buttonSize="L"
buttonType="danger"
inProgress={deleteCluster.isLoading}
onClick={confirmClusterDelete}
>
Delete
</Button>
)}
</S.ButtonWrapper>
</FlexFieldset>
</StyledForm>
Expand Down

0 comments on commit 605de56

Please sign in to comment.