From 640e8b79ab2ed4f6bcc1ba5d9dcd380c5757454b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 22:19:07 +0000 Subject: [PATCH] feat(nextcloud)!: Support tables 0.9 Signed-off-by: provokateurin --- .gitmodules | 2 +- external/nextcloud-tables | 2 +- .../lib/src/api/core/core.openapi.dart | 1 + .../lib/src/api/core/core.openapi.g.dart | 27 +++- .../lib/src/api/core/core.openapi.json | 3 + .../tables/patches/0-compatibility-0.8.json | 13 ++ ...lity-0.6.json => 1-compatibility-0.6.json} | 0 .../lib/src/api/tables/tables.openapi.dart | 27 +++- .../lib/src/api/tables/tables.openapi.g.dart | 145 +++++++++++++++++- .../lib/src/api/tables/tables.openapi.json | 39 ++++- 10 files changed, 249 insertions(+), 10 deletions(-) create mode 100644 packages/nextcloud/lib/src/api/tables/patches/0-compatibility-0.8.json rename packages/nextcloud/lib/src/api/tables/patches/{0-compatibility-0.6.json => 1-compatibility-0.6.json} (100%) diff --git a/.gitmodules b/.gitmodules index b66666a9af1..d5770ea28f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,7 +33,7 @@ [submodule "external/nextcloud-tables"] path = external/nextcloud-tables url = https://github.com/nextcloud/tables - branch = v0.8.0 + branch = v0.9.0 [submodule "external/emoji-metadata"] path = external/emoji-metadata url = https://github.com/googlefonts/emoji-metadata diff --git a/external/nextcloud-tables b/external/nextcloud-tables index 412c2b31773..903a2312c88 160000 --- a/external/nextcloud-tables +++ b/external/nextcloud-tables @@ -1 +1 @@ -Subproject commit 412c2b3177305e5b84701067690ce1af31e7d58d +Subproject commit 903a2312c8885cfe83fe71db18f7c3de47a3dee8 diff --git a/packages/nextcloud/lib/src/api/core/core.openapi.dart b/packages/nextcloud/lib/src/api/core/core.openapi.dart index 84a6d1535cd..a0d25dd4be1 100644 --- a/packages/nextcloud/lib/src/api/core/core.openapi.dart +++ b/packages/nextcloud/lib/src/api/core/core.openapi.dart @@ -15994,6 +15994,7 @@ sealed class $TablesCapabilities_TablesInterface { String get version; BuiltList get apiVersions; BuiltList get features; + bool? get isCirclesEnabled; @BuiltValueField(wireName: 'column_types') BuiltList get columnTypes; diff --git a/packages/nextcloud/lib/src/api/core/core.openapi.g.dart b/packages/nextcloud/lib/src/api/core/core.openapi.g.dart index 47340a51495..5160f551f51 100644 --- a/packages/nextcloud/lib/src/api/core/core.openapi.g.dart +++ b/packages/nextcloud/lib/src/api/core/core.openapi.g.dart @@ -7677,7 +7677,13 @@ class _$TablesCapabilities_TablesSerializer implements StructuredSerializer); break; + case 'isCirclesEnabled': + result.isCirclesEnabled = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; + break; case 'column_types': result.columnTypes.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltList, const [const FullType(String)]))! as BuiltList); @@ -32171,6 +32180,9 @@ abstract mixin class $TablesCapabilities_TablesInterfaceBuilder { ListBuilder get features; set features(ListBuilder? features); + bool? get isCirclesEnabled; + set isCirclesEnabled(bool? isCirclesEnabled); + ListBuilder get columnTypes; set columnTypes(ListBuilder? columnTypes); } @@ -32185,6 +32197,8 @@ class _$TablesCapabilities_Tables extends TablesCapabilities_Tables { @override final BuiltList features; @override + final bool? isCirclesEnabled; + @override final BuiltList columnTypes; factory _$TablesCapabilities_Tables([void Function(TablesCapabilities_TablesBuilder)? updates]) => @@ -32195,6 +32209,7 @@ class _$TablesCapabilities_Tables extends TablesCapabilities_Tables { required this.version, required this.apiVersions, required this.features, + this.isCirclesEnabled, required this.columnTypes}) : super._() { BuiltValueNullFieldError.checkNotNull(enabled, r'TablesCapabilities_Tables', 'enabled'); @@ -32219,6 +32234,7 @@ class _$TablesCapabilities_Tables extends TablesCapabilities_Tables { version == other.version && apiVersions == other.apiVersions && features == other.features && + isCirclesEnabled == other.isCirclesEnabled && columnTypes == other.columnTypes; } @@ -32229,6 +32245,7 @@ class _$TablesCapabilities_Tables extends TablesCapabilities_Tables { _$hash = $jc(_$hash, version.hashCode); _$hash = $jc(_$hash, apiVersions.hashCode); _$hash = $jc(_$hash, features.hashCode); + _$hash = $jc(_$hash, isCirclesEnabled.hashCode); _$hash = $jc(_$hash, columnTypes.hashCode); _$hash = $jf(_$hash); return _$hash; @@ -32241,6 +32258,7 @@ class _$TablesCapabilities_Tables extends TablesCapabilities_Tables { ..add('version', version) ..add('apiVersions', apiVersions) ..add('features', features) + ..add('isCirclesEnabled', isCirclesEnabled) ..add('columnTypes', columnTypes)) .toString(); } @@ -32268,6 +32286,10 @@ class TablesCapabilities_TablesBuilder ListBuilder get features => _$this._features ??= new ListBuilder(); set features(covariant ListBuilder? features) => _$this._features = features; + bool? _isCirclesEnabled; + bool? get isCirclesEnabled => _$this._isCirclesEnabled; + set isCirclesEnabled(covariant bool? isCirclesEnabled) => _$this._isCirclesEnabled = isCirclesEnabled; + ListBuilder? _columnTypes; ListBuilder get columnTypes => _$this._columnTypes ??= new ListBuilder(); set columnTypes(covariant ListBuilder? columnTypes) => _$this._columnTypes = columnTypes; @@ -32283,6 +32305,7 @@ class TablesCapabilities_TablesBuilder _version = $v.version; _apiVersions = $v.apiVersions.toBuilder(); _features = $v.features.toBuilder(); + _isCirclesEnabled = $v.isCirclesEnabled; _columnTypes = $v.columnTypes.toBuilder(); _$v = null; } @@ -32313,6 +32336,7 @@ class TablesCapabilities_TablesBuilder version: BuiltValueNullFieldError.checkNotNull(version, r'TablesCapabilities_Tables', 'version'), apiVersions: apiVersions.build(), features: features.build(), + isCirclesEnabled: isCirclesEnabled, columnTypes: columnTypes.build(), ); } catch (_) { @@ -32322,6 +32346,7 @@ class TablesCapabilities_TablesBuilder apiVersions.build(); _$failedField = 'features'; features.build(); + _$failedField = 'columnTypes'; columnTypes.build(); } catch (e) { diff --git a/packages/nextcloud/lib/src/api/core/core.openapi.json b/packages/nextcloud/lib/src/api/core/core.openapi.json index 30d103efeae..1b3ebcf21fc 100644 --- a/packages/nextcloud/lib/src/api/core/core.openapi.json +++ b/packages/nextcloud/lib/src/api/core/core.openapi.json @@ -2055,6 +2055,9 @@ "type": "string" } }, + "isCirclesEnabled": { + "type": "boolean" + }, "column_types": { "type": "array", "items": { diff --git a/packages/nextcloud/lib/src/api/tables/patches/0-compatibility-0.8.json b/packages/nextcloud/lib/src/api/tables/patches/0-compatibility-0.8.json new file mode 100644 index 00000000000..df5eed0b4e3 --- /dev/null +++ b/packages/nextcloud/lib/src/api/tables/patches/0-compatibility-0.8.json @@ -0,0 +1,13 @@ +[ + { + "op": "replace", + "path": "/components/schemas/Capabilities/properties/tables/required", + "value": [ + "enabled", + "version", + "apiVersions", + "features", + "column_types" + ] + } +] diff --git a/packages/nextcloud/lib/src/api/tables/patches/0-compatibility-0.6.json b/packages/nextcloud/lib/src/api/tables/patches/1-compatibility-0.6.json similarity index 100% rename from packages/nextcloud/lib/src/api/tables/patches/0-compatibility-0.6.json rename to packages/nextcloud/lib/src/api/tables/patches/1-compatibility-0.6.json diff --git a/packages/nextcloud/lib/src/api/tables/tables.openapi.dart b/packages/nextcloud/lib/src/api/tables/tables.openapi.dart index 4cfa5b03732..e6a26241c72 100644 --- a/packages/nextcloud/lib/src/api/tables/tables.openapi.dart +++ b/packages/nextcloud/lib/src/api/tables/tables.openapi.dart @@ -8240,7 +8240,7 @@ sealed class $Api1CreateShareRequestApplicationJsonInterface { )! as bool; static final _$displayMode = _$jsonSerializers.deserialize( - 0, + 2, specifiedType: const FullType(int), )! as int; @@ -8271,7 +8271,7 @@ sealed class $Api1CreateShareRequestApplicationJsonInterface { /// Permission if receiver can manage node. bool get permissionManage; - /// context shares only, whether it should appear in nav bar. 0: no, 1: recipients, 2: all. + /// context shares only, whether it should appear in nav bar. 0: no, 1: recipients, 2: all (default). Cf. Application::NAV_ENTRY_MODE_*. int get displayMode; /// Rebuilds the instance. @@ -8295,7 +8295,14 @@ sealed class $Api1CreateShareRequestApplicationJsonInterface { } @BuiltValueHook(finalizeBuilder: true) - static void _validate($Api1CreateShareRequestApplicationJsonInterfaceBuilder b) {} + static void _validate($Api1CreateShareRequestApplicationJsonInterfaceBuilder b) { + _i6.checkNumber( + b.displayMode, + 'displayMode', + maximum: 2, + minimum: 0, + ); + } } abstract class Api1CreateShareRequestApplicationJson @@ -8582,6 +8589,7 @@ sealed class $ColumnInterface { bool get usergroupMultipleItems; bool get usergroupSelectUsers; bool get usergroupSelectGroups; + bool get usergroupSelectTeams; bool get showUserStatus; /// Rebuilds the instance. @@ -8812,6 +8820,9 @@ sealed class $Api1CreateTableColumnRequestApplicationJsonInterface { /// Can select groups, if column type is usergroup. bool? get usergroupSelectGroups; + /// Can select teams, if column type is usergroup. + bool? get usergroupSelectTeams; + /// Whether to show the user's status, if column type is usergroup. bool? get usergroupShowUserStatus; @@ -9065,6 +9076,9 @@ sealed class $Api1CreateColumnRequestApplicationJsonInterface { /// Can select groups, if column type is usergroup. bool? get usergroupSelectGroups; + /// Can select teams, if column type is usergroup. + bool? get usergroupSelectTeams; + /// Whether to show the user's status, if column type is usergroup. bool? get usergroupShowUserStatus; @@ -9198,6 +9212,9 @@ sealed class $Api1UpdateColumnRequestApplicationJsonInterface { /// Can select groups, if column type is usergroup. bool? get usergroupSelectGroups; + /// Can select teams, if column type is usergroup. + bool? get usergroupSelectTeams; + /// Whether to show the user's status, if column type is usergroup. bool? get usergroupShowUserStatus; @@ -11875,6 +11892,9 @@ sealed class $ApiColumnsCreateUsergroupColumnRequestApplicationJsonInterface { /// Whether you can select groups. bool? get usergroupSelectGroups; + /// Whether you can select teams. + bool? get usergroupSelectTeams; + /// Whether to show the user's status. bool? get showUserStatus; @@ -15532,6 +15552,7 @@ sealed class $Capabilities_TablesInterface { String get version; BuiltList get apiVersions; BuiltList get features; + bool? get isCirclesEnabled; @BuiltValueField(wireName: 'column_types') BuiltList get columnTypes; diff --git a/packages/nextcloud/lib/src/api/tables/tables.openapi.g.dart b/packages/nextcloud/lib/src/api/tables/tables.openapi.g.dart index d6196b31605..f42c491121a 100644 --- a/packages/nextcloud/lib/src/api/tables/tables.openapi.g.dart +++ b/packages/nextcloud/lib/src/api/tables/tables.openapi.g.dart @@ -2487,6 +2487,8 @@ class _$ColumnSerializer implements StructuredSerializer { serializers.serialize(object.usergroupSelectUsers, specifiedType: const FullType(bool)), 'usergroupSelectGroups', serializers.serialize(object.usergroupSelectGroups, specifiedType: const FullType(bool)), + 'usergroupSelectTeams', + serializers.serialize(object.usergroupSelectTeams, specifiedType: const FullType(bool)), 'showUserStatus', serializers.serialize(object.showUserStatus, specifiedType: const FullType(bool)), ]; @@ -2589,6 +2591,9 @@ class _$ColumnSerializer implements StructuredSerializer { case 'usergroupSelectGroups': result.usergroupSelectGroups = serializers.deserialize(value, specifiedType: const FullType(bool))! as bool; break; + case 'usergroupSelectTeams': + result.usergroupSelectTeams = serializers.deserialize(value, specifiedType: const FullType(bool))! as bool; + break; case 'showUserStatus': result.showUserStatus = serializers.deserialize(value, specifiedType: const FullType(bool))! as bool; break; @@ -2730,6 +2735,12 @@ class _$Api1CreateTableColumnRequestApplicationJsonSerializer ..add('usergroupSelectGroups') ..add(serializers.serialize(value, specifiedType: const FullType(bool))); } + value = object.usergroupSelectTeams; + if (value != null) { + result + ..add('usergroupSelectTeams') + ..add(serializers.serialize(value, specifiedType: const FullType(bool))); + } value = object.usergroupShowUserStatus; if (value != null) { result @@ -2821,6 +2832,9 @@ class _$Api1CreateTableColumnRequestApplicationJsonSerializer case 'usergroupSelectGroups': result.usergroupSelectGroups = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; break; + case 'usergroupSelectTeams': + result.usergroupSelectTeams = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; + break; case 'usergroupShowUserStatus': result.usergroupShowUserStatus = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; break; @@ -2974,6 +2988,12 @@ class _$Api1CreateColumnRequestApplicationJsonSerializer ..add('usergroupSelectGroups') ..add(serializers.serialize(value, specifiedType: const FullType(bool))); } + value = object.usergroupSelectTeams; + if (value != null) { + result + ..add('usergroupSelectTeams') + ..add(serializers.serialize(value, specifiedType: const FullType(bool))); + } value = object.usergroupShowUserStatus; if (value != null) { result @@ -3071,6 +3091,9 @@ class _$Api1CreateColumnRequestApplicationJsonSerializer case 'usergroupSelectGroups': result.usergroupSelectGroups = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; break; + case 'usergroupSelectTeams': + result.usergroupSelectTeams = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; + break; case 'usergroupShowUserStatus': result.usergroupShowUserStatus = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; break; @@ -3214,6 +3237,12 @@ class _$Api1UpdateColumnRequestApplicationJsonSerializer ..add('usergroupSelectGroups') ..add(serializers.serialize(value, specifiedType: const FullType(bool))); } + value = object.usergroupSelectTeams; + if (value != null) { + result + ..add('usergroupSelectTeams') + ..add(serializers.serialize(value, specifiedType: const FullType(bool))); + } value = object.usergroupShowUserStatus; if (value != null) { result @@ -3294,6 +3323,9 @@ class _$Api1UpdateColumnRequestApplicationJsonSerializer case 'usergroupSelectGroups': result.usergroupSelectGroups = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; break; + case 'usergroupSelectTeams': + result.usergroupSelectTeams = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; + break; case 'usergroupShowUserStatus': result.usergroupShowUserStatus = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; break; @@ -4855,6 +4887,12 @@ class _$ApiColumnsCreateUsergroupColumnRequestApplicationJsonSerializer ..add('usergroupSelectGroups') ..add(serializers.serialize(value, specifiedType: const FullType(bool))); } + value = object.usergroupSelectTeams; + if (value != null) { + result + ..add('usergroupSelectTeams') + ..add(serializers.serialize(value, specifiedType: const FullType(bool))); + } value = object.showUserStatus; if (value != null) { result @@ -4906,6 +4944,9 @@ class _$ApiColumnsCreateUsergroupColumnRequestApplicationJsonSerializer case 'usergroupSelectGroups': result.usergroupSelectGroups = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; break; + case 'usergroupSelectTeams': + result.usergroupSelectTeams = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; + break; case 'showUserStatus': result.showUserStatus = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; break; @@ -7509,7 +7550,13 @@ class _$Capabilities_TablesSerializer implements StructuredSerializer); break; + case 'isCirclesEnabled': + result.isCirclesEnabled = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool?; + break; case 'column_types': result.columnTypes.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltList, const [const FullType(String)]))! as BuiltList); @@ -11420,6 +11470,9 @@ abstract mixin class $ColumnInterfaceBuilder { bool? get usergroupSelectGroups; set usergroupSelectGroups(bool? usergroupSelectGroups); + bool? get usergroupSelectTeams; + set usergroupSelectTeams(bool? usergroupSelectTeams); + bool? get showUserStatus; set showUserStatus(bool? showUserStatus); } @@ -11482,6 +11535,8 @@ class _$Column extends Column { @override final bool usergroupSelectGroups; @override + final bool usergroupSelectTeams; + @override final bool showUserStatus; factory _$Column([void Function(ColumnBuilder)? updates]) => (new ColumnBuilder()..update(updates))._build(); @@ -11515,6 +11570,7 @@ class _$Column extends Column { required this.usergroupMultipleItems, required this.usergroupSelectUsers, required this.usergroupSelectGroups, + required this.usergroupSelectTeams, required this.showUserStatus}) : super._() { BuiltValueNullFieldError.checkNotNull(id, r'Column', 'id'); @@ -11545,6 +11601,7 @@ class _$Column extends Column { BuiltValueNullFieldError.checkNotNull(usergroupMultipleItems, r'Column', 'usergroupMultipleItems'); BuiltValueNullFieldError.checkNotNull(usergroupSelectUsers, r'Column', 'usergroupSelectUsers'); BuiltValueNullFieldError.checkNotNull(usergroupSelectGroups, r'Column', 'usergroupSelectGroups'); + BuiltValueNullFieldError.checkNotNull(usergroupSelectTeams, r'Column', 'usergroupSelectTeams'); BuiltValueNullFieldError.checkNotNull(showUserStatus, r'Column', 'showUserStatus'); } @@ -11586,6 +11643,7 @@ class _$Column extends Column { usergroupMultipleItems == other.usergroupMultipleItems && usergroupSelectUsers == other.usergroupSelectUsers && usergroupSelectGroups == other.usergroupSelectGroups && + usergroupSelectTeams == other.usergroupSelectTeams && showUserStatus == other.showUserStatus; } @@ -11620,6 +11678,7 @@ class _$Column extends Column { _$hash = $jc(_$hash, usergroupMultipleItems.hashCode); _$hash = $jc(_$hash, usergroupSelectUsers.hashCode); _$hash = $jc(_$hash, usergroupSelectGroups.hashCode); + _$hash = $jc(_$hash, usergroupSelectTeams.hashCode); _$hash = $jc(_$hash, showUserStatus.hashCode); _$hash = $jf(_$hash); return _$hash; @@ -11656,6 +11715,7 @@ class _$Column extends Column { ..add('usergroupMultipleItems', usergroupMultipleItems) ..add('usergroupSelectUsers', usergroupSelectUsers) ..add('usergroupSelectGroups', usergroupSelectGroups) + ..add('usergroupSelectTeams', usergroupSelectTeams) ..add('showUserStatus', showUserStatus)) .toString(); } @@ -11778,6 +11838,10 @@ class ColumnBuilder implements Builder, $ColumnInterfaceB set usergroupSelectGroups(covariant bool? usergroupSelectGroups) => _$this._usergroupSelectGroups = usergroupSelectGroups; + bool? _usergroupSelectTeams; + bool? get usergroupSelectTeams => _$this._usergroupSelectTeams; + set usergroupSelectTeams(covariant bool? usergroupSelectTeams) => _$this._usergroupSelectTeams = usergroupSelectTeams; + bool? _showUserStatus; bool? get showUserStatus => _$this._showUserStatus; set showUserStatus(covariant bool? showUserStatus) => _$this._showUserStatus = showUserStatus; @@ -11817,6 +11881,7 @@ class ColumnBuilder implements Builder, $ColumnInterfaceB _usergroupMultipleItems = $v.usergroupMultipleItems; _usergroupSelectUsers = $v.usergroupSelectUsers; _usergroupSelectGroups = $v.usergroupSelectGroups; + _usergroupSelectTeams = $v.usergroupSelectTeams; _showUserStatus = $v.showUserStatus; _$v = null; } @@ -11873,6 +11938,8 @@ class ColumnBuilder implements Builder, $ColumnInterfaceB BuiltValueNullFieldError.checkNotNull(usergroupSelectUsers, r'Column', 'usergroupSelectUsers'), usergroupSelectGroups: BuiltValueNullFieldError.checkNotNull(usergroupSelectGroups, r'Column', 'usergroupSelectGroups'), + usergroupSelectTeams: + BuiltValueNullFieldError.checkNotNull(usergroupSelectTeams, r'Column', 'usergroupSelectTeams'), showUserStatus: BuiltValueNullFieldError.checkNotNull(showUserStatus, r'Column', 'showUserStatus'), ); replace(_$result); @@ -11946,6 +12013,9 @@ abstract mixin class $Api1CreateTableColumnRequestApplicationJsonInterfaceBuilde bool? get usergroupSelectGroups; set usergroupSelectGroups(bool? usergroupSelectGroups); + bool? get usergroupSelectTeams; + set usergroupSelectTeams(bool? usergroupSelectTeams); + bool? get usergroupShowUserStatus; set usergroupShowUserStatus(bool? usergroupShowUserStatus); @@ -11997,6 +12067,8 @@ class _$Api1CreateTableColumnRequestApplicationJson extends Api1CreateTableColum @override final bool? usergroupSelectGroups; @override + final bool? usergroupSelectTeams; + @override final bool? usergroupShowUserStatus; @override final BuiltList? selectedViewIds; @@ -12027,6 +12099,7 @@ class _$Api1CreateTableColumnRequestApplicationJson extends Api1CreateTableColum this.usergroupMultipleItems, this.usergroupSelectUsers, this.usergroupSelectGroups, + this.usergroupSelectTeams, this.usergroupShowUserStatus, this.selectedViewIds}) : super._() { @@ -12069,6 +12142,7 @@ class _$Api1CreateTableColumnRequestApplicationJson extends Api1CreateTableColum usergroupMultipleItems == other.usergroupMultipleItems && usergroupSelectUsers == other.usergroupSelectUsers && usergroupSelectGroups == other.usergroupSelectGroups && + usergroupSelectTeams == other.usergroupSelectTeams && usergroupShowUserStatus == other.usergroupShowUserStatus && selectedViewIds == other.selectedViewIds; } @@ -12097,6 +12171,7 @@ class _$Api1CreateTableColumnRequestApplicationJson extends Api1CreateTableColum _$hash = $jc(_$hash, usergroupMultipleItems.hashCode); _$hash = $jc(_$hash, usergroupSelectUsers.hashCode); _$hash = $jc(_$hash, usergroupSelectGroups.hashCode); + _$hash = $jc(_$hash, usergroupSelectTeams.hashCode); _$hash = $jc(_$hash, usergroupShowUserStatus.hashCode); _$hash = $jc(_$hash, selectedViewIds.hashCode); _$hash = $jf(_$hash); @@ -12127,6 +12202,7 @@ class _$Api1CreateTableColumnRequestApplicationJson extends Api1CreateTableColum ..add('usergroupMultipleItems', usergroupMultipleItems) ..add('usergroupSelectUsers', usergroupSelectUsers) ..add('usergroupSelectGroups', usergroupSelectGroups) + ..add('usergroupSelectTeams', usergroupSelectTeams) ..add('usergroupShowUserStatus', usergroupShowUserStatus) ..add('selectedViewIds', selectedViewIds)) .toString(); @@ -12225,6 +12301,10 @@ class Api1CreateTableColumnRequestApplicationJsonBuilder set usergroupSelectGroups(covariant bool? usergroupSelectGroups) => _$this._usergroupSelectGroups = usergroupSelectGroups; + bool? _usergroupSelectTeams; + bool? get usergroupSelectTeams => _$this._usergroupSelectTeams; + set usergroupSelectTeams(covariant bool? usergroupSelectTeams) => _$this._usergroupSelectTeams = usergroupSelectTeams; + bool? _usergroupShowUserStatus; bool? get usergroupShowUserStatus => _$this._usergroupShowUserStatus; set usergroupShowUserStatus(covariant bool? usergroupShowUserStatus) => @@ -12262,6 +12342,7 @@ class Api1CreateTableColumnRequestApplicationJsonBuilder _usergroupMultipleItems = $v.usergroupMultipleItems; _usergroupSelectUsers = $v.usergroupSelectUsers; _usergroupSelectGroups = $v.usergroupSelectGroups; + _usergroupSelectTeams = $v.usergroupSelectTeams; _usergroupShowUserStatus = $v.usergroupShowUserStatus; _selectedViewIds = $v.selectedViewIds?.toBuilder(); _$v = null; @@ -12312,6 +12393,7 @@ class Api1CreateTableColumnRequestApplicationJsonBuilder usergroupMultipleItems: usergroupMultipleItems, usergroupSelectUsers: usergroupSelectUsers, usergroupSelectGroups: usergroupSelectGroups, + usergroupSelectTeams: usergroupSelectTeams, usergroupShowUserStatus: usergroupShowUserStatus, selectedViewIds: _selectedViewIds?.build(), ); @@ -12403,6 +12485,9 @@ abstract mixin class $Api1CreateColumnRequestApplicationJsonInterfaceBuilder { bool? get usergroupSelectGroups; set usergroupSelectGroups(bool? usergroupSelectGroups); + bool? get usergroupSelectTeams; + set usergroupSelectTeams(bool? usergroupSelectTeams); + bool? get usergroupShowUserStatus; set usergroupShowUserStatus(bool? usergroupShowUserStatus); @@ -12458,6 +12543,8 @@ class _$Api1CreateColumnRequestApplicationJson extends Api1CreateColumnRequestAp @override final bool? usergroupSelectGroups; @override + final bool? usergroupSelectTeams; + @override final bool? usergroupShowUserStatus; @override final BuiltList? selectedViewIds; @@ -12490,6 +12577,7 @@ class _$Api1CreateColumnRequestApplicationJson extends Api1CreateColumnRequestAp this.usergroupMultipleItems, this.usergroupSelectUsers, this.usergroupSelectGroups, + this.usergroupSelectTeams, this.usergroupShowUserStatus, this.selectedViewIds}) : super._() { @@ -12534,6 +12622,7 @@ class _$Api1CreateColumnRequestApplicationJson extends Api1CreateColumnRequestAp usergroupMultipleItems == other.usergroupMultipleItems && usergroupSelectUsers == other.usergroupSelectUsers && usergroupSelectGroups == other.usergroupSelectGroups && + usergroupSelectTeams == other.usergroupSelectTeams && usergroupShowUserStatus == other.usergroupShowUserStatus && selectedViewIds == other.selectedViewIds; } @@ -12564,6 +12653,7 @@ class _$Api1CreateColumnRequestApplicationJson extends Api1CreateColumnRequestAp _$hash = $jc(_$hash, usergroupMultipleItems.hashCode); _$hash = $jc(_$hash, usergroupSelectUsers.hashCode); _$hash = $jc(_$hash, usergroupSelectGroups.hashCode); + _$hash = $jc(_$hash, usergroupSelectTeams.hashCode); _$hash = $jc(_$hash, usergroupShowUserStatus.hashCode); _$hash = $jc(_$hash, selectedViewIds.hashCode); _$hash = $jf(_$hash); @@ -12596,6 +12686,7 @@ class _$Api1CreateColumnRequestApplicationJson extends Api1CreateColumnRequestAp ..add('usergroupMultipleItems', usergroupMultipleItems) ..add('usergroupSelectUsers', usergroupSelectUsers) ..add('usergroupSelectGroups', usergroupSelectGroups) + ..add('usergroupSelectTeams', usergroupSelectTeams) ..add('usergroupShowUserStatus', usergroupShowUserStatus) ..add('selectedViewIds', selectedViewIds)) .toString(); @@ -12702,6 +12793,10 @@ class Api1CreateColumnRequestApplicationJsonBuilder set usergroupSelectGroups(covariant bool? usergroupSelectGroups) => _$this._usergroupSelectGroups = usergroupSelectGroups; + bool? _usergroupSelectTeams; + bool? get usergroupSelectTeams => _$this._usergroupSelectTeams; + set usergroupSelectTeams(covariant bool? usergroupSelectTeams) => _$this._usergroupSelectTeams = usergroupSelectTeams; + bool? _usergroupShowUserStatus; bool? get usergroupShowUserStatus => _$this._usergroupShowUserStatus; set usergroupShowUserStatus(covariant bool? usergroupShowUserStatus) => @@ -12741,6 +12836,7 @@ class Api1CreateColumnRequestApplicationJsonBuilder _usergroupMultipleItems = $v.usergroupMultipleItems; _usergroupSelectUsers = $v.usergroupSelectUsers; _usergroupSelectGroups = $v.usergroupSelectGroups; + _usergroupSelectTeams = $v.usergroupSelectTeams; _usergroupShowUserStatus = $v.usergroupShowUserStatus; _selectedViewIds = $v.selectedViewIds?.toBuilder(); _$v = null; @@ -12792,6 +12888,7 @@ class Api1CreateColumnRequestApplicationJsonBuilder usergroupMultipleItems: usergroupMultipleItems, usergroupSelectUsers: usergroupSelectUsers, usergroupSelectGroups: usergroupSelectGroups, + usergroupSelectTeams: usergroupSelectTeams, usergroupShowUserStatus: usergroupShowUserStatus, selectedViewIds: _selectedViewIds?.build(), ); @@ -12873,6 +12970,9 @@ abstract mixin class $Api1UpdateColumnRequestApplicationJsonInterfaceBuilder { bool? get usergroupSelectGroups; set usergroupSelectGroups(bool? usergroupSelectGroups); + bool? get usergroupSelectTeams; + set usergroupSelectTeams(bool? usergroupSelectTeams); + bool? get usergroupShowUserStatus; set usergroupShowUserStatus(bool? usergroupShowUserStatus); } @@ -12919,6 +13019,8 @@ class _$Api1UpdateColumnRequestApplicationJson extends Api1UpdateColumnRequestAp @override final bool? usergroupSelectGroups; @override + final bool? usergroupSelectTeams; + @override final bool? usergroupShowUserStatus; factory _$Api1UpdateColumnRequestApplicationJson( @@ -12946,6 +13048,7 @@ class _$Api1UpdateColumnRequestApplicationJson extends Api1UpdateColumnRequestAp this.usergroupMultipleItems, this.usergroupSelectUsers, this.usergroupSelectGroups, + this.usergroupSelectTeams, this.usergroupShowUserStatus}) : super._() { BuiltValueNullFieldError.checkNotNull(mandatory, r'Api1UpdateColumnRequestApplicationJson', 'mandatory'); @@ -12984,6 +13087,7 @@ class _$Api1UpdateColumnRequestApplicationJson extends Api1UpdateColumnRequestAp usergroupMultipleItems == other.usergroupMultipleItems && usergroupSelectUsers == other.usergroupSelectUsers && usergroupSelectGroups == other.usergroupSelectGroups && + usergroupSelectTeams == other.usergroupSelectTeams && usergroupShowUserStatus == other.usergroupShowUserStatus; } @@ -13010,6 +13114,7 @@ class _$Api1UpdateColumnRequestApplicationJson extends Api1UpdateColumnRequestAp _$hash = $jc(_$hash, usergroupMultipleItems.hashCode); _$hash = $jc(_$hash, usergroupSelectUsers.hashCode); _$hash = $jc(_$hash, usergroupSelectGroups.hashCode); + _$hash = $jc(_$hash, usergroupSelectTeams.hashCode); _$hash = $jc(_$hash, usergroupShowUserStatus.hashCode); _$hash = $jf(_$hash); return _$hash; @@ -13038,6 +13143,7 @@ class _$Api1UpdateColumnRequestApplicationJson extends Api1UpdateColumnRequestAp ..add('usergroupMultipleItems', usergroupMultipleItems) ..add('usergroupSelectUsers', usergroupSelectUsers) ..add('usergroupSelectGroups', usergroupSelectGroups) + ..add('usergroupSelectTeams', usergroupSelectTeams) ..add('usergroupShowUserStatus', usergroupShowUserStatus)) .toString(); } @@ -13131,6 +13237,10 @@ class Api1UpdateColumnRequestApplicationJsonBuilder set usergroupSelectGroups(covariant bool? usergroupSelectGroups) => _$this._usergroupSelectGroups = usergroupSelectGroups; + bool? _usergroupSelectTeams; + bool? get usergroupSelectTeams => _$this._usergroupSelectTeams; + set usergroupSelectTeams(covariant bool? usergroupSelectTeams) => _$this._usergroupSelectTeams = usergroupSelectTeams; + bool? _usergroupShowUserStatus; bool? get usergroupShowUserStatus => _$this._usergroupShowUserStatus; set usergroupShowUserStatus(covariant bool? usergroupShowUserStatus) => @@ -13163,6 +13273,7 @@ class Api1UpdateColumnRequestApplicationJsonBuilder _usergroupMultipleItems = $v.usergroupMultipleItems; _usergroupSelectUsers = $v.usergroupSelectUsers; _usergroupSelectGroups = $v.usergroupSelectGroups; + _usergroupSelectTeams = $v.usergroupSelectTeams; _usergroupShowUserStatus = $v.usergroupShowUserStatus; _$v = null; } @@ -13208,6 +13319,7 @@ class Api1UpdateColumnRequestApplicationJsonBuilder usergroupMultipleItems: usergroupMultipleItems, usergroupSelectUsers: usergroupSelectUsers, usergroupSelectGroups: usergroupSelectGroups, + usergroupSelectTeams: usergroupSelectTeams, usergroupShowUserStatus: usergroupShowUserStatus, ); replace(_$result); @@ -16898,6 +17010,9 @@ abstract mixin class $ApiColumnsCreateUsergroupColumnRequestApplicationJsonInter bool? get usergroupSelectGroups; set usergroupSelectGroups(bool? usergroupSelectGroups); + bool? get usergroupSelectTeams; + set usergroupSelectTeams(bool? usergroupSelectTeams); + bool? get showUserStatus; set showUserStatus(bool? showUserStatus); @@ -16929,6 +17044,8 @@ class _$ApiColumnsCreateUsergroupColumnRequestApplicationJson @override final bool? usergroupSelectGroups; @override + final bool? usergroupSelectTeams; + @override final bool? showUserStatus; @override final String? description; @@ -16950,6 +17067,7 @@ class _$ApiColumnsCreateUsergroupColumnRequestApplicationJson this.usergroupMultipleItems, this.usergroupSelectUsers, this.usergroupSelectGroups, + this.usergroupSelectTeams, this.showUserStatus, this.description, this.selectedViewIds, @@ -16984,6 +17102,7 @@ class _$ApiColumnsCreateUsergroupColumnRequestApplicationJson usergroupMultipleItems == other.usergroupMultipleItems && usergroupSelectUsers == other.usergroupSelectUsers && usergroupSelectGroups == other.usergroupSelectGroups && + usergroupSelectTeams == other.usergroupSelectTeams && showUserStatus == other.showUserStatus && description == other.description && selectedViewIds == other.selectedViewIds && @@ -17000,6 +17119,7 @@ class _$ApiColumnsCreateUsergroupColumnRequestApplicationJson _$hash = $jc(_$hash, usergroupMultipleItems.hashCode); _$hash = $jc(_$hash, usergroupSelectUsers.hashCode); _$hash = $jc(_$hash, usergroupSelectGroups.hashCode); + _$hash = $jc(_$hash, usergroupSelectTeams.hashCode); _$hash = $jc(_$hash, showUserStatus.hashCode); _$hash = $jc(_$hash, description.hashCode); _$hash = $jc(_$hash, selectedViewIds.hashCode); @@ -17018,6 +17138,7 @@ class _$ApiColumnsCreateUsergroupColumnRequestApplicationJson ..add('usergroupMultipleItems', usergroupMultipleItems) ..add('usergroupSelectUsers', usergroupSelectUsers) ..add('usergroupSelectGroups', usergroupSelectGroups) + ..add('usergroupSelectTeams', usergroupSelectTeams) ..add('showUserStatus', showUserStatus) ..add('description', description) ..add('selectedViewIds', selectedViewIds) @@ -17060,6 +17181,10 @@ class ApiColumnsCreateUsergroupColumnRequestApplicationJsonBuilder set usergroupSelectGroups(covariant bool? usergroupSelectGroups) => _$this._usergroupSelectGroups = usergroupSelectGroups; + bool? _usergroupSelectTeams; + bool? get usergroupSelectTeams => _$this._usergroupSelectTeams; + set usergroupSelectTeams(covariant bool? usergroupSelectTeams) => _$this._usergroupSelectTeams = usergroupSelectTeams; + bool? _showUserStatus; bool? get showUserStatus => _$this._showUserStatus; set showUserStatus(covariant bool? showUserStatus) => _$this._showUserStatus = showUserStatus; @@ -17094,6 +17219,7 @@ class ApiColumnsCreateUsergroupColumnRequestApplicationJsonBuilder _usergroupMultipleItems = $v.usergroupMultipleItems; _usergroupSelectUsers = $v.usergroupSelectUsers; _usergroupSelectGroups = $v.usergroupSelectGroups; + _usergroupSelectTeams = $v.usergroupSelectTeams; _showUserStatus = $v.showUserStatus; _description = $v.description; _selectedViewIds = $v.selectedViewIds?.toBuilder(); @@ -17132,6 +17258,7 @@ class ApiColumnsCreateUsergroupColumnRequestApplicationJsonBuilder usergroupMultipleItems: usergroupMultipleItems, usergroupSelectUsers: usergroupSelectUsers, usergroupSelectGroups: usergroupSelectGroups, + usergroupSelectTeams: usergroupSelectTeams, showUserStatus: showUserStatus, description: description, selectedViewIds: _selectedViewIds?.build(), @@ -23766,6 +23893,9 @@ abstract mixin class $Capabilities_TablesInterfaceBuilder { ListBuilder get features; set features(ListBuilder? features); + bool? get isCirclesEnabled; + set isCirclesEnabled(bool? isCirclesEnabled); + ListBuilder get columnTypes; set columnTypes(ListBuilder? columnTypes); } @@ -23780,6 +23910,8 @@ class _$Capabilities_Tables extends Capabilities_Tables { @override final BuiltList features; @override + final bool? isCirclesEnabled; + @override final BuiltList columnTypes; factory _$Capabilities_Tables([void Function(Capabilities_TablesBuilder)? updates]) => @@ -23790,6 +23922,7 @@ class _$Capabilities_Tables extends Capabilities_Tables { required this.version, required this.apiVersions, required this.features, + this.isCirclesEnabled, required this.columnTypes}) : super._() { BuiltValueNullFieldError.checkNotNull(enabled, r'Capabilities_Tables', 'enabled'); @@ -23814,6 +23947,7 @@ class _$Capabilities_Tables extends Capabilities_Tables { version == other.version && apiVersions == other.apiVersions && features == other.features && + isCirclesEnabled == other.isCirclesEnabled && columnTypes == other.columnTypes; } @@ -23824,6 +23958,7 @@ class _$Capabilities_Tables extends Capabilities_Tables { _$hash = $jc(_$hash, version.hashCode); _$hash = $jc(_$hash, apiVersions.hashCode); _$hash = $jc(_$hash, features.hashCode); + _$hash = $jc(_$hash, isCirclesEnabled.hashCode); _$hash = $jc(_$hash, columnTypes.hashCode); _$hash = $jf(_$hash); return _$hash; @@ -23836,6 +23971,7 @@ class _$Capabilities_Tables extends Capabilities_Tables { ..add('version', version) ..add('apiVersions', apiVersions) ..add('features', features) + ..add('isCirclesEnabled', isCirclesEnabled) ..add('columnTypes', columnTypes)) .toString(); } @@ -23861,6 +23997,10 @@ class Capabilities_TablesBuilder ListBuilder get features => _$this._features ??= new ListBuilder(); set features(covariant ListBuilder? features) => _$this._features = features; + bool? _isCirclesEnabled; + bool? get isCirclesEnabled => _$this._isCirclesEnabled; + set isCirclesEnabled(covariant bool? isCirclesEnabled) => _$this._isCirclesEnabled = isCirclesEnabled; + ListBuilder? _columnTypes; ListBuilder get columnTypes => _$this._columnTypes ??= new ListBuilder(); set columnTypes(covariant ListBuilder? columnTypes) => _$this._columnTypes = columnTypes; @@ -23876,6 +24016,7 @@ class Capabilities_TablesBuilder _version = $v.version; _apiVersions = $v.apiVersions.toBuilder(); _features = $v.features.toBuilder(); + _isCirclesEnabled = $v.isCirclesEnabled; _columnTypes = $v.columnTypes.toBuilder(); _$v = null; } @@ -23906,6 +24047,7 @@ class Capabilities_TablesBuilder version: BuiltValueNullFieldError.checkNotNull(version, r'Capabilities_Tables', 'version'), apiVersions: apiVersions.build(), features: features.build(), + isCirclesEnabled: isCirclesEnabled, columnTypes: columnTypes.build(), ); } catch (_) { @@ -23915,6 +24057,7 @@ class Capabilities_TablesBuilder apiVersions.build(); _$failedField = 'features'; features.build(); + _$failedField = 'columnTypes'; columnTypes.build(); } catch (e) { diff --git a/packages/nextcloud/lib/src/api/tables/tables.openapi.json b/packages/nextcloud/lib/src/api/tables/tables.openapi.json index 6f0ef451546..e51695893cd 100644 --- a/packages/nextcloud/lib/src/api/tables/tables.openapi.json +++ b/packages/nextcloud/lib/src/api/tables/tables.openapi.json @@ -55,6 +55,9 @@ "type": "string" } }, + "isCirclesEnabled": { + "type": "boolean" + }, "column_types": { "type": "array", "items": { @@ -96,6 +99,7 @@ "usergroupMultipleItems", "usergroupSelectUsers", "usergroupSelectGroups", + "usergroupSelectTeams", "showUserStatus" ], "properties": { @@ -191,6 +195,9 @@ "usergroupSelectGroups": { "type": "boolean" }, + "usergroupSelectTeams": { + "type": "boolean" + }, "showUserStatus": { "type": "boolean" } @@ -2532,8 +2539,10 @@ "displayMode": { "type": "integer", "format": "int64", - "default": 0, - "description": "context shares only, whether it should appear in nav bar. 0: no, 1: recipients, 2: all" + "default": 2, + "description": "context shares only, whether it should appear in nav bar. 0: no, 1: recipients, 2: all (default). Cf. Application::NAV_ENTRY_MODE_*.", + "minimum": 0, + "maximum": 2 } } } @@ -2994,6 +3003,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, @@ -3343,6 +3357,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, @@ -3557,6 +3576,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, @@ -7891,6 +7915,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" @@ -10047,5 +10075,10 @@ } } }, - "tags": [] + "tags": [ + { + "name": "navigation", + "description": "This is a workaround until https://github.com/nextcloud/server/pull/49904 is settled in all covered NC versions; expected >= 31." + } + ] }