Skip to content

Commit cced61d

Browse files
enjeckenjeck
committed
fix: update openapi
Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
1 parent fb7f698 commit cced61d

File tree

4 files changed

+197
-108
lines changed

4 files changed

+197
-108
lines changed

‎lib/Migration/Version000800Date20240828000000.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
2828
/** @var ISchemaWrapper $schema */
2929
$schema = $schemaClosure();
3030

31-
if ($schema->hasTable('tables_columns')) {
32-
if ($schema->hasTable('tables_row_cells_usergroup')) {
33-
$table = $schema->getTable('tables_columns');
34-
if (!$table->hasColumn('usergroup_select_teams')) {
35-
$table->addColumn('usergroup_select_teams', Types::BOOLEAN, [
36-
'notnull' => false,
37-
'default' => 0,
38-
]);
39-
}
31+
if ($schema->hasTable('tables_columns')) {
32+
if ($schema->hasTable('tables_row_cells_usergroup')) {
33+
$table = $schema->getTable('tables_columns');
34+
if (!$table->hasColumn('usergroup_select_teams')) {
35+
$table->addColumn('usergroup_select_teams', Types::BOOLEAN, [
36+
'notnull' => false,
37+
'default' => 0,
38+
]);
39+
}
4040
}
4141
return $schema;
4242
}

‎openapi.json‎

Lines changed: 113 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
"usergroupMultipleItems",
9696
"usergroupSelectUsers",
9797
"usergroupSelectGroups",
98+
"usergroupSelectTeams",
9899
"showUserStatus"
99100
],
100101
"properties": {
@@ -190,6 +191,9 @@
190191
"usergroupSelectGroups": {
191192
"type": "boolean"
192193
},
194+
"usergroupSelectTeams": {
195+
"type": "boolean"
196+
},
193197
"showUserStatus": {
194198
"type": "boolean"
195199
}
@@ -2745,6 +2749,24 @@
27452749
"basic_auth": []
27462750
}
27472751
],
2752+
"requestBody": {
2753+
"required": false,
2754+
"content": {
2755+
"application/json": {
2756+
"schema": {
2757+
"type": "object",
2758+
"properties": {
2759+
"viewId": {
2760+
"type": "integer",
2761+
"format": "int64",
2762+
"nullable": true,
2763+
"description": "View ID"
2764+
}
2765+
}
2766+
}
2767+
}
2768+
}
2769+
},
27482770
"parameters": [
27492771
{
27502772
"name": "tableId",
@@ -2755,16 +2777,6 @@
27552777
"type": "integer",
27562778
"format": "int64"
27572779
}
2758-
},
2759-
{
2760-
"name": "viewId",
2761-
"in": "query",
2762-
"description": "View ID",
2763-
"schema": {
2764-
"type": "integer",
2765-
"format": "int64",
2766-
"nullable": true
2767-
}
27682780
}
27692781
],
27702782
"responses": {
@@ -2978,6 +2990,11 @@
29782990
"nullable": true,
29792991
"description": "Can select groups, if column type is usergroup"
29802992
},
2993+
"usergroupSelectTeams": {
2994+
"type": "boolean",
2995+
"nullable": true,
2996+
"description": "Can select teams, if column type is usergroup"
2997+
},
29812998
"usergroupShowUserStatus": {
29822999
"type": "boolean",
29833000
"nullable": true,
@@ -3327,6 +3344,11 @@
33273344
"nullable": true,
33283345
"description": "Can select groups, if column type is usergroup"
33293346
},
3347+
"usergroupSelectTeams": {
3348+
"type": "boolean",
3349+
"nullable": true,
3350+
"description": "Can select teams, if column type is usergroup"
3351+
},
33303352
"usergroupShowUserStatus": {
33313353
"type": "boolean",
33323354
"nullable": true,
@@ -3541,6 +3563,11 @@
35413563
"nullable": true,
35423564
"description": "Can select groups, if column type is usergroup"
35433565
},
3566+
"usergroupSelectTeams": {
3567+
"type": "boolean",
3568+
"nullable": true,
3569+
"description": "Can select teams, if column type is usergroup"
3570+
},
35443571
"usergroupShowUserStatus": {
35453572
"type": "boolean",
35463573
"nullable": true,
@@ -3787,6 +3814,30 @@
37873814
"basic_auth": []
37883815
}
37893816
],
3817+
"requestBody": {
3818+
"required": false,
3819+
"content": {
3820+
"application/json": {
3821+
"schema": {
3822+
"type": "object",
3823+
"properties": {
3824+
"limit": {
3825+
"type": "integer",
3826+
"format": "int64",
3827+
"nullable": true,
3828+
"description": "Limit"
3829+
},
3830+
"offset": {
3831+
"type": "integer",
3832+
"format": "int64",
3833+
"nullable": true,
3834+
"description": "Offset"
3835+
}
3836+
}
3837+
}
3838+
}
3839+
}
3840+
},
37903841
"parameters": [
37913842
{
37923843
"name": "tableId",
@@ -3797,26 +3848,6 @@
37973848
"type": "integer",
37983849
"format": "int64"
37993850
}
3800-
},
3801-
{
3802-
"name": "limit",
3803-
"in": "query",
3804-
"description": "Limit",
3805-
"schema": {
3806-
"type": "integer",
3807-
"format": "int64",
3808-
"nullable": true
3809-
}
3810-
},
3811-
{
3812-
"name": "offset",
3813-
"in": "query",
3814-
"description": "Offset",
3815-
"schema": {
3816-
"type": "integer",
3817-
"format": "int64",
3818-
"nullable": true
3819-
}
38203851
}
38213852
],
38223853
"responses": {
@@ -3902,6 +3933,30 @@
39023933
"basic_auth": []
39033934
}
39043935
],
3936+
"requestBody": {
3937+
"required": false,
3938+
"content": {
3939+
"application/json": {
3940+
"schema": {
3941+
"type": "object",
3942+
"properties": {
3943+
"limit": {
3944+
"type": "integer",
3945+
"format": "int64",
3946+
"nullable": true,
3947+
"description": "Limit"
3948+
},
3949+
"offset": {
3950+
"type": "integer",
3951+
"format": "int64",
3952+
"nullable": true,
3953+
"description": "Offset"
3954+
}
3955+
}
3956+
}
3957+
}
3958+
}
3959+
},
39053960
"parameters": [
39063961
{
39073962
"name": "tableId",
@@ -3912,26 +3967,6 @@
39123967
"type": "integer",
39133968
"format": "int64"
39143969
}
3915-
},
3916-
{
3917-
"name": "limit",
3918-
"in": "query",
3919-
"description": "Limit",
3920-
"schema": {
3921-
"type": "integer",
3922-
"format": "int64",
3923-
"nullable": true
3924-
}
3925-
},
3926-
{
3927-
"name": "offset",
3928-
"in": "query",
3929-
"description": "Offset",
3930-
"schema": {
3931-
"type": "integer",
3932-
"format": "int64",
3933-
"nullable": true
3934-
}
39353970
}
39363971
],
39373972
"responses": {
@@ -4118,6 +4153,30 @@
41184153
"basic_auth": []
41194154
}
41204155
],
4156+
"requestBody": {
4157+
"required": false,
4158+
"content": {
4159+
"application/json": {
4160+
"schema": {
4161+
"type": "object",
4162+
"properties": {
4163+
"limit": {
4164+
"type": "integer",
4165+
"format": "int64",
4166+
"nullable": true,
4167+
"description": "Limit"
4168+
},
4169+
"offset": {
4170+
"type": "integer",
4171+
"format": "int64",
4172+
"nullable": true,
4173+
"description": "Offset"
4174+
}
4175+
}
4176+
}
4177+
}
4178+
}
4179+
},
41214180
"parameters": [
41224181
{
41234182
"name": "viewId",
@@ -4128,26 +4187,6 @@
41284187
"type": "integer",
41294188
"format": "int64"
41304189
}
4131-
},
4132-
{
4133-
"name": "limit",
4134-
"in": "query",
4135-
"description": "Limit",
4136-
"schema": {
4137-
"type": "integer",
4138-
"format": "int64",
4139-
"nullable": true
4140-
}
4141-
},
4142-
{
4143-
"name": "offset",
4144-
"in": "query",
4145-
"description": "Offset",
4146-
"schema": {
4147-
"type": "integer",
4148-
"format": "int64",
4149-
"nullable": true
4150-
}
41514190
}
41524191
],
41534192
"responses": {
@@ -7895,6 +7934,10 @@
78957934
"type": "boolean",
78967935
"description": "Whether you can select groups"
78977936
},
7937+
"usergroupSelectTeams": {
7938+
"type": "boolean",
7939+
"description": "Whether you can select teams"
7940+
},
78987941
"showUserStatus": {
78997942
"type": "boolean",
79007943
"description": "Whether to show the user's status"

‎src/shared/mixins/searchUserGroup.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ export default {
6060
getShareTypeString() {
6161
const strings = []
6262
if (this.selectUsers) {
63-
strings.push('user')
63+
strings.push('User')
6464
}
6565
if (this.selectGroups) {
66-
strings.push('group')
66+
strings.push('Group')
6767
}
6868
if (this?.selectTeams) {
69-
strings.push('team')
69+
strings.push('Team')
7070
}
7171
return strings.join(' or ')
7272
},

0 commit comments

Comments
 (0)