Adds more version plumbing to the backend for conflicts to bubble up to the UI

Author: FrankHassanabad

x-pack/plugins/lists/common/schemas/common/schemas.ts

@@ -310,4 +310,4 @@ export type DeserializerOrUndefined = t.TypeOf<typeof deserializerOrUndefined>;
 
 export const _version = t.string;
 export const _versionOrUndefined = t.union([_version, t.undefined]);
-export type _versionOrUndefined = t.TypeOf<typeof _versionOrUndefined>;
+export type _VersionOrUndefined = t.TypeOf<typeof _versionOrUndefined>;

x-pack/plugins/lists/server/routes/update_endpoint_list_item_route.ts

@@ -41,6 +41,7 @@ export const updateEndpointListItemRoute = (router: IRouter): void => {
           meta,
           type,
           _tags,
+          _version,
           comments,
           entries,
           item_id: itemId,
@@ -49,6 +50,7 @@ export const updateEndpointListItemRoute = (router: IRouter): void => {
         const exceptionLists = getExceptionListClient(context);
         const exceptionListItem = await exceptionLists.updateEndpointListItem({
           _tags,
+          _version,
           comments,
           description,
           entries,

x-pack/plugins/lists/server/routes/update_exception_list_item_route.ts

@@ -41,6 +41,7 @@ export const updateExceptionListItemRoute = (router: IRouter): void => {
           meta,
           type,
           _tags,
+          _version,
           comments,
           entries,
           item_id: itemId,
@@ -50,6 +51,7 @@ export const updateExceptionListItemRoute = (router: IRouter): void => {
         const exceptionLists = getExceptionListClient(context);
         const exceptionListItem = await exceptionLists.updateExceptionListItem({
           _tags,
+          _version,
           comments,
           description,
           entries,

x-pack/plugins/lists/server/routes/update_exception_list_route.ts

@@ -36,6 +36,7 @@ export const updateExceptionListRoute = (router: IRouter): void => {
       try {
         const {
           _tags,
+          _version,
           tags,
           name,
           description,
@@ -54,6 +55,7 @@ export const updateExceptionListRoute = (router: IRouter): void => {
         } else {
           const list = await exceptionLists.updateExceptionList({
             _tags,
+            _version,
             description,
             id,
             listId,

x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts

@@ -131,6 +131,7 @@ export class ExceptionListClient {
    */
   public updateEndpointListItem = async ({
     _tags,
+    _version,
     comments,
     description,
     entries,
@@ -145,6 +146,7 @@ export class ExceptionListClient {
     await this.createEndpointList();
     return updateExceptionListItem({
       _tags,
+      _version,
       comments,
       description,
       entries,
@@ -198,6 +200,7 @@ export class ExceptionListClient {
 
   public updateExceptionList = async ({
     _tags,
+    _version,
     id,
     description,
     listId,
@@ -210,6 +213,7 @@ export class ExceptionListClient {
     const { savedObjectsClient, user } = this;
     return updateExceptionList({
       _tags,
+      _version,
       description,
       id,
       listId,
@@ -270,6 +274,7 @@ export class ExceptionListClient {
 
   public updateExceptionListItem = async ({
     _tags,
+    _version,
     comments,
     description,
     entries,
@@ -284,6 +289,7 @@ export class ExceptionListClient {
     const { savedObjectsClient, user } = this;
     return updateExceptionListItem({
       _tags,
+      _version,
       comments,
       description,
       entries,

x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts

@@ -38,6 +38,7 @@ import {
   UpdateCommentsArray,
   _Tags,
   _TagsOrUndefined,
+  _VersionOrUndefined,
 } from '../../../common/schemas';
 
 export interface ConstructorOptions {
@@ -64,6 +65,7 @@ export interface CreateExceptionListOptions {
 
 export interface UpdateExceptionListOptions {
   _tags: _TagsOrUndefined;
+  _version: _VersionOrUndefined;
   id: IdOrUndefined;
   listId: ListIdOrUndefined;
   namespaceType: NamespaceType;
@@ -130,6 +132,7 @@ export interface CreateEndpointListItemOptions {
 
 export interface UpdateExceptionListItemOptions {
   _tags: _TagsOrUndefined;
+  _version: _VersionOrUndefined;
   comments: UpdateCommentsArray;
   entries: EntriesArrayOrUndefined;
   id: IdOrUndefined;
@@ -144,6 +147,7 @@ export interface UpdateExceptionListItemOptions {
 
 export interface UpdateEndpointListItemOptions {
   _tags: _TagsOrUndefined;
+  _version: _VersionOrUndefined;
   comments: UpdateCommentsArray;
   entries: EntriesArrayOrUndefined;
   id: IdOrUndefined;

x-pack/plugins/lists/server/services/exception_lists/update_exception_list.ts

@@ -18,6 +18,7 @@ import {
   NamespaceType,
   TagsOrUndefined,
   _TagsOrUndefined,
+  _VersionOrUndefined,
 } from '../../../common/schemas';
 
 import { getSavedObjectType, transformSavedObjectUpdateToExceptionList } from './utils';
@@ -26,6 +27,7 @@ import { getExceptionList } from './get_exception_list';
 interface UpdateExceptionListOptions {
   id: IdOrUndefined;
   _tags: _TagsOrUndefined;
+  _version: _VersionOrUndefined;
   name: NameOrUndefined;
   description: DescriptionOrUndefined;
   savedObjectsClient: SavedObjectsClientContract;
@@ -40,6 +42,7 @@ interface UpdateExceptionListOptions {
 
 export const updateExceptionList = async ({
   _tags,
+  _version,
   id,
   savedObjectsClient,
   namespaceType,
@@ -67,6 +70,9 @@ export const updateExceptionList = async ({
         tags,
         type,
         updated_by: user,
+      },
+      {
+        version: _version,
       }
     );
     return transformSavedObjectUpdateToExceptionList({ exceptionList, savedObject });

x-pack/plugins/lists/server/services/exception_lists/update_exception_list_item.ts

@@ -20,6 +20,7 @@ import {
   TagsOrUndefined,
   UpdateCommentsArrayOrUndefined,
   _TagsOrUndefined,
+  _VersionOrUndefined,
 } from '../../../common/schemas';
 
 import {
@@ -33,6 +34,7 @@ interface UpdateExceptionListItemOptions {
   id: IdOrUndefined;
   comments: UpdateCommentsArrayOrUndefined;
   _tags: _TagsOrUndefined;
+  _version: _VersionOrUndefined;
   name: NameOrUndefined;
   description: DescriptionOrUndefined;
   entries: EntriesArrayOrUndefined;
@@ -48,6 +50,7 @@ interface UpdateExceptionListItemOptions {
 
 export const updateExceptionListItem = async ({
   _tags,
+  _version,
   comments,
   entries,
   id,
@@ -89,6 +92,9 @@ export const updateExceptionListItem = async ({
         tags,
         type,
         updated_by: user,
+      },
+      {
+        version: _version,
       }
     );
     return transformSavedObjectUpdateToExceptionListItem({