Passing view tests with the new GQL types from swift

config/codegen.yml

@@ -12,13 +12,7 @@ generates:
       withHooks: true
       typesPrefix: GQL
       nonOptionalTypename: false
-  src/server/common/test-graphql/generated.ts:
-    plugins:
-      - typescript
-      - typescript-urql
-      - typescript-operations
-    config:
-      withComponent: false
-      withHooks: false
-      typesPrefix: GQL
-      nonOptionalTypename: false
+      scalars:
+        Date: Date
+        DateOnly: string
+        UUID: string

src/main.ts

@@ -4,7 +4,7 @@ import { TscWatchClient } from 'tsc-watch/client';
 import webpack from 'webpack';
 
 import WebpackConfig from '../config/webpack.config';
-
+/*
 const tsc = new TscWatchClient();
 
 // eslint-disable-next-line init-declarations
@@ -19,7 +19,7 @@ tsc.on('success', () => {
 });
 
 tsc.start('--project', './tsconfig.server.json');
-
+*/
 WebpackConfig.watch = true;
 
 webpack(WebpackConfig, (err, stats) => {
@@ -37,5 +37,3 @@ webpack(WebpackConfig, (err, stats) => {
         }),
     );
 });
-
-//*/

src/view/api/client/graphs/delete-graph.graphql

@@ -1,8 +1,5 @@
-mutation deleteGraph($graphId: Int!) {
+mutation deleteGraph($graphId: UUID!) {
     deleteGraph(graphId: $graphId){
         __typename,
-        ... on InvalidGraph {
-            availableGraphsId
-        }
     }
-}
+}

src/view/api/client/graphs/get-graphs.graphql

@@ -5,8 +5,8 @@ query getGraphs {
 }
 
 
-query getGraphsById($graphsIds: [Int!]) {
-    graphs(graphsIds: $graphsIds) {
+query getGraphsById($graphsIds: [UUID!]) {
+    graphs(graphIds: $graphsIds) {
         ...GraphFragment
     }
 }

src/view/api/client/graphs/mocks/graph-v2.mocks.ts

@@ -1,14 +1,17 @@
+import { listLabelIds } from '../../../../utils/data-factory/label.factory';
+import { mainGroupOwnerId } from '../../../../utils/data-factory/user-group.factory';
 import { GQLGraph, GQLGraphDateRange, GQLGraphGroup, GQLGraphKind } from '../../../graphql/generated';
 
+
 export const GraphV2Pie: Omit<GQLGraph, 'id'> = {
     dateRange: GQLGraphDateRange.All,
     group: {
         group: GQLGraphGroup.Labels,
-        labels: [4, 5, 8],
+        labels: [4, 5, 8].map(idx => listLabelIds[idx]),
     },
-    groupOwnerId: 1,
+    groupOwnerId: mainGroupOwnerId,
     kind: GQLGraphKind.Pie,
-    labelFilter: 2,
+    labelFilterId: listLabelIds[2],
     name: 'Percentatge',
 };
 
@@ -17,13 +20,13 @@ export const GraphV2Line: Omit<GQLGraph, 'id'> = {
     group: {
         group: GQLGraphGroup.Month,
     },
-    groupOwnerId: 1,
+    groupOwnerId: mainGroupOwnerId,
     horizontalGroup: {
         accumulate: true,
         group: GQLGraphGroup.Day,
     },
     kind: GQLGraphKind.Line,
-    labelFilter: 2,
+    labelFilterId: listLabelIds[2],
     name: 'Compare by day',
 };
 
@@ -32,12 +35,12 @@ export const GraphV2Bar: Omit<GQLGraph, 'id'> = {
     group: {
         group: GQLGraphGroup.Sign,
     },
-    groupOwnerId: 1,
+    groupOwnerId: mainGroupOwnerId,
     horizontalGroup: {
         accumulate: false,
         group: GQLGraphGroup.Month,
     },
     kind: GQLGraphKind.Bar,
-    labelFilter: 1,
+    labelFilterId: listLabelIds[1],
     name: 'Income vs outcome',
 };

src/view/api/client/graphs/new-graph.graphql

@@ -7,7 +7,7 @@ mutation newGraph($graph: NewGraph!){
         ... on WrongOwnerId{
             ...WrongOwnerIdFragment
         },
-        ... on InvalidLabel{
+        ... on InvalidLabels{
             ...InvalidLabelFragment
         }
     }

src/view/api/client/graphs/update-graph.graphql

@@ -7,11 +7,8 @@ mutation updateGraph($graph: UpdateGraph!){
         ... on WrongOwnerId{
             ...WrongOwnerIdFragment
         },
-        ... on InvalidLabel{
+        ... on InvalidLabels{
             ...InvalidLabelFragment
         }
-        ... on InvalidGraph {
-            availableGraphsId
-        }
     }
 }

src/view/api/client/labels/invalid-label.graphql

@@ -1,3 +1,3 @@
-fragment InvalidLabelFragment on InvalidLabel {
+fragment InvalidLabelFragment on InvalidLabels {
     invalidLabels
-}
+}