Skip to content

Commit

Permalink
fix: update openapi
Browse files Browse the repository at this point in the history 
Signed-off-by: Cleopatra Enjeck M <[email protected]>
  • Loading branch information
@enjeck
enjeck committed Oct 2, 2024
1 parent 0c34758 commit 98fa8eb
Show file tree
Hide file tree
Showing 4 changed files with 197 additions and 108 deletions.
18 changes: 9 additions & 9 deletions lib/Migration/Version000800Date20240828000000.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
/** @var ISchemaWrapper $schema */
$schema = $schemaClosure();

if ($schema->hasTable('tables_columns')) {
if ($schema->hasTable('tables_row_cells_usergroup')) {
$table = $schema->getTable('tables_columns');
if (!$table->hasColumn('usergroup_select_teams')) {
$table->addColumn('usergroup_select_teams', Types::BOOLEAN, [
'notnull' => false,
'default' => 0,
]);
}
if ($schema->hasTable('tables_columns')) {
if ($schema->hasTable('tables_row_cells_usergroup')) {
$table = $schema->getTable('tables_columns');
if (!$table->hasColumn('usergroup_select_teams')) {
$table->addColumn('usergroup_select_teams', Types::BOOLEAN, [
'notnull' => false,
'default' => 0,
]);
}
}
return $schema;
}
Expand Down
183 changes: 113 additions & 70 deletions openapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
"usergroupMultipleItems",
"usergroupSelectUsers",
"usergroupSelectGroups",
"usergroupSelectTeams",
"showUserStatus"
],
"properties": {
Expand Down Expand Up @@ -190,6 +191,9 @@
"usergroupSelectGroups": {
"type": "boolean"
},
"usergroupSelectTeams": {
"type": "boolean"
},
"showUserStatus": {
"type": "boolean"
}
Expand Down Expand Up @@ -2763,6 +2767,24 @@
"basic_auth": []
}
],
"requestBody": {
"required": false,
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"viewId": {
"type": "integer",
"format": "int64",
"nullable": true,
"description": "View ID"
}
}
}
}
}
},
"parameters": [
{
"name": "tableId",
Expand All @@ -2773,16 +2795,6 @@
"type": "integer",
"format": "int64"
}
},
{
"name": "viewId",
"in": "query",
"description": "View ID",
"schema": {
"type": "integer",
"format": "int64",
"nullable": true
}
}
],
"responses": {
Expand Down Expand Up @@ -2996,6 +3008,11 @@
"nullable": true,
"description": "Can select groups, if column type is usergroup"
},
"usergroupSelectTeams": {
"type": "boolean",
"nullable": true,
"description": "Can select teams, if column type is usergroup"
},
"usergroupShowUserStatus": {
"type": "boolean",
"nullable": true,
Expand Down Expand Up @@ -3345,6 +3362,11 @@
"nullable": true,
"description": "Can select groups, if column type is usergroup"
},
"usergroupSelectTeams": {
"type": "boolean",
"nullable": true,
"description": "Can select teams, if column type is usergroup"
},
"usergroupShowUserStatus": {
"type": "boolean",
"nullable": true,
Expand Down Expand Up @@ -3559,6 +3581,11 @@
"nullable": true,
"description": "Can select groups, if column type is usergroup"
},
"usergroupSelectTeams": {
"type": "boolean",
"nullable": true,
"description": "Can select teams, if column type is usergroup"
},
"usergroupShowUserStatus": {
"type": "boolean",
"nullable": true,
Expand Down Expand Up @@ -3805,6 +3832,30 @@
"basic_auth": []
}
],
"requestBody": {
"required": false,
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"limit": {
"type": "integer",
"format": "int64",
"nullable": true,
"description": "Limit"
},
"offset": {
"type": "integer",
"format": "int64",
"nullable": true,
"description": "Offset"
}
}
}
}
}
},
"parameters": [
{
"name": "tableId",
Expand All @@ -3815,26 +3866,6 @@
"type": "integer",
"format": "int64"
}
},
{
"name": "limit",
"in": "query",
"description": "Limit",
"schema": {
"type": "integer",
"format": "int64",
"nullable": true
}
},
{
"name": "offset",
"in": "query",
"description": "Offset",
"schema": {
"type": "integer",
"format": "int64",
"nullable": true
}
}
],
"responses": {
Expand Down Expand Up @@ -3920,6 +3951,30 @@
"basic_auth": []
}
],
"requestBody": {
"required": false,
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"limit": {
"type": "integer",
"format": "int64",
"nullable": true,
"description": "Limit"
},
"offset": {
"type": "integer",
"format": "int64",
"nullable": true,
"description": "Offset"
}
}
}
}
}
},
"parameters": [
{
"name": "tableId",
Expand All @@ -3930,26 +3985,6 @@
"type": "integer",
"format": "int64"
}
},
{
"name": "limit",
"in": "query",
"description": "Limit",
"schema": {
"type": "integer",
"format": "int64",
"nullable": true
}
},
{
"name": "offset",
"in": "query",
"description": "Offset",
"schema": {
"type": "integer",
"format": "int64",
"nullable": true
}
}
],
"responses": {
Expand Down Expand Up @@ -4136,6 +4171,30 @@
"basic_auth": []
}
],
"requestBody": {
"required": false,
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"limit": {
"type": "integer",
"format": "int64",
"nullable": true,
"description": "Limit"
},
"offset": {
"type": "integer",
"format": "int64",
"nullable": true,
"description": "Offset"
}
}
}
}
}
},
"parameters": [
{
"name": "viewId",
Expand All @@ -4146,26 +4205,6 @@
"type": "integer",
"format": "int64"
}
},
{
"name": "limit",
"in": "query",
"description": "Limit",
"schema": {
"type": "integer",
"format": "int64",
"nullable": true
}
},
{
"name": "offset",
"in": "query",
"description": "Offset",
"schema": {
"type": "integer",
"format": "int64",
"nullable": true
}
}
],
"responses": {
Expand Down Expand Up @@ -7913,6 +7952,10 @@
"type": "boolean",
"description": "Whether you can select groups"
},
"usergroupSelectTeams": {
"type": "boolean",
"description": "Whether you can select teams"
},
"showUserStatus": {
"type": "boolean",
"description": "Whether to show the user's status"
Expand Down
6 changes: 3 additions & 3 deletions src/shared/mixins/searchUserGroup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ export default {
getShareTypeString() {
const strings = []
if (this.selectUsers) {
strings.push('user')
strings.push('User')
}
if (this.selectGroups) {
strings.push('group')
strings.push('Group')
}
if (this?.selectTeams) {
strings.push('team')
strings.push('Team')
}
return strings.join(' or ')
},
Expand Down
Loading

0 comments on commit 98fa8eb

Please sign in to comment.