Merge branch 'develop' into issue/10157/fix-rm-org-route-method

.eslintrc.json

@@ -19,13 +19,8 @@
   ],
   "overrides": [
     {
-      "files": [
-        "**/*.mdx"
-      ],
-      "extends": [
-        "plugin:react/recommended",
-        "plugin:mdx/recommended"
-      ],
+      "files": ["**/*.mdx"],
+      "extends": ["plugin:react/recommended", "plugin:mdx/recommended"],
       "rules": {
         "react/jsx-no-target-blank": "off",
         "i18next/no-literal-string": "off"
@@ -40,10 +35,7 @@
     "ecmaVersion": 12,
     "sourceType": "module"
   },
-  "plugins": [
-    "@typescript-eslint",
-    "i18next"
-  ],
+  "plugins": ["@typescript-eslint", "i18next", "no-relative-import-paths"],
   "rules": {
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": [
@@ -61,22 +53,20 @@
       {
         "mode": "jsx-only",
         "jsx-attributes": {
-          "include": [
-            "label",
-            "placeholder",
-            "error",
-            "title"
-          ],
-          "exclude": [
-            ".*"
-          ]
+          "include": ["label", "placeholder", "error", "title"],
+          "exclude": [".*"]
         },
         "callees": {
-          "exclude": [
-            ".*"
-          ]
+          "exclude": [".*"]
         }
       }
+    ],
+    "no-relative-import-paths/no-relative-import-paths": [
+      "error",
+      {
+        "allowSameFolder": true,
+        "prefix": "@"
+      }
     ]
   },
   "ignorePatterns": [

.github/workflows/auto-testing-label.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   auto_label:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Check PR Conditions and Add Label

.github/workflows/combine.yml

@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   combine-prs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Combine dependencies

.github/workflows/comment-p1-issues.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   add-comment:
     if: github.event.label.name == 'P1' && github.repository == 'ohcnetwork/care_fe'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     permissions:
       issues: write
     steps:

.github/workflows/cypress.yaml

@@ -11,7 +11,7 @@ jobs:
   cypress-run:
     permissions: write-all
     if: github.repository == 'ohcnetwork/care_fe'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     strategy:
       fail-fast: false
       matrix:
@@ -77,14 +77,14 @@ jobs:
           SPLIT_INDEX: ${{ strategy.job-index }}
 
       - name: Upload cypress screenshots on failure 📸
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
 
       - name: Upload cypress videos 📹
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ failure() && steps.pr_origin.outputs.is_forked == 'true' }}
         with:
           name: cypress-videos

.github/workflows/deploy.yaml

@@ -28,7 +28,7 @@ env:
 jobs:
   test:
     if: github.repository == 'ohcnetwork/care_fe'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     name: Test
     steps:
       - uses: actions/checkout@v4
@@ -63,7 +63,7 @@ jobs:
     needs: test
     if: github.ref == 'refs/heads/develop' || startsWith(github.event.ref, 'refs/tags/v')
     name: Build & Push to container registries
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v4
 
@@ -133,9 +133,8 @@ jobs:
     needs: build
     if: startsWith(github.event.ref, 'refs/tags/v')
     name: Notify release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
       - name: Notify release
         run: |
           echo "Release ${{ github.sha }} is ready to be deployed to production"
-

.github/workflows/issue-automation.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   issue_opened_and_reopened:
     name: issue_opened_and_reopened
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     if: github.repository == 'ohcnetwork/care_fe' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
     steps:
       - name: 'Move issue to "Triage"'
@@ -22,7 +22,7 @@ jobs:
           status_value: "Triage"
   issue_closed:
     name: issue_closed
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     if: github.repository == 'ohcnetwork/care_fe' &&  github.event_name == 'issues' && github.event.action == 'closed'
     steps:
       - name: 'Moved issue to "Done"'
@@ -35,7 +35,7 @@ jobs:
           status_value: "Done"
   issue_assigned:
     name: issue_assigned
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     if: github.repository == 'ohcnetwork/care_fe' &&  github.event_name == 'issues' && github.event.action == 'assigned'
     steps:
       - name: 'Move issue to "In Progress"'

.github/workflows/label-deploy-failed.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   auto-label-deploy-failed:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     if: |
       github.repository == 'ohcnetwork/care_fe' && github.event.issue.pull_request &&
       contains(github.event.comment.body, 'Deploy Preview')

.github/workflows/label-merge-conflict.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   auto-label:
     if: github.repository == 'ohcnetwork/care_fe'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
       - uses: prince-chrismc/label-merge-conflicts-action@v2
         with:

.github/workflows/label-wip.yml

@@ -11,7 +11,7 @@ jobs:
   check-linked-issues:
     if: github.repository == 'ohcnetwork/care_fe'
     name: Check linked issues
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     outputs:
       linked_issues: ${{ steps.issue-output.outputs.linked_issues }}
     steps:
@@ -26,7 +26,7 @@ jobs:
 
   label-issues:
     name: Label linked issues
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     needs: check-linked-issues
     permissions: write-all
     if: github.repository == 'ohcnetwork/care_fe' && join(needs.check-linked-issues.outputs.linked_issues) != ''

.github/workflows/linter.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     permissions:
       contents: read
       packages: read
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: "20"
 
       - name: Install dependencies
         run: npm ci

.github/workflows/notify-non-core-qn.yml

@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   notify_core_team:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     env:
       ALLOWED_USERNAMES: ${{ vars.ALLOWED_USERNAMES || '' }}
       QUESTION_KEYWORDS: ${{ vars.QUESTION_KEYWORDS || '' }}

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0  # Necessary to fetch all tags
+          fetch-depth: 0 # Necessary to fetch all tags
 
       - name: Calculate next tag
         id: calc_tag

.github/workflows/stale.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   stale:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     if: github.repository == 'ohcnetwork/care_fe'
     steps:
       - uses: actions/stale@v6

.github/workflows/thank-you.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   if_merged:
     if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     permissions:
       issues: write
       pull-requests: write

.prettierrc.json

@@ -3,11 +3,25 @@
   "useTabs": false,
   "tabWidth": 2,
   "semi": true,
+  "endOfLine": "lf",
   "jsxSingleQuote": false,
   "arrowParens": "always",
   "tailwindFunctions": ["classNames"],
-  "importOrder": ["<THIRD_PARTY_MODULES>", "^@/lib/(.*)$", "^@/CAREUI/(.*)$", "^@/components/ui/(.*)$", "^@/components/(.*)$", "^@/hooks/(.*)$", "^@/common/(.*)$", "^@/(.*)$", "^[./]"],
+  "importOrder": [
+    "<THIRD_PARTY_MODULES>",
+    "^@/lib/(.*)$",
+    "^@/CAREUI/(.*)$",
+    "^@/components/ui/(.*)$",
+    "^@/components/(.*)$",
+    "^@/hooks/(.*)$",
+    "^@/common/(.*)$",
+    "^@/(.*)$",
+    "^[./]"
+  ],
   "importOrderSeparation": true,
   "importOrderSortSpecifiers": true,
-  "plugins": ["prettier-plugin-tailwindcss", "@trivago/prettier-plugin-sort-imports"]
-}
+  "plugins": [
+    "prettier-plugin-tailwindcss",
+    "@trivago/prettier-plugin-sort-imports"
+  ]
+}

.vscode/launch.json

@@ -1,23 +1,18 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Run application",
-            "type": "node",
-            "request": "launch",
-            "cwd": "${workspaceFolder}",
-            "console": "integratedTerminal",
-            "runtimeExecutable": "npm",
-            "runtimeArgs": [
-              "run-script",
-              "dev"
-            ],
-            "skipFiles": [
-              "<node_internals>/**"
-            ]
-        }
-    ]
-}
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run application",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "console": "integratedTerminal",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run-script", "dev"],
+      "skipFiles": ["<node_internals>/**"]
+    }
+  ]
+}

crowdin.yml

@@ -2,4 +2,4 @@ files:
   - source: public/locale//{{lang}}.json
     translation: /public/locale/%two_letters_code%.json
 bundles:
-  - 2
+  - 2

cypress/docs/cypress.md

@@ -1,25 +1,30 @@
 # Cypress Testing Documentation
 
 ## Overview
+
 This documentation covers the testing standards and patterns for our Cypress test suite.
 
 ## Quick Links
+
 - [File Structure and Organization](./file-structure.md)
 - [Testing Patterns](./patterns.md)
 - [Best Practices](./best-practices.md)
 
 ## Core Principles
+
 - Create and use reusable commands and functions
 - Use data-cy attributes for element identification
 - Follow Page Object Model pattern
 - Write independent and isolated tests
 - Use TypeScript for better type safety
 
 ## Getting Started
+
 1. Familiarize yourself with the file structure
 2. Review the testing patterns
 3. Follow the best practices
 4. Use the provided examples as templates
 
 ## Support
+
 For questions or clarifications, refer to the specific documentation sections or reach out to the team.

cypress/e2e/facility_spec/facility_creation.cy.ts

@@ -1,6 +1,6 @@
-import { FacilityCreation } from "../../pageObject/facility/FacilityCreation";
-import { generatePhoneNumber } from "../../utils/commonUtils";
-import { generateFacilityData } from "../../utils/facilityData";
+import { FacilityCreation } from "pageObject/facility/FacilityCreation";
+import { generatePhoneNumber } from "utils/commonUtils";
+import { generateFacilityData } from "utils/facilityData";
 
 const LOCATION_HIERARCHY = {
   localBody: "Aluva",
@@ -12,6 +12,8 @@ describe("Facility Management", () => {
   const facilityType = "Primary Health Centre";
 
   beforeEach(() => {
+    // Set larger viewport to ensure all elements are visible
+    cy.viewport(1920, 1080);
     cy.visit("/login");
     cy.loginByApi("nurse");
   });