Merge pull request #12 from microting/master

Master changes

Author: masudul-tikweb

.github/copilot-instructions.md

@@ -1,5 +1,37 @@
 # GitHub Copilot Instructions for eForm Angular Frontend
 
+> **Note**: These instructions follow the [GitHub Copilot coding agent best practices](https://docs.github.com/en/copilot/using-github-copilot/using-github-copilot-coding-agent). For more information about using Copilot effectively in this repository, refer to the official documentation.
+
+## Quick Start for Copilot
+
+**Critical requirements before starting:**
+- ✅ .NET 9.x SDK installed
+- ✅ Node.js 22.19.x+ and yarn 1.22.19+ installed
+- ✅ Repository structure: `eFormAPI/` (backend) + `eform-client/` (frontend)
+
+**Essential commands for validation:**
+```bash
+# Backend: Restore & Build
+cd eFormAPI && dotnet restore && dotnet build
+
+# Frontend: Install & Build
+cd eform-client && yarn install && yarn build
+
+# Run tests
+cd eFormAPI && dotnet test
+cd eform-client && yarn test:unit
+
+# Lint code
+cd eform-client && yarn lint
+cd eFormAPI && dotnet format --verify-no-changes
+```
+
+**Remember:**
+- Always run build/test commands with adequate timeouts (see Build Process section)
+- Never cancel long-running operations early
+- Make minimal, surgical changes to existing code
+- Test both frontend and backend if changes affect both
+
 ## Repository Overview
 
 This is **eForm Angular Frontend**, a multi-component application consisting of:
@@ -383,6 +415,22 @@ When making changes, always:
 - Sensitive configuration via environment variables
 - Database connections use secure connection strings
 
+## When to Ask for Help
+
+Copilot should request human assistance when encountering:
+
+- **Ambiguous Requirements**: Issue description lacks clarity or contains conflicting requirements
+- **Missing Information**: Cannot determine which files to modify or what the expected behavior should be
+- **Build Failures**: Cannot resolve build errors after reasonable attempts
+- **Test Failures**: Existing tests fail and the root cause is unclear or requires business logic knowledge
+- **Security Concerns**: Uncertain about security implications of a change
+- **Breaking Changes**: Proposed changes would significantly alter existing functionality
+- **Architecture Decisions**: Need to make architectural choices that affect multiple components
+- **Access Issues**: Cannot access required external services, databases, or dependencies
+- **Scope Concerns**: The issue appears larger than initially described and might need to be split
+
+Always provide context about what you've attempted and what's blocking progress when asking for help.
+
 ---
 
 **Important**: All build commands have been tested with actual execution times. The timeouts specified are based on real measurements plus buffer time. Never cancel long-running operations early - they are designed to complete successfully within the specified timeframes.

.github/workflows/dotnet-core-pr.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Build Docker image
         id: build
-        run: docker build . -t microtingas/frontend-container:latest --build-arg GITVERSION=1.0.0 --build-arg SENTRY_AUTH_TOKEN=${{secrets.SENTRY_AUTH_TOKEN}}
+        run: docker build . -t microtingas/frontend-container:latest --build-arg GITVERSION=1.0.0 --build-arg SENTRY_AUTH_TOKEN=${{secrets.SENTRY_AUTH_TOKEN}} --build-arg DISABLE_SENTRY=true
         shell: bash
       - run: docker save microtingas/frontend-container:latest -o container.tar
       - uses: actions/upload-artifact@v4

Dockerfile

@@ -2,17 +2,19 @@ FROM node:22-bookworm-slim as node-env
 
 WORKDIR /app
 ARG SENTRY_AUTH_TOKEN
+ARG DISABLE_SENTRY
 ENV PATH /app/node_modules/.bin:$PATH
 COPY eform-client ./
 RUN apt-get update
 RUN apt-get -y -q install ca-certificates
 RUN yarn install
 RUN yarn build
-RUN if [ -n "$SENTRY_AUTH_TOKEN" ]; then yarn sentrysourcemap; else echo "SENTRY_AUTH_TOKEN is not set"; fi
+RUN if [ -n "$SENTRY_AUTH_TOKEN" ] && [ "$DISABLE_SENTRY" != "true" ]; then yarn sentrysourcemap; else echo "Sentry sourcemap upload skipped (DISABLE_SENTRY=$DISABLE_SENTRY)"; fi
 
 FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build-env
 WORKDIR /app
 ARG GITVERSION
+ARG DISABLE_SENTRY
 
 # Copy csproj and restore as distinct layers
 COPY eFormAPI/eFormAPI.Web ./
@@ -22,6 +24,8 @@ RUN pwd
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble
 WORKDIR /app
+ARG DISABLE_SENTRY
+ENV DISABLE_SENTRY=${DISABLE_SENTRY}
 COPY --from=build-env /app/out .
 COPY --from=node-env /app/dist/browser wwwroot
 RUN rm connection.json; exit 0

README.md

@@ -44,6 +44,29 @@ You need to create an account for Microting API and get your access credentials.
 
 * Call Microting at +45 66 11 10 66 to get started.
 
+## Sentry Configuration
+
+Sentry error tracking is enabled by default in production environments but disabled in development mode to prevent unnecessary test data collection.
+
+### Development Mode
+When running locally with `yarn start`, Sentry is automatically disabled via the `environment.ts` configuration file where `enableSentry: false`.
+
+### Production Mode
+In production builds, Sentry is enabled through `environment.prod.ts` where `enableSentry: true`.
+
+### Docker Configuration
+When building Docker images, you can control Sentry behavior using the `DISABLE_SENTRY` build argument:
+
+```bash
+# Disable Sentry for testing/CI environments
+docker build --build-arg DISABLE_SENTRY=true -t my-image .
+
+# Enable Sentry for production (default behavior)
+docker build -t my-image .
+```
+
+The `DISABLE_SENTRY` environment variable can be set to `true` or `1` to disable Sentry in both the Angular frontend and C# backend.
+
 ## Testing
 
 ### E2E Test Migration

eFormAPI/eFormAPI.Web/Program.cs

@@ -71,29 +71,36 @@ public class Program
 
     public static void Main(string[] args)
     {
-        SentrySdk.Init(options =>
-        {
-            // A Sentry Data Source Name (DSN) is required.
-            // See https://docs.sentry.io/product/sentry-basics/dsn-explainer/
-            // You can set it in the SENTRY_DSN environment variable, or you can set it in code here.
-            options.Dsn = "https://a20910d51f605d94e956163ffbf9dd5a@o4506241219428352.ingest.sentry.io/4506279162019840";
-
-            // When debug is enabled, the Sentry client will emit detailed debugging information to the console.
-            // This might be helpful, or might interfere with the normal operation of your application.
-            // We enable it here for demonstration purposes when first trying Sentry.
-            // You shouldn't do this in your applications unless you're troubleshooting issues with Sentry.
-            options.Debug = false;
-
-            // This option is recommended. It enables Sentry's "Release Health" feature.
-            options.AutoSessionTracking = true;
+        var disableSentry = Environment.GetEnvironmentVariable("DISABLE_SENTRY");
+        var sentryDisabled = !string.IsNullOrEmpty(disableSentry) && 
+                            (disableSentry.ToLower() == "true" || disableSentry == "1");
 
-            // This option is recommended for client applications only. It ensures all threads use the same global scope.
-            // If you're writing a background service of any kind, you should remove this.
-            options.IsGlobalModeEnabled = false;
-
-            // This option will enable Sentry's tracing features. You still need to start transactions and spans.
-            //options.EnableTracing = true;
-        });
+        if (!sentryDisabled)
+        {
+            SentrySdk.Init(options =>
+            {
+                // A Sentry Data Source Name (DSN) is required.
+                // See https://docs.sentry.io/product/sentry-basics/dsn-explainer/
+                // You can set it in the SENTRY_DSN environment variable, or you can set it in code here.
+                options.Dsn = "https://a20910d51f605d94e956163ffbf9dd5a@o4506241219428352.ingest.sentry.io/4506279162019840";
+
+                // When debug is enabled, the Sentry client will emit detailed debugging information to the console.
+                // This might be helpful, or might interfere with the normal operation of your application.
+                // We enable it here for demonstration purposes when first trying Sentry.
+                // You shouldn't do this in your applications unless you're troubleshooting issues with Sentry.
+                options.Debug = false;
+
+                // This option is recommended. It enables Sentry's "Release Health" feature.
+                options.AutoSessionTracking = true;
+
+                // This option is recommended for client applications only. It ensures all threads use the same global scope.
+                // If you're writing a background service of any kind, you should remove this.
+                options.IsGlobalModeEnabled = false;
+
+                // This option will enable Sentry's tracing features. You still need to start transactions and spans.
+                //options.EnableTracing = true;
+            });
+        }
 
         var host = BuildWebHost(args);
         InitializeSettings(host, args).Wait();
@@ -518,17 +525,23 @@ private static IWebHost BuildWebHost(string[] args)
                     {
                         string numberString = match.Groups[1].Value;
                         int number = int.Parse(numberString);
-                        SentrySdk.ConfigureScope(scope =>
+                        var disableSentry = Environment.GetEnvironmentVariable("DISABLE_SENTRY");
+                        var sentryDisabled = !string.IsNullOrEmpty(disableSentry) && 
+                                            (disableSentry.ToLower() == "true" || disableSentry == "1");
+                        if (!sentryDisabled)
                         {
-                            scope.SetTag("customerNo", number.ToString());
-                            Console.WriteLine("customerNo: " + number);
-                            scope.SetTag("osVersion", Environment.OSVersion.ToString());
-                            Console.WriteLine("osVersion: " + Environment.OSVersion);
-                            scope.SetTag("osArchitecture", RuntimeInformation.OSArchitecture.ToString());
-                            Console.WriteLine("osArchitecture: " + RuntimeInformation.OSArchitecture);
-                            scope.SetTag("osName", RuntimeInformation.OSDescription);
-                            Console.WriteLine("osName: " + RuntimeInformation.OSDescription);
-                        });
+                            SentrySdk.ConfigureScope(scope =>
+                            {
+                                scope.SetTag("customerNo", number.ToString());
+                                Console.WriteLine("customerNo: " + number);
+                                scope.SetTag("osVersion", Environment.OSVersion.ToString());
+                                Console.WriteLine("osVersion: " + Environment.OSVersion);
+                                scope.SetTag("osArchitecture", RuntimeInformation.OSArchitecture.ToString());
+                                Console.WriteLine("osArchitecture: " + RuntimeInformation.OSArchitecture);
+                                scope.SetTag("osName", RuntimeInformation.OSDescription);
+                                Console.WriteLine("osName: " + RuntimeInformation.OSDescription);
+                            });
+                        }
                     }
 
                     using var dbContext = contextFactory.CreateDbContext([_defaultConnectionString]);

eform-client/cypress/e2e/DeviceUsers.page.ts

@@ -156,7 +156,9 @@ class DeviceUsersPage extends PageWithNavbarPage{
     name = '',
     surname = ''
   ): void {
-    deviceUser.editBtn().should('be.visible').click();
+    const index = deviceUser.index - 1;
+    deviceUser.openRowMenu();
+    cy.get(`#editDeviceUserBtn${index}`).should('be.visible').click();
     // @ts-ignore
     cy.get('#firstName').should('be.visible');
     if (name !== '') {
@@ -178,6 +180,7 @@ const deviceUsersPage = new DeviceUsersPage();
 export default deviceUsersPage;
 
 export class DeviceUsersRowObject {
+  index: number;
   siteId: number;
   firstName: string;
   lastName: string;
@@ -187,6 +190,7 @@ export class DeviceUsersRowObject {
   deleteBtn: Cypress.Chainable<JQuery<HTMLElement>>;
 
   getRow(rowNum: number) {
+    this.index = rowNum;
     // @ts-ignore
     if (cy.get('#deviceUserId').eq(rowNum - 1).should('exist')) {
       // @ts-ignore
@@ -203,8 +207,16 @@ export class DeviceUsersRowObject {
     return this;
   }
 
+  openRowMenu() {
+    const index = this.index - 1;
+    cy.get(`#action-items-${index} #actionMenu`).should('be.visible').click();
+    cy.wait(200);
+  }
+
   delete() {
-    this.deleteBtn.should('be.visible').click();
+    const index = this.index - 1;
+    this.openRowMenu();
+    cy.get(`#deleteDeviceUserBtn${index}`).should('be.visible').click();
     deviceUsersPage.saveDeleteBtn().should('be.visible').click();
     // @ts-ignore
     cy.get('#spinner-animation').should('not.exist', { timeout: 40000 });

eform-client/cypress/e2e/Sites.page.ts

@@ -125,6 +125,7 @@ export default sitesPage;
 export class SitesRowObject {
   constructor() {}
 
+  index: number;
   element: Cypress.Chainable<JQuery<HTMLElement>>;
   siteId: number;
   units: string;
@@ -134,6 +135,7 @@ export class SitesRowObject {
   deleteBtn: Cypress.Chainable<JQuery<HTMLElement>>;
 
   getRow(rowNum): Promise<SitesRowObject> {
+    this.index = rowNum;
     this.element = cy.get('tbody > tr').eq(rowNum - 1);
     if (this.element) {
       this.siteId = +(this.element.find('#siteUUId').invoke('text'));
@@ -146,6 +148,13 @@ export class SitesRowObject {
     }
     return this;
   }
+
+  openRowMenu() {
+    const index = this.index - 1;
+    cy.get(`#action-items-${index} #actionMenu`).should('be.visible').click();
+    cy.wait(200);
+  }
+
   closeEditModal(clickCancel = false) {
     if (clickCancel) {
       sitesPage.siteEditCancelBtn().click();
@@ -156,22 +165,10 @@ export class SitesRowObject {
     sitesPage.sitesManageTagsBtn().should('be.visible', { timeout: 40000 });
   }
 
-  getRow(rowNum): Promise<SitesRowObject> {
-    this.element = Cypress.$$('tbody > tr').eq(rowNum - 1);
-    if (this.element) {
-      this.siteId = +this.element.find('#siteUUId').text();
-      this.units = this.element.find('#units').text();
-      this.siteName = this.element.find('#siteName').text();
-      const list = this.element.find('mat-chip-list mat-chip > span');
-      this.tags = Promise.all(list.map((_, element) => Cypress.$(element).text()));
-      this.editBtn = this.element.find('#editSiteBtn');
-      this.deleteBtn = this.element.find('#deleteSiteBtn');
-    }
-    return this;
-  }
-
   openEditModal(site?: { name?: string; tags?: string[] }) {
-    this.editBtn.click();
+    const index = this.index - 1;
+    this.openRowMenu();
+    cy.get(`#editSiteBtn${index}`).should('be.visible').click();
     cy.wait(500);
     sitesPage.siteEditCancelBtn().should('be.visible', {timeout: 40000});
     if (site) {
@@ -196,7 +193,9 @@ export class SitesRowObject {
   }
 
   openDeleteModal() {
-    this.deleteBtn.click();
+    const index = this.index - 1;
+    this.openRowMenu();
+    cy.get(`#deleteSiteBtn${index}`).should('be.visible').click();
     cy.wait(500);
     sitesPage.siteDeleteCancelBtn().should('be.visible', {timeout: 40000}).click();
   }

eform-client/cypress/e2e/UserAdministration.page.ts

@@ -170,6 +170,7 @@ const userAdministrationPage = new UserAdministrationPage();
 export default userAdministrationPage;
 
 export class UserAdministrationRowObject {
+  index: number;
   id: number;
   email: string;
   fullName: string;
@@ -178,6 +179,7 @@ export class UserAdministrationRowObject {
   deleteBtn: Cypress.Chainable<JQuery<HTMLElement>>;
 
   getRow(rowNum: number) {
+    this.index = rowNum;
     const index = rowNum - 1;
 
     cy.get(`#userAdministrationId-${index}`).invoke('text').then(text => {
@@ -199,8 +201,16 @@ export class UserAdministrationRowObject {
     return this;
   }
 
+  openRowMenu() {
+    const index = this.index - 1;
+    cy.get(`#action-items-${index} #actionMenu`).should('be.visible').click();
+    cy.wait(200);
+  }
+
   edit(user: UserAdministrationObject, clickCancel = false) {
-    this.editBtn.should('be.visible').click();
+    const index = this.index - 1;
+    this.openRowMenu();
+    cy.get(`#userAdministrationEditBtn-${index}`).should('be.visible').click();
     cy.get('#editFirstName').should('be.visible');
 
     if (user.firstName) {
@@ -257,7 +267,9 @@ export class UserAdministrationRowObject {
   }
 
   delete(clickCancel = false) {
-    this.deleteBtn.should('be.visible').click();
+    const index = this.index - 1;
+    this.openRowMenu();
+    cy.get(`#userAdministrationDeleteBtn-${index}`).should('be.visible').click();
     cy.get('#userDeleteCancelBtn').should('be.visible');
 
     if (clickCancel) {