Merge branch 'main' into leszek/bump-storybook-version

Author: magicznyleszek

jsapp/js/api/models/inviteCreatePayload.ts

@@ -8,6 +8,6 @@
 import type { InviteeRoleEnum } from './inviteeRoleEnum'
 
 export interface InviteCreatePayload {
-  invitees: string[]
   role: InviteeRoleEnum
+  invitees: string[]
 }

jsapp/js/api/models/inviteResponse.ts

@@ -1,18 +1,18 @@
+import type { InviteStatusChoicesEnum } from './inviteStatusChoicesEnum'
 /**
  * Generated by orval v7.10.0 🍺
  * Do not edit manually.
  * KoboToolbox API
  * Powerful and intuitive data collection tools to make an impact
  * OpenAPI spec version: 2.0.0 (api_v2)
  */
-import type { InviteStatusChoicesEnum } from './inviteStatusChoicesEnum'
 import type { InviteeRoleEnum } from './inviteeRoleEnum'
 
 export interface InviteResponse {
+  invitee_role: InviteeRoleEnum
+  status: InviteStatusChoicesEnum
   url: string
   invited_by: string
-  status: InviteStatusChoicesEnum
-  invitee_role: InviteeRoleEnum
   organization_name: string
   created: string
   modified: string

jsapp/js/api/models/memberListResponse.ts

@@ -6,15 +6,15 @@ import type { MemberListResponseInvite } from './memberListResponseInvite'
  * Powerful and intuitive data collection tools to make an impact
  * OpenAPI spec version: 2.0.0 (api_v2)
  */
-import type { MemberListResponseRoleEnum } from './memberListResponseRoleEnum'
+import type { MemberRoleEnum } from './memberRoleEnum'
 
 export interface MemberListResponse {
   url: string
   user: string
   user__username: string
   user__email: string
   user__extra_details__name: string
-  role: MemberListResponseRoleEnum
+  role: MemberRoleEnum
   user__has_mfa_enabled: boolean
   date_joined: string
   user__is_active: boolean

jsapp/js/api/models/memberListResponseRoleEnum.ts renamed to jsapp/js/api/models/memberRoleEnum.ts

@@ -11,10 +11,10 @@
  * `member` - member
  * `owner` - owner
  */
-export type MemberListResponseRoleEnum = (typeof MemberListResponseRoleEnum)[keyof typeof MemberListResponseRoleEnum]
+export type MemberRoleEnum = (typeof MemberRoleEnum)[keyof typeof MemberRoleEnum]
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
-export const MemberListResponseRoleEnum = {
+export const MemberRoleEnum = {
   admin: 'admin',
   member: 'member',
   owner: 'owner',

jsapp/js/api/models/organization.ts

@@ -1,3 +1,4 @@
+import type { MemberRoleEnum } from './memberRoleEnum'
 /**
  * Generated by orval v7.10.0 🍺
  * Do not edit manually.
@@ -21,7 +22,7 @@ export interface Organization {
   readonly modified: string
   readonly is_owner: boolean
   readonly is_mmo: boolean
-  readonly request_user_role: string
+  readonly request_user_role: MemberRoleEnum
   readonly members: string
   readonly assets: string
   readonly service_usage: string

jsapp/js/api/models/patchedInvitePatchPayloadOneOf.ts

@@ -5,7 +5,8 @@
  * Powerful and intuitive data collection tools to make an impact
  * OpenAPI spec version: 2.0.0 (api_v2)
  */
+import type { InviteStatusChoicesEnum } from './inviteStatusChoicesEnum'
 
 export type PatchedInvitePatchPayloadOneOf = {
-  status: string
+  status: InviteStatusChoicesEnum
 }

jsapp/js/api/models/patchedInvitePatchPayloadOneOfTwo.ts

@@ -5,7 +5,8 @@
  * Powerful and intuitive data collection tools to make an impact
  * OpenAPI spec version: 2.0.0 (api_v2)
  */
+import type { InviteeRoleEnum } from './inviteeRoleEnum'
 
 export type PatchedInvitePatchPayloadOneOfTwo = {
-  role: string
+  role: InviteeRoleEnum
 }

jsapp/xlform/src/model.base.coffee

@@ -68,12 +68,10 @@ module.exports = do ->
     precedingRow: ->
       ii = @_parent.models.indexOf(@)
       if ii isnt 0
-        @_parent.at(ii-1)
-      return
+        return @_parent.at(ii-1)
     nextRow: ->
       ii = @_parent.models.indexOf(@)
-      @_parent.at(ii+1)
-      return
+      return @_parent.at(ii+1)
     getSurvey: ->
       parent = @_parent
       if parent is null or parent is undefined

kobo/apps/organizations/serializers.py

@@ -30,6 +30,7 @@
     MembersField,
     ServiceUsageField,
     UrlField,
+    UserRoleField,
 )
 from kpi.utils.cache import void_cache_for_request
 from kpi.utils.object_permission import get_database_user
@@ -250,7 +251,7 @@ def get_is_owner(self, organization):
 
         return False
 
-    @extend_schema_field(OpenApiTypes.STR)
+    @extend_schema_field(UserRoleField)
     def get_request_user_role(self, organization):
 
         if request := self.context.get('request'):

kobo/settings/base.py

@@ -1018,6 +1018,7 @@ def __init__(self, *args, **kwargs):
     'ENUM_NAME_OVERRIDES': {
         'InviteStatusChoicesEnum': 'kobo.apps.organizations.models.OrganizationInviteStatusChoices.choices',  # noqa
         'InviteeRoleEnum': 'kpi.schema_extensions.v2.members.schema.ROLE_CHOICES_PAYLOAD_ENUM',  # noqa
+        'MemberRoleEnum': 'kpi.schema_extensions.v2.members.schema.ROLE_CHOICES_ENUM',
     },
 }