Merge pull request #63 from Resgrid/develop

CU-868cu9311 Cleanup

Author: ucswift

.eslintrc.js

@@ -2,15 +2,7 @@ const path = require('path');
 
 module.exports = {
   extends: ['expo', 'plugin:tailwindcss/recommended', 'prettier'],
-  plugins: [
-    'prettier',
-    'unicorn',
-    '@typescript-eslint',
-    'unused-imports',
-    'tailwindcss',
-    'simple-import-sort',
-    'eslint-plugin-react-compiler',
-  ],
+  plugins: ['prettier', 'unicorn', '@typescript-eslint', 'unused-imports', 'tailwindcss', 'simple-import-sort', 'eslint-plugin-react-compiler'],
   parserOptions: {
     project: './tsconfig.json',
   },
@@ -43,9 +35,9 @@ module.exports = {
     'simple-import-sort/exports': 'error', // Export configuration for `eslint-plugin-simple-import-sort`
     '@typescript-eslint/no-unused-vars': 'off',
     'tailwindcss/no-custom-classname': 'off',
-    'unused-imports/no-unused-imports': 'error',
+    'unused-imports/no-unused-imports': 'off',
     'unused-imports/no-unused-vars': [
-      'error',
+      'off',
       {
         argsIgnorePattern: '^_',
         varsIgnorePattern: '^_',

.github/workflows/react-native-cicd.yml

@@ -72,20 +72,8 @@ jobs:
       - name: 📦 Install dependencies
         run: pnpm install
 
-      - name: 🧪 Run TypeScript check
-        run: pnpm tsc
-
-      - name: 🧹 Run ESLint
-        run: pnpm lint
-
-      - name: 🎨 Run Prettier check
-        run: pnpm format:check
-
-      - name: 🧪 Run Jest Tests
-        run: pnpm test
-
-      - name: 🧪 Run React Native Testing Library Tests
-        run: pnpm test:rntl
+      - name: 🧪 Run Checks and Tests
+        run: pnpm check-all
 
   build-and-deploy:
     if: (github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')) || github.event_name == 'workflow_dispatch'
@@ -96,6 +84,7 @@ jobs:
           - platform: ios
             runs-on: macos-latest
     runs-on: ${{ matrix.platform == 'ios' && 'macos-latest' || 'ubuntu-latest' }}
+    environment: RNBuild
     steps:
       - name: 🏗 Checkout repository
         uses: actions/checkout@v4

expo-env.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="expo/types" />
 
-// NOTE: This file should not be edited and should be in your git ignore
+// NOTE: This file should not be edited and should be in your git ignore

jest.config.js

@@ -2,15 +2,7 @@ module.exports = {
   preset: 'jest-expo',
   setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],
   testMatch: ['**/?(*.)+(spec|test).ts?(x)'],
-  collectCoverageFrom: [
-    'src/**/*.{ts,tsx}',
-    '!**/coverage/**',
-    '!**/node_modules/**',
-    '!**/babel.config.js',
-    '!**/jest.setup.js',
-    '!**/docs/**',
-    '!**/cli/**',
-  ],
+  collectCoverageFrom: ['src/**/*.{ts,tsx}', '!**/coverage/**', '!**/node_modules/**', '!**/babel.config.js', '!**/jest.setup.js', '!**/docs/**', '!**/cli/**'],
   moduleFileExtensions: ['js', 'ts', 'tsx'],
   moduleDirectories: ['node_modules', '<rootDir>/'],
   transformIgnorePatterns: [

lint-staged.config.js

@@ -1,16 +1,5 @@
 module.exports = {
-  '**/*.{js,jsx,ts,tsx}': (filenames) => [
-    `npx eslint --fix ${filenames
-      .map((filename) => `"${filename}"`)
-      .join(' ')}`,
-  ],
-  '**/*.(md|json)': (filenames) =>
-    `npx prettier --write ${filenames
-      .map((filename) => `"${filename}"`)
-      .join(' ')}`,
-  'src/translations/*.(json)': (filenames) => [
-    `npx eslint --fix ${filenames
-      .map((filename) => `"${filename}"`)
-      .join(' ')}`,
-  ],
+  '**/*.{js,jsx,ts,tsx}': (filenames) => [`npx eslint --fix ${filenames.map((filename) => `"${filename}"`).join(' ')}`],
+  '**/*.(md|json)': (filenames) => `npx prettier --write ${filenames.map((filename) => `"${filename}"`).join(' ')}`,
+  'src/translations/*.(json)': (filenames) => [`npx eslint --fix ${filenames.map((filename) => `"${filename}"`).join(' ')}`],
 };

package.json

@@ -151,6 +151,7 @@
     "@expo/config": "~10.0.3",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react-native": "^12.7.2",
+    "@types/geojson": "^7946.0.16",
     "@types/i18n-js": "^3.8.9",
     "@types/jest": "^29.5.12",
     "@types/lodash.memoize": "^4.1.9",

pnpm-lock.yaml

@@ -1,22 +1,15 @@
-const validate = (message = "") => {
-  if (!(message || "").trim()) {
-    throw new SyntaxError("Message is Empty.");
+const validate = (message = '') => {
+  if (!(message || '').trim()) {
+    throw new SyntaxError('Message is Empty.');
   }
-  if (typeof message !== "string") {
-    throw new TypeError("Message must be a String.");
+  if (typeof message !== 'string') {
+    throw new TypeError('Message must be a String.');
   }
-  if (
-    (message.includes("{") || message.includes("}")) &&
-    !/{{ ?(?:- |\w+?)(, ?)?\w+? ?}}/g.test(message)
-  ) {
-    throw new SyntaxError(
-      "Interpolation error. See: https://www.i18next.com/misc/json-format",
-    );
+  if ((message.includes('{') || message.includes('}')) && !/{{ ?(?:- |\w+?)(, ?)?\w+? ?}}/g.test(message)) {
+    throw new SyntaxError('Interpolation error. See: https://www.i18next.com/misc/json-format');
   }
-  if (message.includes("$t(") && !/\$t\([\w]+:\w+(?:\.\w+)*\)/g.test(message)) {
-    throw new SyntaxError(
-      "Nesting error. See: https://www.i18next.com/misc/json-format",
-    );
+  if (message.includes('$t(') && !/\$t\([\w]+:\w+(?:\.\w+)*\)/g.test(message)) {
+    throw new SyntaxError('Nesting error. See: https://www.i18next.com/misc/json-format');
   }
 };
 

scripts/i18next-syntax-validation.js

@@ -1,8 +1,4 @@
-import axios, {
-  type AxiosProgressEvent,
-  type AxiosRequestConfig,
-  type AxiosResponse,
-} from 'axios';
+import axios, { type AxiosProgressEvent, type AxiosRequestConfig, type AxiosResponse } from 'axios';
 
 import { createApiEndpoint } from '@/api/common/client';
 import { type CallFilesResult } from '@/models/v4/callFiles/callFilesResult';
@@ -33,10 +29,7 @@ const getCallFilesApi = createApiEndpoint('/CallFiles/GetFilesForCall');
 const saveCallFileApi = createApiEndpoint('/CallFiles/SaveCallFile');
 
 // Function to download a file with progress reporting
-export const getCallAttachmentFile = async (
-  url: string,
-  options: DownloadOptions = {}
-): Promise<Blob> => {
+export const getCallAttachmentFile = async (url: string, options: DownloadOptions = {}): Promise<Blob> => {
   const { onEvent, headers = {}, timeout = 30000 } = options;
 
   try {
@@ -51,9 +44,7 @@ export const getCallAttachmentFile = async (
       timeout,
       onDownloadProgress: (progressEvent: AxiosProgressEvent) => {
         if (progressEvent.total) {
-          const percentCompleted = Math.round(
-            (progressEvent.loaded * 100) / progressEvent.total
-          );
+          const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
 
           // Notify progress event
           onEvent?.({
@@ -79,8 +70,7 @@ export const getCallAttachmentFile = async (
     // Notify error event
     onEvent?.({
       type: 'error',
-      error:
-        error instanceof Error ? error : new Error('Unknown error occurred'),
+      error: error instanceof Error ? error : new Error('Unknown error occurred'),
     });
 
     throw error;
@@ -99,11 +89,7 @@ export const saveBlobAsFile = (blob: Blob, fileName: string): void => {
   window.URL.revokeObjectURL(url);
 };
 
-export const getFiles = async (
-  callId: string,
-  includeData: boolean,
-  type: number
-) => {
+export const getFiles = async (callId: string, includeData: boolean, type: number) => {
   const response = await getCallFilesApi.get<CallFilesResult>({
     callId: callId,
     includeData: includeData,
@@ -139,16 +125,7 @@ export const getCallAudio = async (callId: string, includeData: boolean) => {
   return response.data;
 };
 
-export const saveCallFile = async (
-  callId: string,
-  userId: string,
-  note: string,
-  name: string,
-  latitude: number | null,
-  longitude: number | null,
-  file: string,
-  type: number
-) => {
+export const saveCallFile = async (callId: string, userId: string, note: string, name: string, latitude: number | null, longitude: number | null, file: string, type: number) => {
   let data = {
     CallId: callId,
     UserId: userId,
@@ -171,26 +148,10 @@ export const saveCallFile = async (
   return response.data;
 };
 
-export const saveCallImage = async (
-  callId: string,
-  userId: string,
-  note: string,
-  name: string,
-  latitude: number | null,
-  longitude: number | null,
-  file: string
-) => {
+export const saveCallImage = async (callId: string, userId: string, note: string, name: string, latitude: number | null, longitude: number | null, file: string) => {
   return saveCallFile(callId, userId, note, name, latitude, longitude, file, 2);
 };
 
-export const saveCallFileAttachment = async (
-  callId: string,
-  userId: string,
-  note: string,
-  name: string,
-  latitude: number | null,
-  longitude: number | null,
-  file: string
-) => {
+export const saveCallFileAttachment = async (callId: string, userId: string, note: string, name: string, latitude: number | null, longitude: number | null, file: string) => {
   return saveCallFile(callId, userId, note, name, latitude, longitude, file, 3);
 };

src/api/calls/callFiles.ts

@@ -12,13 +12,7 @@ export const getCallNotes = async (callId: string) => {
   return response.data;
 };
 
-export const saveCallNote = async (
-  callId: string,
-  userId: string,
-  note: string,
-  latitude: number | null,
-  longitude: number | null
-) => {
+export const saveCallNote = async (callId: string, userId: string, note: string, latitude: number | null, longitude: number | null) => {
   let data = {
     CallId: callId,
     UserId: userId,