Skip to content

Commit 5f49573

Browse files
outdooracornjakobw
authored andcommitted
CRUD: Remove "allOf" from 'resources/descriptions/requests.js'
Bug: T379912 Change-Id: Ibc6aad3e13e1bbcf98dc0bf60ca5b02560d1885c
1 parent 8be48af commit 5f49573

File tree

2 files changed

+45
-67
lines changed

2 files changed

+45
-67
lines changed

repo/domains/crud/specs/resources/descriptions/requests.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ const requestParts = require( '../../global/request-parts' );
44

55
module.exports = {
66
"SetDescriptionInLanguage": {
7-
"allOf": [
8-
{
9-
"type": "object",
10-
"properties": {
11-
"description": { "type": "string" }
12-
},
13-
"required": [ "description" ]
14-
},
15-
requestParts.MediawikiEdit
16-
]
17-
}
7+
"type": "object",
8+
"properties": {
9+
"description": { "type": "string" },
10+
...requestParts.MediawikiEdit.properties
11+
},
12+
"required": [ "description" ]
13+
},
1814
};

repo/rest-api/src/openapi.json

Lines changed: 38 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9445,37 +9445,28 @@
94459445
"content": {
94469446
"application/json": {
94479447
"schema": {
9448-
"allOf": [
9449-
{
9450-
"type": "object",
9451-
"properties": {
9452-
"description": {
9453-
"type": "string"
9454-
}
9448+
"type": "object",
9449+
"properties": {
9450+
"description": {
9451+
"type": "string"
9452+
},
9453+
"tags": {
9454+
"type": "array",
9455+
"items": {
9456+
"type": "string"
94559457
},
9456-
"required": [
9457-
"description"
9458-
]
9458+
"default": []
94599459
},
9460-
{
9461-
"type": "object",
9462-
"properties": {
9463-
"tags": {
9464-
"type": "array",
9465-
"items": {
9466-
"type": "string"
9467-
},
9468-
"default": []
9469-
},
9470-
"bot": {
9471-
"type": "boolean",
9472-
"default": false
9473-
},
9474-
"comment": {
9475-
"type": "string"
9476-
}
9477-
}
9460+
"bot": {
9461+
"type": "boolean",
9462+
"default": false
9463+
},
9464+
"comment": {
9465+
"type": "string"
94789466
}
9467+
},
9468+
"required": [
9469+
"description"
94799470
]
94809471
},
94819472
"example": {
@@ -23366,37 +23357,28 @@
2336623357
"content": {
2336723358
"application/json": {
2336823359
"schema": {
23369-
"allOf": [
23370-
{
23371-
"type": "object",
23372-
"properties": {
23373-
"description": {
23374-
"type": "string"
23375-
}
23360+
"type": "object",
23361+
"properties": {
23362+
"description": {
23363+
"type": "string"
23364+
},
23365+
"tags": {
23366+
"type": "array",
23367+
"items": {
23368+
"type": "string"
2337623369
},
23377-
"required": [
23378-
"description"
23379-
]
23370+
"default": []
2338023371
},
23381-
{
23382-
"type": "object",
23383-
"properties": {
23384-
"tags": {
23385-
"type": "array",
23386-
"items": {
23387-
"type": "string"
23388-
},
23389-
"default": []
23390-
},
23391-
"bot": {
23392-
"type": "boolean",
23393-
"default": false
23394-
},
23395-
"comment": {
23396-
"type": "string"
23397-
}
23398-
}
23372+
"bot": {
23373+
"type": "boolean",
23374+
"default": false
23375+
},
23376+
"comment": {
23377+
"type": "string"
2339923378
}
23379+
},
23380+
"required": [
23381+
"description"
2340023382
]
2340123383
},
2340223384
"example": {

0 commit comments

Comments
 (0)