fix: minor issues

Author: ksvfs

src/containers/Tenant/TableFormDialog/__test__/validation.test.ts

@@ -336,6 +336,36 @@ describe('TableFormDialog validation', () => {
         expect(getIssuePaths(result)).toContain('settings.partitionsAtKeys');
     });
 
+    test('explicit partition split points must match current primary key columns', () => {
+        const schema = buildTableValidationSchema({mode: 'create'});
+
+        const result = schema.safeParse(
+            createValues({
+                columns: [createColumn({type: 'Utf8'})],
+                settings: {
+                    partitionsType: PartitionsType.Explicit,
+                    partitionsAtKeys: [
+                        [
+                            {
+                                id: 'split-point-id',
+                                name: 'id',
+                                type: 'Int64',
+                                key: true,
+                                notNull: true,
+                                isDefined: true,
+                                value: '42',
+                            } as never,
+                        ],
+                    ],
+                    ttl: {status: 'disabled'},
+                },
+            }),
+        );
+
+        expect(result.success).toBe(false);
+        expect(getIssuePaths(result)).toContain('settings.partitionsAtKeys');
+    });
+
     test('uniform partitions require Uint32 or Uint64 as the first primary key column', () => {
         const schema = buildTableValidationSchema({mode: 'create'});
 

src/containers/Tenant/TableFormDialog/validation.ts

@@ -263,7 +263,8 @@ function validatePartitionsAtKeys(data: FormValues, ctx: z.RefinementCtx) {
     if (!partitionsAtKeys || partitionsAtKeys.length === 0) {
         return;
     }
-    const pkColumnCount = data.columns.filter(({key}) => Boolean(key)).length;
+    const pkColumns = data.columns.filter(({key}) => Boolean(key));
+    const pkColumnCount = pkColumns.length;
 
     const allHaveLengthOne = partitionsAtKeys.every(
         (point: Array<{value: string | null}>) =>
@@ -275,6 +276,27 @@ function validatePartitionsAtKeys(data: FormValues, ctx: z.RefinementCtx) {
     );
     if (!allHaveLengthOne && !allHaveLengthPk) {
         addIssue(ctx, ['settings', 'partitionsAtKeys'], i18n('error_partitions-at-keys-invalid'));
+        return;
+    }
+
+    const matchesCurrentPrimaryKey = partitionsAtKeys.every((point) => {
+        const currentColumns = point.length === 1 ? pkColumns.slice(0, 1) : pkColumns;
+
+        return point.every((column, index) => {
+            const currentColumn = currentColumns[index];
+
+            return (
+                Boolean(currentColumn) &&
+                Boolean(column.value) &&
+                column.name === currentColumn.name &&
+                column.type === currentColumn.type &&
+                isValueForTypeValid(String(column.value), currentColumn.type)
+            );
+        });
+    });
+
+    if (!matchesCurrentPrimaryKey) {
+        addIssue(ctx, ['settings', 'partitionsAtKeys'], i18n('error_partitions-at-keys-invalid'));
     }
 }
 

src/containers/Tenant/TopicFormDialog/TopicFormDialog.tsx

@@ -322,7 +322,7 @@ function TopicForm({
         setValue,
         trigger,
         watch,
-        formState: {dirtyFields, errors},
+        formState: {errors},
     } = useForm<TopicFormValues>({
         defaultValues: initialValues,
         resolver: zodResolver(validationSchema),
@@ -387,17 +387,7 @@ function TopicForm({
     }, [autoPartitioningEnabled, maxPartitions, minPartitions, shards, writeQuotaBytes]);
 
     const handleTopicSubmit = handleSubmit(async (data) => {
-        const preservePartitionCountLimit =
-            mode === 'update' &&
-            !data.autoPartitioning.enabled &&
-            !dirtyFields.shards &&
-            !dirtyFields.autoPartitioning?.enabled;
-
-        const preparedData = {
-            ...data,
-            partitionCountLimit: initialValues.partitionCountLimit,
-            ...(preservePartitionCountLimit ? {preservePartitionCountLimit} : {}),
-        };
+        const preparedData = data;
 
         try {
             if (mode === 'create') {
@@ -755,11 +745,11 @@ function TopicForm({
                                                         if (
                                                             value !== undefined &&
                                                             maxPartitions !== undefined &&
-                                                            maxPartitions <= value
+                                                            maxPartitions < value
                                                         ) {
                                                             setValue(
                                                                 'autoPartitioning.maxPartitions',
-                                                                value + 1,
+                                                                value,
                                                             );
                                                         }
                                                         trigger('autoPartitioning.maxPartitions');

src/containers/Tenant/TopicFormDialog/__test__/validation.test.ts

@@ -57,7 +57,27 @@ describe('TopicFormDialog validation', () => {
         expect(getIssuePaths(result)).toContain('name');
     });
 
-    test('validates auto-partitioning bounds and required fields', () => {
+    test('allows equal auto-partitioning bounds', () => {
+        const schema = getTopicFormValidationSchema(3);
+
+        const result = schema.safeParse(
+            createValidValues({
+                shards: 3,
+                autoPartitioning: {
+                    enabled: true,
+                    mode: AutoPartitioningStrategy.ScaleUp,
+                    minPartitions: 3,
+                    maxPartitions: 3,
+                    stabilizationWindow: 300,
+                    upUtilization: 90,
+                },
+            }),
+        );
+
+        expect(result.success).toBe(true);
+    });
+
+    test('validates auto-partitioning minimum and required fields', () => {
         const schema = getTopicFormValidationSchema(3);
 
         const result = schema.safeParse(
@@ -79,7 +99,6 @@ describe('TopicFormDialog validation', () => {
             expect.arrayContaining([
                 'shards',
                 'autoPartitioning.minPartitions',
-                'autoPartitioning.maxPartitions',
                 'autoPartitioning.stabilizationWindow',
                 'autoPartitioning.upUtilization',
             ]),

src/containers/Tenant/TopicFormDialog/i18n/en.json

@@ -28,7 +28,7 @@
   "context_auto-partitioning-stabilization-window": "The period of time after a load change when the number of partitions will change",
   "context_auto-partitioning-up-utilization": "The threshold at which the number of partitions increases",
 
-  "confirm_auto-partitioning-message": "The Kafka protocol does not support topic autopartitioning. If you enable autopartitioning, you will not be able to work with the topics you create using the Kafka protocol. You can not disabling autopartitioning for a specific topic.",
+  "confirm_auto-partitioning-message": "The Kafka protocol does not support topic autopartitioning. If you enable autopartitioning, you will not be able to work with the topics you create using the Kafka protocol. You cannot disable autopartitioning for a specific topic.",
 
   "value_auto-partitioning-scale-up": "Scale up",
   "value_auto-partitioning-paused": "Paused",

src/containers/Tenant/TopicFormDialog/validation.ts

@@ -121,9 +121,9 @@ export function getTopicFormValidationSchema(minPartitions: number) {
                 if (
                     minValue !== undefined &&
                     autoPartitioning.maxPartitions !== undefined &&
-                    autoPartitioning.maxPartitions <= minValue
+                    autoPartitioning.maxPartitions < minValue
                 ) {
-                    addIssue(ctx, maxPath, i18n('error_more-than-number', {count: minValue}));
+                    addIssue(ctx, maxPath, i18n('error_min-number', {count: minValue}));
                 }
             }
 

src/store/reducers/topic/__test__/topic.test.ts

@@ -58,7 +58,6 @@ describe('topic selectors', () => {
         expect(result).toEqual({
             name: 'topic-a',
             shards: 3,
-            partitionCountLimit: undefined,
             writeQuotaBytes: 262144,
             autoPartitioning: {
                 enabled: true,
@@ -71,15 +70,14 @@ describe('topic selectors', () => {
         });
     });
 
-    test('selectTopicFormValues ignores backend retention fields for legacy topics', async () => {
+    test('selectTopicFormValues keeps fixed-partition topics on YDB defaults', async () => {
         const result = await seedTopicResult({
             self: {name: 'topic-legacy'},
             retention_period: {seconds: '86400'},
             retention_storage_mb: '2048',
             partition_write_speed_bytes_per_second: '1048576',
             partitioning_settings: {
                 min_active_partitions: '2',
-                partition_count_limit: '5',
                 auto_partitioning_settings: {
                     strategy: AutoPartitioningStrategy.Disabled,
                 },
@@ -89,13 +87,12 @@ describe('topic selectors', () => {
         expect(result).toEqual({
             name: 'topic-legacy',
             shards: 2,
-            partitionCountLimit: 5,
             writeQuotaBytes: 1048576,
             autoPartitioning: {
                 enabled: false,
                 mode: AutoPartitioningStrategy.Disabled,
                 minPartitions: 2,
-                maxPartitions: 5,
+                maxPartitions: undefined,
                 stabilizationWindow: undefined,
                 upUtilization: undefined,
             },
@@ -110,7 +107,7 @@ describe('topic selectors', () => {
             partition_write_speed_bytes_per_second: 'broken',
             partitioning_settings: {
                 min_active_partitions: '1',
-                partition_count_limit: 'oops',
+                max_active_partitions: 'oops',
                 auto_partitioning_settings: {
                     strategy: AutoPartitioningStrategy.Unspecified,
                 },
@@ -120,7 +117,6 @@ describe('topic selectors', () => {
         expect(result).toEqual({
             name: 'topic-b',
             shards: 1,
-            partitionCountLimit: undefined,
             writeQuotaBytes: 1024 * 1024,
             autoPartitioning: {
                 enabled: false,

src/store/reducers/topic/__test__/utils.test.ts

@@ -251,13 +251,7 @@ export const selectTopicFormValues = createSelector(
             10,
         );
         const maxActivePartitions = parseInt(
-            topicData.partitioning_settings?.max_active_partitions ??
-                topicData.partitioning_settings?.partition_count_limit ??
-                '0',
-            10,
-        );
-        const parsedPartitionCountLimit = parseInt(
-            topicData.partitioning_settings?.partition_count_limit ?? '',
+            topicData.partitioning_settings?.max_active_partitions ?? '0',
             10,
         );
         const parsedWriteQuotaBytes = parseInt(
@@ -268,9 +262,6 @@ export const selectTopicFormValues = createSelector(
         const writeQuotaBytes = Number.isFinite(parsedWriteQuotaBytes)
             ? parsedWriteQuotaBytes
             : DEFAULT_WRITE_QUOTA_BYTES;
-        const partitionCountLimit = Number.isFinite(parsedPartitionCountLimit)
-            ? parsedPartitionCountLimit
-            : undefined;
         const autoPartitioningSettings =
             topicData.partitioning_settings?.auto_partitioning_settings;
         const autoPartitioningStrategy = String(
@@ -284,7 +275,6 @@ export const selectTopicFormValues = createSelector(
         return {
             name: topicData.self?.name,
             shards: minActivePartitions,
-            partitionCountLimit,
             writeQuotaBytes,
             autoPartitioning: {
                 enabled: autoPartitioningEnabled,

src/store/reducers/topic/topic.ts

@@ -10,9 +10,7 @@ export interface TopicFormValues {
     path?: string;
     name?: string;
     shards: number;
-    partitionCountLimit?: number;
     writeQuotaBytes: number;
-    preservePartitionCountLimit?: boolean;
     autoPartitioning: {
         enabled: boolean;
         mode: string;
@@ -60,13 +58,7 @@ function buildTopicSettings(
         includeDisabledAutoPartitioningStrategy = true,
     }: {includeDisabledAutoPartitioningStrategy?: boolean} = {},
 ): string[] {
-    const {
-        shards,
-        writeQuotaBytes,
-        partitionCountLimit,
-        preservePartitionCountLimit,
-        autoPartitioning,
-    } = formData;
+    const {shards, writeQuotaBytes, autoPartitioning} = formData;
 
     const settings: string[] = [];
 
@@ -79,14 +71,6 @@ function buildTopicSettings(
         if (autoPartitioning.maxPartitions !== undefined) {
             settings.push(`MAX_ACTIVE_PARTITIONS = ${autoPartitioning.maxPartitions}`);
         }
-    } else {
-        if (preservePartitionCountLimit) {
-            if (partitionCountLimit !== undefined) {
-                settings.push(`PARTITION_COUNT_LIMIT = ${partitionCountLimit}`);
-            }
-        } else {
-            settings.push(`PARTITION_COUNT_LIMIT = ${shards}`);
-        }
     }
 
     settings.push(`PARTITION_WRITE_SPEED_BYTES_PER_SECOND = ${writeQuotaBytes}`);