re-unify versions

michaelolo24 · michaelolo24 · commit 3b2e144d940f · 2025-09-11T09:17:34.000-04:00
diff --git a/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/model_versions/model_version_4.ts b/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/model_versions/model_version_4.ts
@@ -6,7 +6,7 @@
  */
 
 import type { SavedObjectsModelVersion } from '@kbn/core-saved-objects-server';
-import { casesSchemaV5 } from '../schemas';
+import { casesSchemaV4 } from '../schemas';
 
 /**
  * Adds the incremental_id.keyword field to the cases SO.
@@ -28,6 +28,6 @@ export const modelVersion4: SavedObjectsModelVersion = {
     },
   ],
   schemas: {
-    forwardCompatibility: casesSchemaV5.extends({}, { unknowns: 'ignore' }),
+    forwardCompatibility: casesSchemaV4.extends({}, { unknowns: 'ignore' }),
   },
 };
diff --git a/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/schemas/index.ts b/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/schemas/index.ts
@@ -11,4 +11,3 @@ export { casesSchema as casesSchemaV1 } from './v1';
 export { casesSchema as casesSchemaV2 } from './v2';
 export { casesSchema as casesSchemaV3 } from './v3';
 export { casesSchema as casesSchemaV4 } from './v4';
-export { casesSchema as casesSchemaV5 } from './v5';
diff --git a/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/schemas/latest.ts b/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/schemas/latest.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export * from './v5';
+export * from './v4';
diff --git a/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/schemas/v4.ts b/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/schemas/v4.ts
@@ -14,4 +14,14 @@ export const casesSchema = casesSchemaV3.extends({
   time_to_acknowledge: schema.maybe(schema.nullable(schema.number())),
   time_to_investigate: schema.maybe(schema.nullable(schema.number())),
   time_to_resolve: schema.maybe(schema.nullable(schema.number())),
+  incremental_id: schema.maybe(
+    schema.nullable(
+      schema.oneOf([
+        schema.number(),
+        schema.object({
+          keyword: schema.maybe(schema.string()),
+        }),
+      ])
+    )
+  ),
 });
diff --git a/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/schemas/v5.ts b/x-pack/platform/plugins/shared/cases/server/saved_object_types/cases/schemas/v5.ts
