Merge pull request #125 from socialappslab/fix/565/disable-rollbar-temp

feat: add ios to pipeline (remove rollbar)
socialappslab · Jan 29, 2025 · 58b6258 · 58b6258
2 parents cb4125d + 39c854d
commit 58b6258
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 43 deletions.
diff --git a/.sh/update-build.sh b/.sh/update-build.sh
@@ -6,4 +6,4 @@ rm .env.production && mv .env.development .env
 printf "\nEXPO_PUBLIC_CLIENT_ITEM_ACCESS_TOKEN=$EXPO_PUBLIC_CLIENT_ITEM_ACCESS_TOKEN" >> .env
 
 yarn install
-eas build --platform android --profile development --non-interactive
+eas build --platform --profile development --non-interactive
diff --git a/app.config.js b/app.config.js
@@ -29,13 +29,13 @@ export default {
       "expo-font",
       "expo-asset",
       "expo-localization",
-      [
-        "./plugins/rollbar-config-plugin",
-        {
-          environment: "development",
-          rollbarPostToken: process.env.EXPO_PUBLIC_CLIENT_ITEM_ACCESS_TOKEN,
-        },
-      ],
+      // [
+      //   "./plugins/rollbar-config-plugin",
+      //   {
+      //     environment: "development",
+      //     rollbarPostToken: process.env.EXPO_PUBLIC_CLIENT_ITEM_ACCESS_TOKEN,
+      //   },
+      // ],
       [
         "expo-location",
         {

diff --git a/app/(auth)/(tabs)/visits.tsx b/app/(auth)/(tabs)/visits.tsx
@@ -16,24 +16,23 @@ import {
 } from "@/components/themed";
 import { ClosableBottomSheet } from "@/components/themed/ClosableBottomSheet";
 import VisitSummary from "@/components/VisitSummary";
+import { authApi } from "@/config/axios";
 import Colors from "@/constants/Colors";
 import { useAuth } from "@/context/AuthProvider";
+import { useBrigades } from "@/hooks/useBrigades";
 import useCreateMutation from "@/hooks/useCreateMutation";
 import { useVisit } from "@/hooks/useVisit";
 import { QuestionnaireState, useVisitStore } from "@/hooks/useVisitStore";
 import { BaseObject, ErrorResponse, Team } from "@/schema";
 import { VisitData } from "@/types";
 import { countSetFilters, extractAxiosErrorData, formatDate } from "@/util";
-import { normalizeVisitData } from "@/util/normalizeVisitData";
 import { BottomSheetModal } from "@gorhom/bottom-sheet";
 import useAxios from "axios-hooks";
 import { deserialize, ExistingDocumentObject } from "jsonapi-fractal";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { Platform, RefreshControl, StyleSheet } from "react-native";
 import Toast from "react-native-toast-message";
 import { Routes } from "../(visit)/_layout";
-import { useBrigades } from "@/hooks/useBrigades";
-import { authApi } from "@/config/axios";
 import { sanitizeInspections } from "../(visit)/sanitizeInspections";
 
 interface HouseReport {
@@ -149,8 +148,9 @@ export default function Visits() {
   const { storedVisits, cleanUpStoredVisit } = useVisitStore();
   const { language, isConnected } = useVisit();
   const [selectedVisit, setSelectedVisit] = useState<QuestionnaireState>();
-  const { user, meData, rollbar } = useAuth();
-  const [team, setTeam] = useState<Team | null>(null);
+  // const { user, meData, rollbar } = useAuth();
+  const { meData } = useAuth();
+  const [setTeam] = useState<Team | null>(null);
   const [loading, setLoading] = useState(false);
   const [success, setSuccess] = useState(false);
   const { filters, setFilter } = useBrigades();
@@ -266,7 +266,7 @@ export default function Visits() {
 
     try {
       setLoading(true);
-      rollbar.log(JSON.stringify(visitToSubmit));
+      // rollbar?.log(JSON.stringify(visitToSubmit));
       await createVisit({ json_params: JSON.stringify(visitToSubmit) });
       cleanUpStoredVisit(visitToSubmit);
       setSuccess(true);
@@ -278,7 +278,7 @@ export default function Visits() {
       setLoading(false);
     } catch (error) {
       const errorData = extractAxiosErrorData(error);
-      rollbar.error(visitToSubmit, errorData);
+      // rollbar?.error(visitToSubmit, errorData);
       Toast.show({
         type: "error",
         text1: t(["errorCodes.generic"]),

diff --git a/app/(auth)/(visit)/summary.tsx b/app/(auth)/(visit)/summary.tsx
@@ -95,8 +95,8 @@ export default function Summary() {
       // We only make the request if it's connected
       if (isConnected)
         await createVisit({ json_params: JSON.stringify(sanitizedVisitData) });
-      if (isConnected && rollbar)
-        rollbar.log(JSON.stringify(sanitizedVisitData));
+      // if (isConnected && rollbar)
+      //   rollbar.log(JSON.stringify(sanitizedVisitData));
 
       Toast.show({
         type: "success",

diff --git a/context/AuthProvider.tsx b/context/AuthProvider.tsx
@@ -13,7 +13,8 @@ import {
 import { resetAuthApi, setAccessTokenToHeaders } from "@/config/axios";
 import useUser from "@/hooks/useUser";
 import { ErrorResponse } from "@/schema";
-import { Client } from "rollbar-react-native";
+// import { Client } from "rollbar-react-native";
+import { Platform } from "react-native";
 
 type AuthProviderType = {
   user: IUser | null;
@@ -26,7 +27,7 @@ type AuthProviderType = {
   login: (token: string, refreshToken: string, user: IUser) => boolean;
   logout: () => void;
   reFetchMe: () => void;
-  rollbar: Client;
+  // rollbar: Client | null;
 };
 
 function useProtectedRoute(user: IUser | null) {
@@ -69,22 +70,24 @@ export default function AuthProvider({ children }: { children: ReactNode }) {
   const [[, userFromLocalStorage], setUserLocalStorage] = useUser();
   const [user, setLoadedUser] = useState<IUser | null>(null);
   const [meData, setMeData] = useState<IUser | null>(null);
-  const [rollbar, setRollbar] = useState<Client | null>(null);
-
-  const setRollbarClient = (person: {
-    id: string;
-    email?: string;
-    username?: string;
-  }) => {
-    const client = new Client({
-      accessToken: process.env.EXPO_PUBLIC_CLIENT_ITEM_ACCESS_TOKEN,
-      captureUncaught: true,
-      captureDeviceInfo: true,
-      payload: person,
-    });
-    client.setPerson(person.id, undefined, person.email);
-    setRollbar(client);
-  };
+  // const [rollbar, setRollbar] = useState<Client | null>(null);
+
+  // const setRollbarClient = (person: {
+  //   id: string;
+  //   email?: string;
+  //   username?: string;
+  // }) => {
+  //   if (Platform.OS !== "ios") {
+  //     const client = new Client({
+  //       accessToken: process.env.EXPO_PUBLIC_CLIENT_ITEM_ACCESS_TOKEN,
+  //       captureUncaught: true,
+  //       captureDeviceInfo: true,
+  //       payload: person,
+  //     });
+  //     client.setPerson(person.id, undefined, person.email);
+  //     setRollbar(client);
+  //   }
+  // };
 
   const [[loadingToken, token], setToken] = useStorageState(
     ACCESS_TOKEN_LOCAL_STORAGE_KEY,
@@ -131,11 +134,13 @@ export default function AuthProvider({ children }: { children: ReactNode }) {
     setToken(token);
     setAccessTokenToHeaders(token);
     setRefreshToken(refreshToken);
-    setRollbarClient({
-      id: user.id,
-      email: user.email || user.phone,
-      username: user.username,
-    });
+    // if (Platform.OS !== "ios") {
+    //   setRollbarClient({
+    //     id: user.id,
+    //     email: user.email || user.phone,
+    //     username: user.username,
+    //   });
+    // }
     return true;
   };
 

diff --git a/eas.json b/eas.json
@@ -21,6 +21,11 @@
         "buildType": "app-bundle"
       }
     },
+    "test_flight": {
+      "developmentClient": false,
+      "distribution": "store",
+      "autoIncrement": "true"
+    },
     "preview": {
       "distribution": "internal"
     },

diff --git a/package.json b/package.json
@@ -74,8 +74,6 @@
     "react-native-toast-message": "^2.2.0",
     "react-native-web": "~0.19.10",
     "redux-devtools-expo-dev-plugin": "^0.2.1",
-    "rollbar": "^2.26.4",
-    "rollbar-react-native": "^1.0.0-beta.5",
     "zod": "^3.23.8",
     "zustand": "^5.0.0-rc.2"
   },

diff --git a/plugins/rollbar-config-plugin/index.js b/plugins/rollbar-config-plugin/index.js
@@ -1,7 +1,9 @@
 const withRollbarAndroid = require("./withRollbarAndroid");
 
 const withRollbar = (config, options) => {
-  config = withRollbarAndroid(config, options);
+  if (!config.ios) {
+    config = withRollbarAndroid(config, options);
+  }
 
   return config;
 };