improved invite link view

cookbook/views/api.py

@@ -1654,7 +1654,8 @@ class AutomationViewSet(LoggingMixin, StandardFilterModelViewSet):
 
 
 @extend_schema_view(list=extend_schema(parameters=[
-    OpenApiParameter(name='internal_note', description=_('Text field to store data that gets carried over to the UserSpace created from the InviteLink'), type=str)
+    OpenApiParameter(name='internal_note', description=_('Text field to store data that gets carried over to the UserSpace created from the InviteLink'), type=str),
+    OpenApiParameter(name='unused', description=_('Only return InviteLinks that have not been used yet.'), type=bool),
 ]))
 class InviteLinkViewSet(LoggingMixin, StandardFilterModelViewSet):
     queryset = InviteLink.objects
@@ -1667,6 +1668,10 @@ class InviteLinkViewSet(LoggingMixin, StandardFilterModelViewSet):
         if internal_note is not None:
             self.queryset = self.queryset.filter(internal_note=internal_note)
 
+        unused = self.request.query_params.get('unused', False)
+        if unused:
+            self.queryset = self.queryset.filter(used_by=None)
+
         if is_space_owner(self.request.user, self.request.space):
             self.queryset = self.queryset.filter(space=self.request.space).all()
             return super().get_queryset()

vue3/src/components/model_editors/InviteLinkEditor.vue

@@ -16,6 +16,11 @@
                 <v-date-input :label="$t('Valid Until')" v-model="editingObj.validUntil"></v-date-input>
                 <v-textarea :label="$t('Note')" v-model="editingObj.internalNote"></v-textarea>
                 <v-checkbox :label="$t('Reusable')" v-model="editingObj.reusable"></v-checkbox>
+                <v-text-field :label="$t('Link')" readonly :model-value="inviteLinkUrl(editingObj)">
+                    <template #append-inner>
+                        <btn-copy variant="plain" color="undefined" :copy-value="inviteLinkUrl(editingObj)"></btn-copy>
+                    </template>
+                </v-text-field>
             </v-form>
         </v-card-text>
     </model-editor-base>
@@ -31,6 +36,7 @@ import {ErrorMessageType, useMessageStore} from "@/stores/MessageStore";
 import {DateTime} from "luxon";
 import ModelEditorBase from "@/components/model_editors/ModelEditorBase.vue";
 import {useModelEditorFunctions} from "@/composables/useModelEditorFunctions";
+import BtnCopy from "@/components/buttons/BtnCopy.vue";
 
 
 const props = defineProps({
@@ -79,6 +85,16 @@ function initializeEditor(){
         useMessageStore().addError(ErrorMessageType.FETCH_ERROR, err)
     })
 }
+
+/**
+ * returns url for invite link
+ * @param inviteLink InviteLink object to create url for
+ */
+function inviteLinkUrl(inviteLink: InviteLink) {
+    return `${location.protocol}//${location.host}/invite/${inviteLink.uuid}`
+}
+
+
 </script>
 
 <style scoped>

vue3/src/components/settings/SpaceMemberSettings.vue

@@ -27,6 +27,11 @@
         <v-divider class="mb-3"></v-divider>
 
         <v-data-table :items="spaceInviteLinks" :headers="inviteTableHeaders" density="compact" :hide-default-footer="spaceInviteLinks.length < 10">
+             <template #item.reusable="{item}">
+                <v-icon icon="fa-solid fa-check" color="success" v-if="item.reusable"></v-icon>
+                <v-icon icon="fa-solid fa-times" color="error" v-if="!item.reusable"></v-icon>
+            </template>
+
             <template #item.edit="{item}">
                 <btn-copy size="small" :copy-value="inviteLinkUrl(item)" class="me-1"></btn-copy>
                 <v-btn color="edit" size="small">
@@ -65,6 +70,7 @@ const inviteTableHeaders = [
     {title: 'ID', key: 'id'},
     {title: t('Email'), key: 'email'},
     {title: t('Role'), key: 'group.name'},
+    {title: t('Reusable'), key: 'reusable'},
     {title: t('Edit'), key: 'edit', align: 'end'},
 ]
 
@@ -77,7 +83,7 @@ onMounted(() => {
         useMessageStore().addError(ErrorMessageType.FETCH_ERROR, err)
     })
 
-    api.apiInviteLinkList().then(r => {
+    api.apiInviteLinkList({unused: true}).then(r => {
         spaceInviteLinks.value = r.results
     }).catch(err => {
         useMessageStore().addError(ErrorMessageType.FETCH_ERROR, err)

vue3/src/openapi/.openapi-generator/FILES

@@ -64,13 +64,6 @@ models/PaginatedInviteLinkList.ts
 models/PaginatedKeywordList.ts
 models/PaginatedMealPlanList.ts
 models/PaginatedMealTypeList.ts
-models/PaginatedOpenDataCategoryList.ts
-models/PaginatedOpenDataConversionList.ts
-models/PaginatedOpenDataFoodList.ts
-models/PaginatedOpenDataPropertyList.ts
-models/PaginatedOpenDataStoreList.ts
-models/PaginatedOpenDataUnitList.ts
-models/PaginatedOpenDataVersionList.ts
 models/PaginatedPropertyList.ts
 models/PaginatedPropertyTypeList.ts
 models/PaginatedRecipeBookEntryList.ts

vue3/src/openapi/apis/ApiApi.ts

@@ -60,13 +60,6 @@ import type {
   PaginatedKeywordList,
   PaginatedMealPlanList,
   PaginatedMealTypeList,
-  PaginatedOpenDataCategoryList,
-  PaginatedOpenDataConversionList,
-  PaginatedOpenDataFoodList,
-  PaginatedOpenDataPropertyList,
-  PaginatedOpenDataStoreList,
-  PaginatedOpenDataUnitList,
-  PaginatedOpenDataVersionList,
   PaginatedPropertyList,
   PaginatedPropertyTypeList,
   PaginatedRecipeBookEntryList,
@@ -259,20 +252,6 @@ import {
     PaginatedMealPlanListToJSON,
     PaginatedMealTypeListFromJSON,
     PaginatedMealTypeListToJSON,
-    PaginatedOpenDataCategoryListFromJSON,
-    PaginatedOpenDataCategoryListToJSON,
-    PaginatedOpenDataConversionListFromJSON,
-    PaginatedOpenDataConversionListToJSON,
-    PaginatedOpenDataFoodListFromJSON,
-    PaginatedOpenDataFoodListToJSON,
-    PaginatedOpenDataPropertyListFromJSON,
-    PaginatedOpenDataPropertyListToJSON,
-    PaginatedOpenDataStoreListFromJSON,
-    PaginatedOpenDataStoreListToJSON,
-    PaginatedOpenDataUnitListFromJSON,
-    PaginatedOpenDataUnitListToJSON,
-    PaginatedOpenDataVersionListFromJSON,
-    PaginatedOpenDataVersionListToJSON,
     PaginatedPropertyListFromJSON,
     PaginatedPropertyListToJSON,
     PaginatedPropertyTypeListFromJSON,
@@ -829,7 +808,7 @@ export interface ApiIngredientUpdateRequest {
 }
 
 export interface ApiInviteLinkCreateRequest {
-    inviteLink: Omit<InviteLink, 'uuid'|'createdBy'|'createdAt'>;
+    inviteLink: Omit<InviteLink, 'uuid'|'usedBy'|'createdBy'|'createdAt'>;
 }
 
 export interface ApiInviteLinkDestroyRequest {
@@ -843,12 +822,13 @@ export interface ApiInviteLinkListRequest {
     pageSize?: number;
     query?: string;
     random?: string;
+    unused?: boolean;
     updatedAt?: string;
 }
 
 export interface ApiInviteLinkPartialUpdateRequest {
     id: number;
-    patchedInviteLink?: Omit<PatchedInviteLink, 'uuid'|'createdBy'|'createdAt'>;
+    patchedInviteLink?: Omit<PatchedInviteLink, 'uuid'|'usedBy'|'createdBy'|'createdAt'>;
 }
 
 export interface ApiInviteLinkRetrieveRequest {
@@ -857,7 +837,7 @@ export interface ApiInviteLinkRetrieveRequest {
 
 export interface ApiInviteLinkUpdateRequest {
     id: number;
-    inviteLink: Omit<InviteLink, 'uuid'|'createdBy'|'createdAt'>;
+    inviteLink: Omit<InviteLink, 'uuid'|'usedBy'|'createdBy'|'createdAt'>;
 }
 
 export interface ApiKeywordCreateRequest {
@@ -976,11 +956,6 @@ export interface ApiOpenDataCategoryDestroyRequest {
     id: number;
 }
 
-export interface ApiOpenDataCategoryListRequest {
-    page?: number;
-    pageSize?: number;
-}
-
 export interface ApiOpenDataCategoryPartialUpdateRequest {
     id: number;
     patchedOpenDataCategory?: Omit<PatchedOpenDataCategory, 'createdBy'>;
@@ -1003,11 +978,6 @@ export interface ApiOpenDataConversionDestroyRequest {
     id: number;
 }
 
-export interface ApiOpenDataConversionListRequest {
-    page?: number;
-    pageSize?: number;
-}
-
 export interface ApiOpenDataConversionPartialUpdateRequest {
     id: number;
     patchedOpenDataConversion?: Omit<PatchedOpenDataConversion, 'createdBy'>;
@@ -1034,16 +1004,6 @@ export interface ApiOpenDataFoodDestroyRequest {
     id: number;
 }
 
-export interface ApiOpenDataFoodFdcCreateRequest {
-    id: number;
-    openDataFood: Omit<OpenDataFood, 'createdBy'>;
-}
-
-export interface ApiOpenDataFoodListRequest {
-    page?: number;
-    pageSize?: number;
-}
-
 export interface ApiOpenDataFoodPartialUpdateRequest {
     id: number;
     patchedOpenDataFood?: Omit<PatchedOpenDataFood, 'createdBy'>;
@@ -1066,11 +1026,6 @@ export interface ApiOpenDataPropertyDestroyRequest {
     id: number;
 }
 
-export interface ApiOpenDataPropertyListRequest {
-    page?: number;
-    pageSize?: number;
-}
-
 export interface ApiOpenDataPropertyPartialUpdateRequest {
     id: number;
     patchedOpenDataProperty?: Omit<PatchedOpenDataProperty, 'createdBy'>;
@@ -1093,11 +1048,6 @@ export interface ApiOpenDataStoreDestroyRequest {
     id: number;
 }
 
-export interface ApiOpenDataStoreListRequest {
-    page?: number;
-    pageSize?: number;
-}
-
 export interface ApiOpenDataStorePartialUpdateRequest {
     id: number;
     patchedOpenDataStore?: Omit<PatchedOpenDataStore, 'createdBy'>;
@@ -1120,11 +1070,6 @@ export interface ApiOpenDataUnitDestroyRequest {
     id: number;
 }
 
-export interface ApiOpenDataUnitListRequest {
-    page?: number;
-    pageSize?: number;
-}
-
 export interface ApiOpenDataUnitPartialUpdateRequest {
     id: number;
     patchedOpenDataUnit?: Omit<PatchedOpenDataUnit, 'createdBy'>;
@@ -1147,11 +1092,6 @@ export interface ApiOpenDataVersionDestroyRequest {
     id: number;
 }
 
-export interface ApiOpenDataVersionListRequest {
-    page?: number;
-    pageSize?: number;
-}
-
 export interface ApiOpenDataVersionPartialUpdateRequest {
     id: number;
     patchedOpenDataVersion?: PatchedOpenDataVersion;
@@ -5227,6 +5167,10 @@ export class ApiApi extends runtime.BaseAPI {
             queryParameters['random'] = requestParameters['random'];
         }
 
+        if (requestParameters['unused'] != null) {
+            queryParameters['unused'] = requestParameters['unused'];
+        }
+
         if (requestParameters['updatedAt'] != null) {
             queryParameters['updated_at'] = requestParameters['updatedAt'];
         }
@@ -6385,17 +6329,9 @@ export class ApiApi extends runtime.BaseAPI {
 
     /**
      */
-    async apiOpenDataCategoryListRaw(requestParameters: ApiOpenDataCategoryListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PaginatedOpenDataCategoryList>> {
+    async apiOpenDataCategoryListRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<OpenDataCategory>>> {
         const queryParameters: any = {};
 
-        if (requestParameters['page'] != null) {
-            queryParameters['page'] = requestParameters['page'];
-        }
-
-        if (requestParameters['pageSize'] != null) {
-            queryParameters['page_size'] = requestParameters['pageSize'];
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
@@ -6409,13 +6345,13 @@ export class ApiApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => PaginatedOpenDataCategoryListFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(OpenDataCategoryFromJSON));
     }
 
     /**
      */
-    async apiOpenDataCategoryList(requestParameters: ApiOpenDataCategoryListRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PaginatedOpenDataCategoryList> {
+    async apiOpenDataCategoryList(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<OpenDataCategory>> {
-        const response = await this.apiOpenDataCategoryListRaw(requestParameters, initOverrides);
+        const response = await this.apiOpenDataCategoryListRaw(initOverrides);
         return await response.value();
     }
 
@@ -6611,17 +6547,9 @@ export class ApiApi extends runtime.BaseAPI {
 
     /**
      */
-    async apiOpenDataConversionListRaw(requestParameters: ApiOpenDataConversionListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PaginatedOpenDataConversionList>> {
+    async apiOpenDataConversionListRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<OpenDataConversion>>> {
         const queryParameters: any = {};
 
-        if (requestParameters['page'] != null) {
-            queryParameters['page'] = requestParameters['page'];
-        }
-
-        if (requestParameters['pageSize'] != null) {
-            queryParameters['page_size'] = requestParameters['pageSize'];
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
@@ -6635,13 +6563,13 @@ export class ApiApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => PaginatedOpenDataConversionListFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(OpenDataConversionFromJSON));
     }
 
     /**
      */
-    async apiOpenDataConversionList(requestParameters: ApiOpenDataConversionListRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PaginatedOpenDataConversionList> {
+    async apiOpenDataConversionList(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<OpenDataConversion>> {
-        const response = await this.apiOpenDataConversionListRaw(requestParameters, initOverrides);
+        const response = await this.apiOpenDataConversionListRaw(initOverrides);
         return await response.value();
     }
 
@@ -6870,67 +6798,12 @@ export class ApiApi extends runtime.BaseAPI {
     }
 
     /**
-     * updates the food with all possible data from the FDC Api if properties with a fdc_id already exist they will be overridden, if existing properties don\'t have a fdc_id they won\'t be changed
      */
-    async apiOpenDataFoodFdcCreateRaw(requestParameters: ApiOpenDataFoodFdcCreateRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<OpenDataFood>> {
+    async apiOpenDataFoodListRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<OpenDataFood>>> {
-        if (requestParameters['id'] == null) {
-            throw new runtime.RequiredError(
-                'id',
-                'Required parameter "id" was null or undefined when calling apiOpenDataFoodFdcCreate().'
-            );
-        }
-
-        if (requestParameters['openDataFood'] == null) {
-            throw new runtime.RequiredError(
-                'openDataFood',
-                'Required parameter "openDataFood" was null or undefined when calling apiOpenDataFoodFdcCreate().'
-            );
-        }
-
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
-        headerParameters['Content-Type'] = 'application/json';
-
-        if (this.configuration && this.configuration.apiKey) {
-            headerParameters["Authorization"] = await this.configuration.apiKey("Authorization"); // ApiKeyAuth authentication
-        }
-
-        const response = await this.request({
-            path: `/api/open-data-food/{id}/fdc/`.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id']))),
-            method: 'POST',
-            headers: headerParameters,
-            query: queryParameters,
-            body: OpenDataFoodToJSON(requestParameters['openDataFood']),
-        }, initOverrides);
-
-        return new runtime.JSONApiResponse(response, (jsonValue) => OpenDataFoodFromJSON(jsonValue));
-    }
-
-    /**
-     * updates the food with all possible data from the FDC Api if properties with a fdc_id already exist they will be overridden, if existing properties don\'t have a fdc_id they won\'t be changed
-     */
-    async apiOpenDataFoodFdcCreate(requestParameters: ApiOpenDataFoodFdcCreateRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<OpenDataFood> {
-        const response = await this.apiOpenDataFoodFdcCreateRaw(requestParameters, initOverrides);
-        return await response.value();
-    }
-
-    /**
-     */
-    async apiOpenDataFoodListRaw(requestParameters: ApiOpenDataFoodListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PaginatedOpenDataFoodList>> {
-        const queryParameters: any = {};
-
-        if (requestParameters['page'] != null) {
-            queryParameters['page'] = requestParameters['page'];
-        }
-
-        if (requestParameters['pageSize'] != null) {
-            queryParameters['page_size'] = requestParameters['pageSize'];
-        }
-
-        const headerParameters: runtime.HTTPHeaders = {};
-
         if (this.configuration && this.configuration.apiKey) {
             headerParameters["Authorization"] = await this.configuration.apiKey("Authorization"); // ApiKeyAuth authentication
         }
@@ -6942,13 +6815,13 @@ export class ApiApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => PaginatedOpenDataFoodListFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(OpenDataFoodFromJSON));
     }
 
     /**
      */
-    async apiOpenDataFoodList(requestParameters: ApiOpenDataFoodListRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PaginatedOpenDataFoodList> {
+    async apiOpenDataFoodList(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<OpenDataFood>> {
-        const response = await this.apiOpenDataFoodListRaw(requestParameters, initOverrides);
+        const response = await this.apiOpenDataFoodListRaw(initOverrides);
         return await response.value();
     }
 
@@ -7144,17 +7017,9 @@ export class ApiApi extends runtime.BaseAPI {
 
     /**
      */
-    async apiOpenDataPropertyListRaw(requestParameters: ApiOpenDataPropertyListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PaginatedOpenDataPropertyList>> {
+    async apiOpenDataPropertyListRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<OpenDataProperty>>> {
         const queryParameters: any = {};
 
-        if (requestParameters['page'] != null) {
-            queryParameters['page'] = requestParameters['page'];
-        }
-
-        if (requestParameters['pageSize'] != null) {
-            queryParameters['page_size'] = requestParameters['pageSize'];
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
@@ -7168,13 +7033,13 @@ export class ApiApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => PaginatedOpenDataPropertyListFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(OpenDataPropertyFromJSON));
     }
 
     /**
      */
-    async apiOpenDataPropertyList(requestParameters: ApiOpenDataPropertyListRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PaginatedOpenDataPropertyList> {
+    async apiOpenDataPropertyList(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<OpenDataProperty>> {
-        const response = await this.apiOpenDataPropertyListRaw(requestParameters, initOverrides);
+        const response = await this.apiOpenDataPropertyListRaw(initOverrides);
         return await response.value();
     }
 
@@ -7397,17 +7262,9 @@ export class ApiApi extends runtime.BaseAPI {
 
     /**
      */
-    async apiOpenDataStoreListRaw(requestParameters: ApiOpenDataStoreListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PaginatedOpenDataStoreList>> {
+    async apiOpenDataStoreListRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<OpenDataStore>>> {
         const queryParameters: any = {};
 
-        if (requestParameters['page'] != null) {
-            queryParameters['page'] = requestParameters['page'];
-        }
-
-        if (requestParameters['pageSize'] != null) {
-            queryParameters['page_size'] = requestParameters['pageSize'];
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
@@ -7421,13 +7278,13 @@ export class ApiApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => PaginatedOpenDataStoreListFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(OpenDataStoreFromJSON));
     }
 
     /**
      */
-    async apiOpenDataStoreList(requestParameters: ApiOpenDataStoreListRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PaginatedOpenDataStoreList> {
+    async apiOpenDataStoreList(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<OpenDataStore>> {
-        const response = await this.apiOpenDataStoreListRaw(requestParameters, initOverrides);
+        const response = await this.apiOpenDataStoreListRaw(initOverrides);
         return await response.value();
     }
 
@@ -7623,17 +7480,9 @@ export class ApiApi extends runtime.BaseAPI {
 
     /**
      */
-    async apiOpenDataUnitListRaw(requestParameters: ApiOpenDataUnitListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PaginatedOpenDataUnitList>> {
+    async apiOpenDataUnitListRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<OpenDataUnit>>> {
         const queryParameters: any = {};
 
-        if (requestParameters['page'] != null) {
-            queryParameters['page'] = requestParameters['page'];
-        }
-
-        if (requestParameters['pageSize'] != null) {
-            queryParameters['page_size'] = requestParameters['pageSize'];
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
@@ -7647,13 +7496,13 @@ export class ApiApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => PaginatedOpenDataUnitListFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(OpenDataUnitFromJSON));
     }
 
     /**
      */
-    async apiOpenDataUnitList(requestParameters: ApiOpenDataUnitListRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PaginatedOpenDataUnitList> {
+    async apiOpenDataUnitList(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<OpenDataUnit>> {
-        const response = await this.apiOpenDataUnitListRaw(requestParameters, initOverrides);
+        const response = await this.apiOpenDataUnitListRaw(initOverrides);
         return await response.value();
     }
 
@@ -7849,17 +7698,9 @@ export class ApiApi extends runtime.BaseAPI {
 
     /**
      */
-    async apiOpenDataVersionListRaw(requestParameters: ApiOpenDataVersionListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PaginatedOpenDataVersionList>> {
+    async apiOpenDataVersionListRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<OpenDataVersion>>> {
         const queryParameters: any = {};
 
-        if (requestParameters['page'] != null) {
-            queryParameters['page'] = requestParameters['page'];
-        }
-
-        if (requestParameters['pageSize'] != null) {
-            queryParameters['page_size'] = requestParameters['pageSize'];
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
@@ -7873,13 +7714,13 @@ export class ApiApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => PaginatedOpenDataVersionListFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(OpenDataVersionFromJSON));
     }
 
     /**
      */
-    async apiOpenDataVersionList(requestParameters: ApiOpenDataVersionListRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PaginatedOpenDataVersionList> {
+    async apiOpenDataVersionList(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<OpenDataVersion>> {
-        const response = await this.apiOpenDataVersionListRaw(requestParameters, initOverrides);
+        const response = await this.apiOpenDataVersionListRaw(initOverrides);
         return await response.value();
     }
 

vue3/src/openapi/models/BaseUnitEnum.ts

@@ -14,47 +14,43 @@
 
 
 /**
- * * `g` - g
+ * * `G` - g
- * * `kg` - kg
+ * * `KG` - kg
- * * `ounce` - ounce
+ * * `ML` - ml
- * * `pound` - pound
+ * * `L` - l
- * * `ml` - ml
+ * * `OUNCE` - ounce
- * * `l` - l
+ * * `POUND` - pound
- * * `fluid_ounce` - fluid_ounce
+ * * `FLUID_OUNCE` - fluid_ounce
- * * `pint` - pint
+ * * `TSP` - tsp
- * * `quart` - quart
+ * * `TBSP` - tbsp
- * * `gallon` - gallon
+ * * `CUP` - cup
- * * `tbsp` - tbsp
+ * * `PINT` - pint
- * * `tsp` - tsp
+ * * `QUART` - quart
- * * `us_cup` - US Cup
+ * * `GALLON` - gallon
- * * `imperial_fluid_ounce` - imperial fluid ounce
+ * * `IMPERIAL_FLUID_OUNCE` - imperial fluid ounce
- * * `imperial_pint` - imperial pint
+ * * `IMPERIAL_PINT` - imperial pint
- * * `imperial_quart` - imperial quart
+ * * `IMPERIAL_QUART` - imperial quart
- * * `imperial_gallon` - imperial gallon
+ * * `IMPERIAL_GALLON` - imperial gallon
- * * `imperial_tbsp` - imperial tbsp
- * * `imperial_tsp` - imperial tsp
  * @export
  */
 export const BaseUnitEnum = {
-    G: 'g',
+    G: 'G',
-    Kg: 'kg',
+    Kg: 'KG',
-    Ounce: 'ounce',
+    Ml: 'ML',
-    Pound: 'pound',
+    L: 'L',
-    Ml: 'ml',
+    Ounce: 'OUNCE',
-    L: 'l',
+    Pound: 'POUND',
-    FluidOunce: 'fluid_ounce',
+    FluidOunce: 'FLUID_OUNCE',
-    Pint: 'pint',
+    Tsp: 'TSP',
-    Quart: 'quart',
+    Tbsp: 'TBSP',
-    Gallon: 'gallon',
+    Cup: 'CUP',
-    Tbsp: 'tbsp',
+    Pint: 'PINT',
-    Tsp: 'tsp',
+    Quart: 'QUART',
-    UsCup: 'us_cup',
+    Gallon: 'GALLON',
-    ImperialFluidOunce: 'imperial_fluid_ounce',
+    ImperialFluidOunce: 'IMPERIAL_FLUID_OUNCE',
-    ImperialPint: 'imperial_pint',
+    ImperialPint: 'IMPERIAL_PINT',
-    ImperialQuart: 'imperial_quart',
+    ImperialQuart: 'IMPERIAL_QUART',
-    ImperialGallon: 'imperial_gallon',
+    ImperialGallon: 'IMPERIAL_GALLON'
-    ImperialTbsp: 'imperial_tbsp',
-    ImperialTsp: 'imperial_tsp'
 } as const;
 export type BaseUnitEnum = typeof BaseUnitEnum[keyof typeof BaseUnitEnum];
 

vue3/src/openapi/models/InviteLink.ts

@@ -61,7 +61,7 @@ export interface InviteLink {
      * @type {number}
      * @memberof InviteLink
      */
-    usedBy?: number;
+    readonly usedBy: number | null;
     /**
      * 
      * @type {boolean}
@@ -94,6 +94,7 @@ export interface InviteLink {
 export function instanceOfInviteLink(value: object): value is InviteLink {
     if (!('uuid' in value) || value['uuid'] === undefined) return false;
     if (!('group' in value) || value['group'] === undefined) return false;
+    if (!('usedBy' in value) || value['usedBy'] === undefined) return false;
     if (!('createdBy' in value) || value['createdBy'] === undefined) return false;
     if (!('createdAt' in value) || value['createdAt'] === undefined) return false;
     return true;
@@ -114,7 +115,7 @@ export function InviteLinkFromJSONTyped(json: any, ignoreDiscriminator: boolean)
         'email': json['email'] == null ? undefined : json['email'],
         'group': GroupFromJSON(json['group']),
         'validUntil': json['valid_until'] == null ? undefined : (new Date(json['valid_until'])),
-        'usedBy': json['used_by'] == null ? undefined : json['used_by'],
+        'usedBy': json['used_by'],
         'reusable': json['reusable'] == null ? undefined : json['reusable'],
         'internalNote': json['internal_note'] == null ? undefined : json['internal_note'],
         'createdBy': json['created_by'],
@@ -122,7 +123,7 @@ export function InviteLinkFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-export function InviteLinkToJSON(value?: Omit<InviteLink, 'uuid'|'createdBy'|'createdAt'> | null): any {
+export function InviteLinkToJSON(value?: Omit<InviteLink, 'uuid'|'usedBy'|'createdBy'|'createdAt'> | null): any {
     if (value == null) {
         return value;
     }
@@ -132,7 +133,6 @@ export function InviteLinkToJSON(value?: Omit<InviteLink, 'uuid'|'createdBy'|'cr
         'email': value['email'],
         'group': GroupToJSON(value['group']),
         'valid_until': value['validUntil'] == null ? undefined : ((value['validUntil']).toISOString().substring(0,10)),
-        'used_by': value['usedBy'],
         'reusable': value['reusable'],
         'internal_note': value['internalNote'],
     };

vue3/src/openapi/models/OpenDataFood.ts

@@ -164,10 +164,10 @@ export interface OpenDataFood {
     propertiesSource?: string;
     /**
      * 
-     * @type {number}
+     * @type {string}
      * @memberof OpenDataFood
      */
-    fdcId?: number;
+    fdcId: string;
     /**
      * 
      * @type {string}
@@ -193,6 +193,7 @@ export function instanceOfOpenDataFood(value: object): value is OpenDataFood {
     if (!('storeCategory' in value) || value['storeCategory'] === undefined) return false;
     if (!('properties' in value) || value['properties'] === undefined) return false;
     if (!('propertiesFoodUnit' in value) || value['propertiesFoodUnit'] === undefined) return false;
+    if (!('fdcId' in value) || value['fdcId'] === undefined) return false;
     if (!('createdBy' in value) || value['createdBy'] === undefined) return false;
     return true;
 }
@@ -221,7 +222,7 @@ export function OpenDataFoodFromJSONTyped(json: any, ignoreDiscriminator: boolea
         'propertiesFoodAmount': json['properties_food_amount'] == null ? undefined : json['properties_food_amount'],
         'propertiesFoodUnit': OpenDataUnitFromJSON(json['properties_food_unit']),
         'propertiesSource': json['properties_source'] == null ? undefined : json['properties_source'],
-        'fdcId': json['fdc_id'] == null ? undefined : json['fdc_id'],
+        'fdcId': json['fdc_id'],
         'comment': json['comment'] == null ? undefined : json['comment'],
         'createdBy': json['created_by'],
     };

vue3/src/openapi/models/PatchedInviteLink.ts

@@ -61,7 +61,7 @@ export interface PatchedInviteLink {
      * @type {number}
      * @memberof PatchedInviteLink
      */
-    usedBy?: number;
+    readonly usedBy?: number;
     /**
      * 
      * @type {boolean}
@@ -118,7 +118,7 @@ export function PatchedInviteLinkFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-export function PatchedInviteLinkToJSON(value?: Omit<PatchedInviteLink, 'uuid'|'createdBy'|'createdAt'> | null): any {
+export function PatchedInviteLinkToJSON(value?: Omit<PatchedInviteLink, 'uuid'|'usedBy'|'createdBy'|'createdAt'> | null): any {
     if (value == null) {
         return value;
     }
@@ -128,7 +128,6 @@ export function PatchedInviteLinkToJSON(value?: Omit<PatchedInviteLink, 'uuid'|'
         'email': value['email'],
         'group': GroupToJSON(value['group']),
         'valid_until': value['validUntil'] == null ? undefined : ((value['validUntil']).toISOString().substring(0,10)),
-        'used_by': value['usedBy'],
         'reusable': value['reusable'],
         'internal_note': value['internalNote'],
     };

vue3/src/openapi/models/PatchedOpenDataFood.ts

@@ -164,10 +164,10 @@ export interface PatchedOpenDataFood {
     propertiesSource?: string;
     /**
      * 
-     * @type {number}
+     * @type {string}
      * @memberof PatchedOpenDataFood
      */
-    fdcId?: number;
+    fdcId?: string;
     /**
      * 
      * @type {string}

vue3/src/openapi/models/index.ts

@@ -62,13 +62,6 @@ export * from './PaginatedInviteLinkList';
 export * from './PaginatedKeywordList';
 export * from './PaginatedMealPlanList';
 export * from './PaginatedMealTypeList';
-export * from './PaginatedOpenDataCategoryList';
-export * from './PaginatedOpenDataConversionList';
-export * from './PaginatedOpenDataFoodList';
-export * from './PaginatedOpenDataPropertyList';
-export * from './PaginatedOpenDataStoreList';
-export * from './PaginatedOpenDataUnitList';
-export * from './PaginatedOpenDataVersionList';
 export * from './PaginatedPropertyList';
 export * from './PaginatedPropertyTypeList';
 export * from './PaginatedRecipeBookEntryList';