Fix a typescript issue with catch variable type

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2021-09-29 18:20:33 +02:00 · 2021-09-29 18:20:33 +02:00 · dc52cd042b
parent 7bf745edf7
commit dc52cd042b
27 changed files with 87 additions and 75 deletions
--- a/js/src/components/Admin/Followers.vue
+++ b/js/src/components/Admin/Followers.vue
@ -209,12 +209,14 @@ export default class Followers extends Mixins(RelayMixin) {
      });
      await this.$apollo.queries.relayFollowers.refetch();
      this.checkedRows = [];
-    } catch (e) {
-      Snackbar.open({
-        message: e.message,
-        type: "is-danger",
-        position: "is-bottom",
-      });
+    } catch (e: any) {
+      if (e.message) {
+        Snackbar.open({
+          message: e.message,
+          type: "is-danger",
+          position: "is-bottom",
+        });
+      }
    }
  }

@ -228,12 +230,14 @@ export default class Followers extends Mixins(RelayMixin) {
      });
      await this.$apollo.queries.relayFollowers.refetch();
      this.checkedRows = [];
-    } catch (e) {
-      Snackbar.open({
-        message: e.message,
-        type: "is-danger",
-        position: "is-bottom",
-      });
+    } catch (e: any) {
+      if (e.message) {
+        Snackbar.open({
+          message: e.message,
+          type: "is-danger",
+          position: "is-bottom",
+        });
+      }
    }
  }

@ -250,7 +254,7 @@ export default class Followers extends Mixins(RelayMixin) {
          limit: FOLLOWERS_PER_PAGE,
        },
      });
-    } catch (err) {
+    } catch (err: any) {
      console.error(err);
    }
  }
--- a/js/src/components/Admin/Followings.vue
+++ b/js/src/components/Admin/Followings.vue
@ -203,7 +203,7 @@ export default class Followings extends Mixins(RelayMixin) {
          limit: FOLLOWINGS_PER_PAGE,
        },
      });
-    } catch (err) {
+    } catch (err: any) {
      console.error(err);
    }
  }
@ -254,12 +254,14 @@ export default class Followings extends Mixins(RelayMixin) {
        },
      });
      this.newRelayAddress = "";
-    } catch (err) {
-      Snackbar.open({
-        message: err.message,
-        type: "is-danger",
-        position: "is-bottom",
-      });
+    } catch (err: any) {
+      if (err.message) {
+        Snackbar.open({
+          message: err.message,
+          type: "is-danger",
+          position: "is-bottom",
+        });
+      }
    }
  }

@ -295,12 +297,14 @@ export default class Followings extends Mixins(RelayMixin) {
      });
      await this.$apollo.queries.relayFollowings.refetch();
      this.checkedRows = [];
-    } catch (e) {
-      Snackbar.open({
-        message: e.message,
-        type: "is-danger",
-        position: "is-bottom",
-      });
+    } catch (e: any) {
+      if (e.message) {
+        Snackbar.open({
+          message: e.message,
+          type: "is-danger",
+          position: "is-bottom",
+        });
+      }
    }
  }
 }
--- a/js/src/components/Comment/Comment.vue
+++ b/js/src/components/Comment/Comment.vue
@ -322,12 +322,14 @@ export default class Comment extends Vue {
        position: "is-bottom-right",
        duration: 5000,
      });
-    } catch (e) {
-      Snackbar.open({
-        message: e.message,
-        type: "is-danger",
-        position: "is-bottom",
-      });
+    } catch (e: any) {
+      if (e.message) {
+        Snackbar.open({
+          message: e.message,
+          type: "is-danger",
+          position: "is-bottom",
+        });
+      }
    }
  }
 }
--- a/js/src/components/Comment/CommentTree.vue
+++ b/js/src/components/Comment/CommentTree.vue
@ -213,7 +213,7 @@ export default class CommentTree extends Vue {

      // and reset the new comment field
      this.newComment = new CommentModel();
-    } catch (errors) {
+    } catch (errors: any) {
      console.error(errors);
      if (errors.graphQLErrors && errors.graphQLErrors.length > 0) {
        const error = errors.graphQLErrors[0];
@ -295,7 +295,7 @@ export default class CommentTree extends Vue {
        },
      });
      // this.comments = this.comments.filter(commentItem => commentItem.id !== comment.id);
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.$notifier.error(error.graphQLErrors[0].message);
--- a/js/src/components/Editor.vue
+++ b/js/src/components/Editor.vue
@ -331,7 +331,7 @@ export default class EditorComponent extends Vue {
          })
          .run();
      }
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.$notifier.error(error.graphQLErrors[0].message);
--- a/js/src/components/Group/Invitations.vue
+++ b/js/src/components/Group/Invitations.vue
@ -38,7 +38,7 @@ export default class Invitations extends Vue {
      if (data) {
        this.$emit("accept-invitation", data.acceptInvitation);
      }
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.$notifier.error(error.graphQLErrors[0].message);
@ -60,7 +60,7 @@ export default class Invitations extends Vue {
      if (data) {
        this.$emit("reject-invitation", data.rejectInvitation);
      }
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.$notifier.error(error.graphQLErrors[0].message);
--- a/js/src/components/Participation/ParticipationWithoutAccount.vue
+++ b/js/src/components/Participation/ParticipationWithoutAccount.vue
@ -249,7 +249,7 @@ export default class ParticipationWithoutAccount extends Vue {
          data.joinEvent.metadata.cancellationToken
        );
      }
-    } catch (e) {
+    } catch (e: any) {
      if (
        ["TextEncoder is not defined", "crypto.subtle is undefined"].includes(
          e.message
--- a/js/src/components/Resource/FolderItem.vue
+++ b/js/src/components/Resource/FolderItem.vue
@ -110,7 +110,7 @@ export default class FolderItem extends Mixins(ResourceMixin) {
        return undefined;
      }
      return data.updateResource;
-    } catch (e) {
+    } catch (e: any) {
      Snackbar.open({
        message: e.message,
        type: "is-danger",
--- a/js/src/components/Settings/NotificationsOnboarding.vue
+++ b/js/src/components/Settings/NotificationsOnboarding.vue
@ -60,7 +60,7 @@ export default class NotificationsOnboarding extends mixins(Onboarding) {
  async updateSetting(variables: Record<string, unknown>): Promise<void> {
    try {
      this.doUpdateSetting(variables);
-    } catch (e) {
+    } catch (e: any) {
      Snackbar.open({
        message: e.message,
        type: "is-danger",
--- a/js/src/components/Todo/CompactTodo.vue
+++ b/js/src/components/Todo/CompactTodo.vue
@ -55,7 +55,7 @@ export default class Todo extends Vue {
        },
      });
      this.editMode = false;
-    } catch (e) {
+    } catch (e: any) {
      Snackbar.open({
        message: e.message,
        type: "is-danger",
--- a/js/src/components/Todo/FullTodo.vue
+++ b/js/src/components/Todo/FullTodo.vue
@ -91,7 +91,7 @@ export default class Todo extends Vue {
        },
      });
      this.editMode = false;
-    } catch (e) {
+    } catch (e: any) {
      Snackbar.open({
        message: e.message,
        type: "is-danger",
--- a/js/src/mixins/event.ts
+++ b/js/src/mixins/event.ts
@ -101,7 +101,7 @@ export default class EventMixin extends mixins(Vue) {
      if (resultData) {
        this.participationCancelledMessage();
      }
-    } catch (error) {
+    } catch (error: any) {
      Snackbar.open({
        message: error.message,
        type: "is-danger",
@ -183,7 +183,7 @@ export default class EventMixin extends mixins(Vue) {
        position: "is-bottom-right",
        duration: 5000,
      });
-    } catch (error) {
+    } catch (error: any) {
      Snackbar.open({
        message: error.message,
        type: "is-danger",
--- a/js/src/views/Account/Register.vue
+++ b/js/src/views/Account/Register.vue
@ -210,7 +210,7 @@ export default class Register extends mixins(identityEditionMixin) {
          await this.$router.push({ name: RouteName.HOME });
        }
      }
-    } catch (errorCatched) {
+    } catch (errorCatched: any) {
      this.errors = errorCatched.graphQLErrors.reduce(
        (acc: { [key: string]: string }, error: any) => {
          acc[error.details || error.field] = error.message;
--- a/js/src/views/Discussions/Create.vue
+++ b/js/src/views/Discussions/Create.vue
@ -133,7 +133,7 @@ export default class CreateDiscussion extends Vue {
          slug: data.createDiscussion.slug,
        },
      });
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        if (error.graphQLErrors[0].field == "title") {
--- a/js/src/views/Group/Create.vue
+++ b/js/src/views/Group/Create.vue
@ -174,7 +174,7 @@ export default class CreateGroup extends mixins(IdentityEditionMixin) {
          displayName: this.group.displayName(),
        }) as string
      );
-    } catch (err) {
+    } catch (err: any) {
      this.handleError(err);
    }
  }
--- a/js/src/views/Group/Group.vue
+++ b/js/src/views/Group/Group.vue
@ -704,7 +704,7 @@ export default class Group extends mixins(GroupMixin) {
          },
        ],
      });
-    } catch (error) {
+    } catch (error: any) {
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.$notifier.error(error.graphQLErrors[0].message);
      }
@ -754,7 +754,7 @@ export default class Group extends mixins(GroupMixin) {
      this.$notifier.success(
        this.$t("Group {groupTitle} reported", { groupTitle }) as string
      );
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      this.$notifier.error(
        this.$t("Error while reporting group {groupTitle}", {
--- a/js/src/views/Group/GroupFollowers.vue
+++ b/js/src/views/Group/GroupFollowers.vue
@ -246,7 +246,7 @@ export default class GroupFollowers extends mixins(GroupMixin) {
            username: follower.actor.preferredUsername,
          });
      this.$notifier.success(message as string);
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.$notifier.error(error.graphQLErrors[0].message);
--- a/js/src/views/Group/GroupMembers.vue
+++ b/js/src/views/Group/GroupMembers.vue
@ -335,7 +335,7 @@ export default class GroupMembers extends mixins(GroupMixin) {
        }) as string
      );
      this.newMemberUsername = "";
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.inviteError = error.graphQLErrors[0].message;
@ -402,7 +402,7 @@ export default class GroupMembers extends mixins(GroupMixin) {
          group: this.group.name || usernameWithDomain(this.group),
        }) as string
      );
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.$notifier.error(error.graphQLErrors[0].message);
@ -458,7 +458,7 @@ export default class GroupMembers extends mixins(GroupMixin) {
          successMessage = "The member role was updated to simple member";
      }
      this.$notifier.success(this.$t(successMessage) as string);
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.$notifier.error(error.graphQLErrors[0].message);
--- a/js/src/views/Group/GroupSettings.vue
+++ b/js/src/views/Group/GroupSettings.vue
@ -238,7 +238,7 @@ export default class GroupSettings extends mixins(GroupMixin) {
        variables,
      });
      this.$notifier.success(this.$t("Group settings saved") as string);
-    } catch (err) {
+    } catch (err: any) {
      this.handleError(err);
    }
  }
--- a/js/src/views/Group/MyGroups.vue
+++ b/js/src/views/Group/MyGroups.vue
@ -156,7 +156,7 @@ export default class MyGroups extends Vue {
          },
        ],
      });
-    } catch (error) {
+    } catch (error: any) {
      if (error.graphQLErrors && error.graphQLErrors.length > 0) {
        this.$notifier.error(error.graphQLErrors[0].message);
      }
--- a/js/src/views/Posts/Edit.vue
+++ b/js/src/views/Posts/Edit.vue
@ -323,7 +323,7 @@ export default class EditPost extends mixins(GroupMixin) {
            params: { slug: data.createPost.slug },
          });
        }
-      } catch (error) {
+      } catch (error: any) {
        console.error(error);
        this.errors = error.graphQLErrors.reduce(
          (acc: { [key: string]: any }, localError: any) => {
@ -384,7 +384,7 @@ export default class EditPost extends mixins(GroupMixin) {
          obj.picture = { mediaId: this.editablePost.picture.id };
        }
      }
-    } catch (e) {
+    } catch (e: any) {
      console.error(e);
    }
    return obj;
--- a/js/src/views/Resources/ResourceFolder.vue
+++ b/js/src/views/Resources/ResourceFolder.vue
@ -441,7 +441,7 @@ export default class Resources extends Mixins(ResourceMixin) {
      this.newResource.title = "";
      this.newResource.summary = "";
      this.newResource.resourceUrl = "";
-    } catch (err) {
+    } catch (err: any) {
      console.error(err);
      this.modalError = err.graphQLErrors[0].message;
    }
@ -461,7 +461,7 @@ export default class Resources extends Mixins(ResourceMixin) {
      this.newResource.summary = data.previewResourceLink.description;
      this.newResource.metadata = data.previewResourceLink;
      this.newResource.type = "link";
-    } catch (err) {
+    } catch (err: any) {
      console.error(err);
      this.modalError = err.graphQLErrors[0].message;
    }
@ -568,7 +568,7 @@ export default class Resources extends Mixins(ResourceMixin) {
        (id) => id !== resourceID
      );
      delete this.checkedResources[resourceID];
-    } catch (e) {
+    } catch (e: any) {
      console.error(e);
    }
  }
@ -705,7 +705,7 @@ export default class Resources extends Mixins(ResourceMixin) {
          console.log("Finished adding resource to new parent");
        },
      });
-    } catch (e) {
+    } catch (e: any) {
      console.error(e);
    }
  }
@ -740,7 +740,7 @@ export default class Resources extends Mixins(ResourceMixin) {
        params: { path },
        query: { ...this.$route.query, ...args },
      });
-    } catch (e) {
+    } catch (e: any) {
      if (isNavigationFailure(e, NavigationFailureType.redirected)) {
        throw Error(e.toString());
      }
--- a/js/src/views/Settings/AccountSettings.vue
+++ b/js/src/views/Settings/AccountSettings.vue
@ -303,7 +303,7 @@ export default class AccountSettings extends Vue {
      );
      this.newEmail = "";
      this.passwordForEmailChange = "";
-    } catch (err) {
+    } catch (err: any) {
      this.handleErrors("email", err);
    }
  }
@ -325,7 +325,7 @@ export default class AccountSettings extends Vue {
      this.$notifier.success(
        this.$t("The password was successfully changed") as string
      );
-    } catch (err) {
+    } catch (err: any) {
      this.handleErrors("password", err);
    }
  }
@ -359,7 +359,7 @@ export default class AccountSettings extends Vue {
      });

      return await this.$router.push({ name: RouteName.HOME });
-    } catch (err) {
+    } catch (err: any) {
      this.deletePasswordErrors = err.graphQLErrors.map(
        ({ message }: GraphQLError) => message
      );
--- a/js/src/views/User/Login.vue
+++ b/js/src/views/User/Login.vue
@ -233,7 +233,7 @@ export default class Login extends Vue {
      }
      this.$router.push({ name: RouteName.HOME });
      return;
-    } catch (err) {
+    } catch (err: any) {
      this.submitted = false;
      if (err.graphQLErrors) {
        err.graphQLErrors.forEach(({ message }: { message: string }) => {
@ -257,7 +257,7 @@ export default class Login extends Vue {
    });
    try {
      await initializeCurrentActor(this.$apollo.provider.defaultClient);
-    } catch (err) {
+    } catch (err: any) {
      if (err instanceof NoIdentitiesException) {
        await this.$router.push({
          name: RouteName.REGISTER_PROFILE,
--- a/js/src/views/User/PasswordReset.vue
+++ b/js/src/views/User/PasswordReset.vue
@ -95,7 +95,7 @@ export default class PasswordReset extends Vue {
      saveUserData(data.resetPassword);
      this.$router.push({ name: RouteName.HOME });
      return;
-    } catch (err) {
+    } catch (err: any) {
      err.graphQLErrors.forEach(({ message }: { message: any }) => {
        this.errors.push(message);
      });
--- a/js/src/views/User/Register.vue
+++ b/js/src/views/User/Register.vue
@ -256,7 +256,7 @@ export default class Register extends Vue {
        name: RouteName.REGISTER_PROFILE,
        params: { email: this.credentials.email },
      });
-    } catch (error) {
+    } catch (error: any) {
      console.error(error);
      this.errors = error.graphQLErrors.reduce(
        (acc: string[], localError: any) => {
--- a/js/src/views/User/SendPasswordReset.vue
+++ b/js/src/views/User/SendPasswordReset.vue
@ -117,13 +117,15 @@ export default class SendPasswordReset extends Vue {
      });

      this.validationSent = true;
-    } catch (err) {
+    } catch (err: any) {
      console.error(err);
-      err.graphQLErrors.forEach(({ message }: { message: string }) => {
-        if (this.errors.indexOf(message) < 0) {
-          this.errors.push(message);
-        }
-      });
+      if (err.graphQLErrors) {
+        err.graphQLErrors.forEach(({ message }: { message: string }) => {
+          if (this.errors.indexOf(message) < 0) {
+            this.errors.push(message);
+          }
+        });
+      }
    }
  }