mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Chore: Use same JSON tag casing everywhere for parent UID (#61935)
Chore: Use same JSON tag casing everywhere for parent UID
This commit is contained in:
parent
3b73b16245
commit
e5e8bb4dea
@ -31,5 +31,5 @@ type FolderSearchHit struct {
|
|||||||
Uid string `json:"uid"`
|
Uid string `json:"uid"`
|
||||||
Title string `json:"title"`
|
Title string `json:"title"`
|
||||||
AccessControl accesscontrol.Metadata `json:"accessControl,omitempty"`
|
AccessControl accesscontrol.Metadata `json:"accessControl,omitempty"`
|
||||||
ParentUID string `json:"parent_uid,omitempty"`
|
ParentUID string `json:"parentUid,omitempty"`
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ func (hs *HTTPServer) GetFolders(c *models.ReqContext) response.Response {
|
|||||||
OrgID: c.OrgID,
|
OrgID: c.OrgID,
|
||||||
Limit: c.QueryInt64("limit"),
|
Limit: c.QueryInt64("limit"),
|
||||||
Page: c.QueryInt64("page"),
|
Page: c.QueryInt64("page"),
|
||||||
UID: c.Query("parent_uid"),
|
UID: c.Query("parentUid"),
|
||||||
SignedInUser: c.SignedInUser,
|
SignedInUser: c.SignedInUser,
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
@ -340,7 +340,7 @@ type GetFoldersParams struct {
|
|||||||
// The parent folder UID
|
// The parent folder UID
|
||||||
// in:query
|
// in:query
|
||||||
// required:false
|
// required:false
|
||||||
ParentUID string `json:"parent_uid"`
|
ParentUID string `json:"parentUid"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// swagger:parameters getFolderByUID
|
// swagger:parameters getFolderByUID
|
||||||
|
@ -3058,7 +3058,7 @@
|
|||||||
"tags": [
|
"tags": [
|
||||||
"provisioning"
|
"provisioning"
|
||||||
],
|
],
|
||||||
"summary": "Updates an existing template.",
|
"summary": "Updates an existing notification template.",
|
||||||
"operationId": "RoutePutTemplate",
|
"operationId": "RoutePutTemplate",
|
||||||
"parameters": [
|
"parameters": [
|
||||||
{
|
{
|
||||||
@ -5240,7 +5240,7 @@
|
|||||||
},
|
},
|
||||||
"/folders": {
|
"/folders": {
|
||||||
"get": {
|
"get": {
|
||||||
"description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID.",
|
"description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders.",
|
||||||
"tags": [
|
"tags": [
|
||||||
"folders"
|
"folders"
|
||||||
],
|
],
|
||||||
@ -5266,7 +5266,7 @@
|
|||||||
{
|
{
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "The parent folder UID",
|
"description": "The parent folder UID",
|
||||||
"name": "parent_uid",
|
"name": "parentUid",
|
||||||
"in": "query"
|
"in": "query"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@ -12218,9 +12218,6 @@
|
|||||||
"hasAcl": {
|
"hasAcl": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"hasPublicDashboard": {
|
|
||||||
"type": "boolean"
|
|
||||||
},
|
|
||||||
"isFolder": {
|
"isFolder": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
@ -13179,7 +13176,7 @@
|
|||||||
"type": "integer",
|
"type": "integer",
|
||||||
"format": "int64"
|
"format": "int64"
|
||||||
},
|
},
|
||||||
"parent_uid": {
|
"parentUid": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"title": {
|
"title": {
|
||||||
@ -14447,34 +14444,6 @@
|
|||||||
"$ref": "#/definitions/Matcher"
|
"$ref": "#/definitions/Matcher"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NotificationTemplate": {
|
|
||||||
"type": "object",
|
|
||||||
"properties": {
|
|
||||||
"name": {
|
|
||||||
"type": "string"
|
|
||||||
},
|
|
||||||
"provenance": {
|
|
||||||
"$ref": "#/definitions/Provenance"
|
|
||||||
},
|
|
||||||
"template": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"NotificationTemplateContent": {
|
|
||||||
"type": "object",
|
|
||||||
"properties": {
|
|
||||||
"template": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"NotificationTemplates": {
|
|
||||||
"type": "array",
|
|
||||||
"items": {
|
|
||||||
"$ref": "#/definitions/NotificationTemplate"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Metadata": {
|
"Metadata": {
|
||||||
"description": "Metadata contains user accesses for a given resource\nEx: map[string]bool{\"create\":true, \"delete\": true}",
|
"description": "Metadata contains user accesses for a given resource\nEx: map[string]bool{\"create\":true, \"delete\": true}",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
@ -14647,6 +14616,34 @@
|
|||||||
"format": "int64",
|
"format": "int64",
|
||||||
"title": "NoticeSeverity is a type for the Severity property of a Notice."
|
"title": "NoticeSeverity is a type for the Severity property of a Notice."
|
||||||
},
|
},
|
||||||
|
"NotificationTemplate": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"name": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"provenance": {
|
||||||
|
"$ref": "#/definitions/Provenance"
|
||||||
|
},
|
||||||
|
"template": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NotificationTemplateContent": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"template": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NotificationTemplates": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"$ref": "#/definitions/NotificationTemplate"
|
||||||
|
}
|
||||||
|
},
|
||||||
"NotificationTestCommand": {
|
"NotificationTestCommand": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
@ -18578,7 +18575,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"alertGroups": {
|
"alertGroups": {
|
||||||
"description": "AlertGroups alert groups",
|
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"$ref": "#/definitions/alertGroup"
|
"$ref": "#/definitions/alertGroup"
|
||||||
@ -18739,14 +18735,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gettableAlerts": {
|
"gettableAlerts": {
|
||||||
"description": "GettableAlerts gettable alerts",
|
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"$ref": "#/definitions/gettableAlert"
|
"$ref": "#/definitions/gettableAlert"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gettableSilence": {
|
"gettableSilence": {
|
||||||
"description": "GettableSilence gettable silence",
|
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"required": [
|
"required": [
|
||||||
"comment",
|
"comment",
|
||||||
@ -18795,7 +18789,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gettableSilences": {
|
"gettableSilences": {
|
||||||
"description": "GettableSilences gettable silences",
|
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"$ref": "#/definitions/gettableSilence"
|
"$ref": "#/definitions/gettableSilence"
|
||||||
@ -18982,6 +18975,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"receiver": {
|
"receiver": {
|
||||||
|
"description": "Receiver receiver",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"required": [
|
"required": [
|
||||||
"active",
|
"active",
|
||||||
|
@ -4568,7 +4568,7 @@
|
|||||||
},
|
},
|
||||||
"/folders": {
|
"/folders": {
|
||||||
"get": {
|
"get": {
|
||||||
"description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID.",
|
"description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders.",
|
||||||
"tags": [
|
"tags": [
|
||||||
"folders"
|
"folders"
|
||||||
],
|
],
|
||||||
@ -4594,7 +4594,7 @@
|
|||||||
{
|
{
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "The parent folder UID",
|
"description": "The parent folder UID",
|
||||||
"name": "parent_uid",
|
"name": "parentUid",
|
||||||
"in": "query"
|
"in": "query"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@ -11159,9 +11159,6 @@
|
|||||||
"hasAcl": {
|
"hasAcl": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"hasPublicDashboard": {
|
|
||||||
"type": "boolean"
|
|
||||||
},
|
|
||||||
"isFolder": {
|
"isFolder": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
@ -11919,7 +11916,7 @@
|
|||||||
"type": "integer",
|
"type": "integer",
|
||||||
"format": "int64"
|
"format": "int64"
|
||||||
},
|
},
|
||||||
"parent_uid": {
|
"parentUid": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"title": {
|
"title": {
|
||||||
|
@ -3534,9 +3534,6 @@
|
|||||||
"hasAcl": {
|
"hasAcl": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"hasPublicDashboard": {
|
|
||||||
"type": "boolean"
|
|
||||||
},
|
|
||||||
"isFolder": {
|
"isFolder": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
@ -4495,7 +4492,7 @@
|
|||||||
"format": "int64",
|
"format": "int64",
|
||||||
"type": "integer"
|
"type": "integer"
|
||||||
},
|
},
|
||||||
"parent_uid": {
|
"parentUid": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"title": {
|
"title": {
|
||||||
@ -5764,34 +5761,6 @@
|
|||||||
},
|
},
|
||||||
"type": "array"
|
"type": "array"
|
||||||
},
|
},
|
||||||
"NotificationTemplate": {
|
|
||||||
"properties": {
|
|
||||||
"name": {
|
|
||||||
"type": "string"
|
|
||||||
},
|
|
||||||
"provenance": {
|
|
||||||
"$ref": "#/components/schemas/Provenance"
|
|
||||||
},
|
|
||||||
"template": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"type": "object"
|
|
||||||
},
|
|
||||||
"NotificationTemplateContent": {
|
|
||||||
"properties": {
|
|
||||||
"template": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"type": "object"
|
|
||||||
},
|
|
||||||
"NotificationTemplates": {
|
|
||||||
"items": {
|
|
||||||
"$ref": "#/components/schemas/NotificationTemplate"
|
|
||||||
},
|
|
||||||
"type": "array"
|
|
||||||
},
|
|
||||||
"Metadata": {
|
"Metadata": {
|
||||||
"additionalProperties": {
|
"additionalProperties": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
@ -5964,6 +5933,34 @@
|
|||||||
"title": "NoticeSeverity is a type for the Severity property of a Notice.",
|
"title": "NoticeSeverity is a type for the Severity property of a Notice.",
|
||||||
"type": "integer"
|
"type": "integer"
|
||||||
},
|
},
|
||||||
|
"NotificationTemplate": {
|
||||||
|
"properties": {
|
||||||
|
"name": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"provenance": {
|
||||||
|
"$ref": "#/components/schemas/Provenance"
|
||||||
|
},
|
||||||
|
"template": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"type": "object"
|
||||||
|
},
|
||||||
|
"NotificationTemplateContent": {
|
||||||
|
"properties": {
|
||||||
|
"template": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"type": "object"
|
||||||
|
},
|
||||||
|
"NotificationTemplates": {
|
||||||
|
"items": {
|
||||||
|
"$ref": "#/components/schemas/NotificationTemplate"
|
||||||
|
},
|
||||||
|
"type": "array"
|
||||||
|
},
|
||||||
"NotificationTestCommand": {
|
"NotificationTestCommand": {
|
||||||
"properties": {
|
"properties": {
|
||||||
"disableResolveMessage": {
|
"disableResolveMessage": {
|
||||||
@ -9893,7 +9890,6 @@
|
|||||||
"type": "object"
|
"type": "object"
|
||||||
},
|
},
|
||||||
"alertGroups": {
|
"alertGroups": {
|
||||||
"description": "AlertGroups alert groups",
|
|
||||||
"items": {
|
"items": {
|
||||||
"$ref": "#/components/schemas/alertGroup"
|
"$ref": "#/components/schemas/alertGroup"
|
||||||
},
|
},
|
||||||
@ -10054,14 +10050,12 @@
|
|||||||
"type": "object"
|
"type": "object"
|
||||||
},
|
},
|
||||||
"gettableAlerts": {
|
"gettableAlerts": {
|
||||||
"description": "GettableAlerts gettable alerts",
|
|
||||||
"items": {
|
"items": {
|
||||||
"$ref": "#/components/schemas/gettableAlert"
|
"$ref": "#/components/schemas/gettableAlert"
|
||||||
},
|
},
|
||||||
"type": "array"
|
"type": "array"
|
||||||
},
|
},
|
||||||
"gettableSilence": {
|
"gettableSilence": {
|
||||||
"description": "GettableSilence gettable silence",
|
|
||||||
"properties": {
|
"properties": {
|
||||||
"comment": {
|
"comment": {
|
||||||
"description": "comment",
|
"description": "comment",
|
||||||
@ -10110,7 +10104,6 @@
|
|||||||
"type": "object"
|
"type": "object"
|
||||||
},
|
},
|
||||||
"gettableSilences": {
|
"gettableSilences": {
|
||||||
"description": "GettableSilences gettable silences",
|
|
||||||
"items": {
|
"items": {
|
||||||
"$ref": "#/components/schemas/gettableSilence"
|
"$ref": "#/components/schemas/gettableSilence"
|
||||||
},
|
},
|
||||||
@ -10297,6 +10290,7 @@
|
|||||||
"type": "object"
|
"type": "object"
|
||||||
},
|
},
|
||||||
"receiver": {
|
"receiver": {
|
||||||
|
"description": "Receiver receiver",
|
||||||
"properties": {
|
"properties": {
|
||||||
"active": {
|
"active": {
|
||||||
"description": "active",
|
"description": "active",
|
||||||
@ -13835,7 +13829,7 @@
|
|||||||
"description": "ValidationError"
|
"description": "ValidationError"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"summary": "Updates an existing template.",
|
"summary": "Updates an existing notification template.",
|
||||||
"tags": [
|
"tags": [
|
||||||
"provisioning"
|
"provisioning"
|
||||||
]
|
]
|
||||||
@ -16131,7 +16125,7 @@
|
|||||||
},
|
},
|
||||||
"/folders": {
|
"/folders": {
|
||||||
"get": {
|
"get": {
|
||||||
"description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID.",
|
"description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders.",
|
||||||
"operationId": "getFolders",
|
"operationId": "getFolders",
|
||||||
"parameters": [
|
"parameters": [
|
||||||
{
|
{
|
||||||
@ -16157,7 +16151,7 @@
|
|||||||
{
|
{
|
||||||
"description": "The parent folder UID",
|
"description": "The parent folder UID",
|
||||||
"in": "query",
|
"in": "query",
|
||||||
"name": "parent_uid",
|
"name": "parentUid",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user