feat(cat-voices): sync with gateway v2 endpoints

.config/dictionaries/project.dic

@@ -64,6 +64,7 @@ ciphertext
 ciphertexts
 CIPs
 CNFT
+COAP
 COCOAPODS
 codegen
 codepoints
@@ -173,6 +174,7 @@ iohk
 IPFS
 iphoneos
 iphonesimulator
+IPLD
 jdbc
 jetbrains
 jlumbroso

.earthlyignore

@@ -16,15 +16,10 @@
 # Generated files from code generation tools
 **/*.g.dart
 **/*.freezed.dart
-**/*.chopper.dart
-**/*.swagger.dart
-**/*.openapi.dart
 **/*.gen.dart
-**/*.swagger.*.dart
 **/*.drift.dart
-**/openapi/processed/
-**/catalyst_voices_localizations_*.dart
-**/catalyst_voices_localizations.dart
+**/generated/catalyst_voices_localizations_*.dart
+**/generated/catalyst_voices_localizations.dart
 
 # node related
 

catalyst_voices/.earthlyignore

@@ -16,15 +16,10 @@
 # Generated files from code generation tools
 **/*.g.dart
 **/*.freezed.dart
-**/*.chopper.dart
-**/*.swagger.dart
-**/*.openapi.dart
 **/*.gen.dart
-**/*.swagger.*.dart
 **/*.drift.dart
-**/openapi/processed/
-**/catalyst_voices_localizations_*.dart
-**/catalyst_voices_localizations.dart
+**/generated/catalyst_voices_localizations_*.dart
+**/generated/catalyst_voices_localizations.dart
 
 # node related
 

catalyst_voices/.gitignore

@@ -8,27 +8,12 @@ docs/
 # Generated files from code generation tools
 *.g.dart
 *.freezed.dart
-*.chopper.dart
-*.swagger.dart
-*.openapi.dart
 *.gen.dart
-*.swagger.*.dart
 *.drift.dart
-**/generated/*
-**/openapi/**
-
-# Un-ignore vit, cat-reviews and cat-gateway openapi spec as they're not generated
-!**/openapi/vit.json
-!**/openapi/cat-reviews.json
-!**/openapi/cat-status.json
-!**/openapi/cat-gateway.json
 
 # Un-ignore generated files in public packages
 !**/packages/libs/**/*.g.dart
 !**/packages/libs/**/*.freezed.dart
-!**/packages/libs/**/*.chopper.dart
-!**/packages/libs/**/*.swagger.dart
-!**/packages/libs/**/*.openapi.dart
 !**/packages/libs/**/*.gen.dart
 
 # Localization (l10n) generated files

catalyst_voices/Earthfile

@@ -1,7 +1,6 @@
 VERSION 0.8
 
 IMPORT ../ AS repo-ci
-IMPORT ../catalyst-gateway AS catalyst-gateway
 IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.6.3 AS flutter-ci
 
 # repo-catalyst-voices - Creates artifacts of all configuration files,
@@ -22,37 +21,29 @@ builder:
     DO flutter-ci+BOOTSTRAP
 
 # Generates flutter code.
-# Generates codes for Catalyst Gateway OpenAPI, Voices Localization and
-# VoicesAssets and other packages that depend on code-generator.
+# Generates codes for Voices Localization and VoicesAssets and other packages
+# that depend on code-generator.
 # It accepts [save_locally] ARG that when true place the artifacts in the
 # proper folders
 code-generator:
     ARG save_locally=false
     FROM +builder
 
-    LET gen_code_path = lib/generated/api
-    LET local_gen_code_path = packages/internal/catalyst_voices_repositories/lib/generated/api/
-
-    WORKDIR packages/internal/catalyst_voices_repositories
-
     WORKDIR /frontend
 
     RUN melos l10n
     RUN melos build-runner
-    RUN melos build-runner-repository
 
     IF [ $save_locally = true ]
-        # This step saves generated files other then OpenApi Services
+        # This step saves generated files
         RUN find . \
           \( -name "*.g.dart" \
-          -o -name "*.chopper.dart" \
           -o -name "*.gen.dart" \
           -o -name "catalyst_voices_localizations*.dart" \
           -o -name "*.drift.dart" \)
 
         FOR generated_file IN $(find . \
                                           \( -name "*.g.dart" \
-                                          -o -name "*.chopper.dart" \
                                           -o -name "*.gen.dart" \
                                           -o -name "catalyst_voices_localizations*.dart" \
                                           -o -name "*.drift.dart" \))
@@ -62,18 +53,6 @@ code-generator:
        SAVE ARTIFACT .
     END
 
-    WORKDIR packages/internal/catalyst_voices_repositories
-
-    # Saves generated OpenApi Services
-    IF [ $save_locally = true ]
-        SAVE ARTIFACT "$gen_code_path/*" AS LOCAL $local_gen_code_path
-    ELSE
-        SAVE ARTIFACT $gen_code_path
-    END
-
-    # restore current working directory to the root of the project
-    WORKDIR /frontend
-
 # Runs code formatting checks.
 check-code-formatting:
     FROM +builder

catalyst_voices/README.md

@@ -206,7 +206,6 @@ flutter run --dart-define=FEATURE_VOTING=false
 
 This project utilizes automatic code generation for the following components:
 
-* Catalyst Gateway OpenAPI
 * Localization files
 * Asset files
 * Navigation route files

catalyst_voices/apps/voices/lib/configs/bootstrap.dart

@@ -225,7 +225,7 @@ Future<void> _doBootstrapAndRun(
 Future<AppConfig> _getAppConfig({
   required AppEnvironmentType env,
 }) async {
-  final api = ApiServices(env: env);
+  final api = ApiServices.dio(env: env);
   final source = ApiConfigSource(api);
   final service = ConfigService(ConfigRepository(source));
   return service.getAppConfig(env: env);

catalyst_voices/apps/voices/lib/dependency/dependencies.dart

@@ -222,10 +222,10 @@ final class Dependencies extends DependencyProvider {
   void _registerNetwork() {
     registerLazySingleton<ApiServices>(
       () {
-        return ApiServices(
+        return ApiServices.dio(
           env: get<AppEnvironment>().type,
           authTokenProvider: get<AuthTokenProvider>(),
-          httpClient: () => get<ReportingService>().buildHttpClient(),
+          interceptClient: get<ReportingService>().registerDio,
         );
       },
       dispose: (api) => api.dispose(),

catalyst_voices/apps/voices/lib/pages/category/card_information.dart

@@ -28,15 +28,15 @@ class CardInformation extends StatelessWidget {
         padding: padding,
         children: [
           CategoryProposalsDetailsCard(
-            categoryId: category.id,
+            categoryRef: category.ref,
             categoryName: category.formattedName,
             categoryProposalsCount: category.proposalsCount,
           ),
           const SizedBox(height: 16),
           Offstage(
             offstage: !isActiveProposer,
             child: CreateProposalCard(
-              categoryId: category.id,
+              categoryRef: category.ref,
               categoryName: category.formattedName,
               categoryDos: category.dos,
               categoryDonts: category.donts,

catalyst_voices/apps/voices/lib/pages/category/category_compact_detail_view.dart

@@ -32,7 +32,7 @@ class CategoryCompactDetailView extends StatelessWidget {
                 _CategoryBrief(
                   categoryName: category.formattedName,
                   categoryDescription: category.description,
-                  categoryRef: category.id,
+                  categoryRef: category.ref,
                 ),
                 FundsDetailCard(
                   allFunds: category.availableFunds,

catalyst_voices/apps/voices/lib/pages/category/category_detail_view.dart

@@ -32,7 +32,7 @@ class CategoryDetailView extends StatelessWidget {
           _CategoryBrief(
             categoryName: category.formattedName,
             categoryDescription: category.description,
-            categoryRef: category.id,
+            categoryRef: category.ref,
             image: category.image,
             proposalCount: category.proposalsCount,
           ),

catalyst_voices/apps/voices/lib/pages/category/category_page.dart

@@ -16,9 +16,9 @@ import 'package:flutter/material.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 
 class CategoryPage extends StatefulWidget {
-  final SignedDocumentRef categoryId;
+  final SignedDocumentRef categoryRef;
 
-  const CategoryPage({super.key, required this.categoryId});
+  const CategoryPage({super.key, required this.categoryRef});
 
   @override
   State<CategoryPage> createState() => _CategoryPageState();
@@ -102,9 +102,9 @@ class _BodySmall extends StatelessWidget {
 }
 
 class _CategoryDetailErrorSelector extends StatelessWidget {
-  final SignedDocumentRef categoryId;
+  final SignedDocumentRef categoryRef;
 
-  const _CategoryDetailErrorSelector({required this.categoryId});
+  const _CategoryDetailErrorSelector({required this.categoryRef});
 
   @override
   Widget build(BuildContext context) {
@@ -128,7 +128,7 @@ class _CategoryDetailErrorSelector extends StatelessWidget {
                     ? null
                     : () {
                         unawaited(
-                          context.read<CategoryDetailCubit>().getCategoryDetail(categoryId),
+                          context.read<CategoryDetailCubit>().getCategoryDetail(categoryRef),
                         );
                       },
               ),
@@ -187,7 +187,7 @@ class _CategoryPageState extends State<CategoryPage> {
         children: [
           const _CategoryDetailLoadingOrDataSelector(),
           _CategoryDetailErrorSelector(
-            categoryId: widget.categoryId,
+            categoryRef: widget.categoryRef,
           ),
         ].constrainedDelegate(),
       ),
@@ -198,9 +198,9 @@ class _CategoryPageState extends State<CategoryPage> {
   void didUpdateWidget(CategoryPage oldWidget) {
     super.didUpdateWidget(oldWidget);
 
-    if (widget.categoryId != oldWidget.categoryId) {
+    if (widget.categoryRef != oldWidget.categoryRef) {
       unawaited(
-        context.read<CategoryDetailCubit>().getCategoryDetail(widget.categoryId),
+        context.read<CategoryDetailCubit>().getCategoryDetail(widget.categoryRef),
       );
     }
   }
@@ -217,15 +217,15 @@ class _CategoryPageState extends State<CategoryPage> {
     super.initState();
     unawaited(context.read<CategoryDetailCubit>().getCategories());
     unawaited(
-      context.read<CategoryDetailCubit>().getCategoryDetail(widget.categoryId),
+      context.read<CategoryDetailCubit>().getCategoryDetail(widget.categoryRef),
     );
     _listenForProposalRef(context.read<CategoryDetailCubit>());
   }
 
   void _listenForProposalRef(CategoryDetailCubit cubit) {
     // listen for updates
     _categoryRefSub = cubit.stream
-        .map((event) => event.category?.id)
+        .map((event) => event.category?.ref)
         .distinct()
         .listen(_onCategoryRefChanged);
   }

catalyst_voices/apps/voices/lib/pages/category/change_category_button.dart

@@ -20,13 +20,13 @@ class ChangeCategoryButton extends StatelessWidget {
       List<DropdownMenuViewModel<ProposalsCategoryFilter>>
     >(
       selector: (state) {
-        final selectedCategory = state.category?.id ?? '';
+        final selectedCategory = state.category?.ref ?? '';
         return state.categories
             .map(
               (e) => DropdownMenuViewModel(
-                value: ProposalsRefCategoryFilter(ref: e.id),
+                value: ProposalsRefCategoryFilter(ref: e.ref),
                 name: e.formattedName,
-                isSelected: e.id == selectedCategory,
+                isSelected: e.ref == selectedCategory,
               ),
             )
             .toList();

catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_page.dart

@@ -36,12 +36,12 @@ import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class ProposalBuilderPage extends StatelessWidget {
   final DocumentRef? proposalId;
-  final SignedDocumentRef? categoryId;
+  final SignedDocumentRef? categoryRef;
 
   const ProposalBuilderPage({
     super.key,
     this.proposalId,
-    this.categoryId,
+    this.categoryRef,
   });
 
   @override
@@ -50,19 +50,19 @@ class ProposalBuilderPage extends StatelessWidget {
       create: (context) => Dependencies.instance.get<ProposalBuilderBloc>(),
       child: _ProposalBuilderBody(
         proposalId: proposalId,
-        categoryId: categoryId,
+        categoryRef: categoryRef,
       ),
     );
   }
 }
 
 class _ProposalBuilderBody extends StatefulWidget {
   final DocumentRef? proposalId;
-  final SignedDocumentRef? categoryId;
+  final SignedDocumentRef? categoryRef;
 
   const _ProposalBuilderBody({
     this.proposalId,
-    this.categoryId,
+    this.categoryRef,
   });
 
   @override
@@ -116,7 +116,7 @@ class _ProposalBuilderBodyState extends State<_ProposalBuilderBody>
   void didUpdateWidget(_ProposalBuilderBody oldWidget) {
     super.didUpdateWidget(oldWidget);
 
-    if (widget.proposalId != oldWidget.proposalId || widget.categoryId != oldWidget.categoryId) {
+    if (widget.proposalId != oldWidget.proposalId || widget.categoryRef != oldWidget.categoryRef) {
       _loadProposal();
     }
   }
@@ -239,11 +239,11 @@ class _ProposalBuilderBodyState extends State<_ProposalBuilderBody>
     bloc ??= context.read<ProposalBuilderBloc>();
 
     final proposalId = widget.proposalId;
-    final categoryId = widget.categoryId;
+    final categoryRef = widget.categoryRef;
     if (proposalId != null) {
       bloc.add(LoadProposalEvent(proposalId: proposalId));
-    } else if (categoryId != null) {
-      bloc.add(LoadProposalCategoryEvent(categoryId: categoryId));
+    } else if (categoryRef != null) {
+      bloc.add(LoadProposalCategoryEvent(categoryRef: categoryRef));
     } else {
       bloc.add(const LoadDefaultProposalCategoryEvent());
     }