From ea256c4f51303449e650a68c21804f587bbb1fe4 Mon Sep 17 00:00:00 2001
From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:55:30 +0300
Subject: [PATCH 1/3] ci: add Azure Static Web Apps workflow file on-behalf-of:
 @Azure opensource@microsoft.com

---
 ...atic-web-apps-agreeable-wave-096d61a10.yml | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .github/workflows/azure-static-web-apps-agreeable-wave-096d61a10.yml

diff --git a/.github/workflows/azure-static-web-apps-agreeable-wave-096d61a10.yml b/.github/workflows/azure-static-web-apps-agreeable-wave-096d61a10.yml
new file mode 100644
index 00000000..a1fe5d8e
--- /dev/null
+++ b/.github/workflows/azure-static-web-apps-agreeable-wave-096d61a10.yml
@@ -0,0 +1,46 @@
+name: Azure Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - main
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+          lfs: false
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_096D61A10 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "/web" # App source code path
+          api_location: "" # Api source code path - optional
+          output_location: "/web" # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_096D61A10 }}
+          action: "close"

From 7a32ad78787b211aa2cdd8c796ca4b1be2a8057b Mon Sep 17 00:00:00 2001
From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:00:09 +0300
Subject: [PATCH 2/3] staging deployed

---
 ...atic-web-apps-agreeable-wave-096d61a10.yml | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/azure-static-web-apps-agreeable-wave-096d61a10.yml b/.github/workflows/azure-static-web-apps-agreeable-wave-096d61a10.yml
index a1fe5d8e..86bf0c5d 100644
--- a/.github/workflows/azure-static-web-apps-agreeable-wave-096d61a10.yml
+++ b/.github/workflows/azure-static-web-apps-agreeable-wave-096d61a10.yml
@@ -15,22 +15,36 @@ jobs:
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:
-      - uses: actions/checkout@v3
+      
+      - name: Checkout Code
+        uses: actions/checkout@v3
         with:
           submodules: true
           lfs: false
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.22.2' # Specify the Flutter version you want to use
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Build Flutter Web App
+        run: flutter build web
+
       - name: Build And Deploy
         id: builddeploy
         uses: Azure/static-web-apps-deploy@v1
         with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_096D61A10 }}
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ZEALOUS_MUSHROOM_0D31A3303 }}
           repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
           action: "upload"
           ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
           # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
-          app_location: "/web" # App source code path
+          app_location: "/build/web" # App source code path
           api_location: "" # Api source code path - optional
-          output_location: "/web" # Built app content directory - optional
+          output_location: "/build/web" # Built app content directory - optional
           ###### End of Repository/Build Configurations ######
 
   close_pull_request_job:
@@ -42,5 +56,5 @@ jobs:
         id: closepullrequest
         uses: Azure/static-web-apps-deploy@v1
         with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_096D61A10 }}
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ZEALOUS_MUSHROOM_0D31A3303 }}
           action: "close"

From 040e678b1e7561824761b6785538df7298274651 Mon Sep 17 00:00:00 2001
From: ashrafzarkanisala <ashraf@saladelivery.com>
Date: Tue, 3 Sep 2024 13:37:33 +0300
Subject: [PATCH 3/3] handle Lux description for illumnance sensor

---
 lib/pages/device_managment/shared/table/report_table.dart   | 2 +-
 lib/pages/device_managment/wall_sensor/bloc/bloc.dart       | 2 +-
 lib/pages/device_managment/wall_sensor/bloc/state.dart      | 3 ++-
 .../wall_sensor/view/wall_sensor_conrtols.dart              | 6 ++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/pages/device_managment/shared/table/report_table.dart b/lib/pages/device_managment/shared/table/report_table.dart
index ef189f3a..d655964b 100644
--- a/lib/pages/device_managment/shared/table/report_table.dart
+++ b/lib/pages/device_managment/shared/table/report_table.dart
@@ -58,7 +58,7 @@ class ReportsTable extends StatelessWidget {
                       TableCellWidget(value: date),
                       TableCellWidget(value: time),
                       TableCellWidget(
-                        value: '${data.value!} $thirdColumnDescription',
+                        value: '${data.value!} ${thirdColumnDescription ?? ''}',
                         onTap: () => onRowTap(index),
                       ),
                     ],
diff --git a/lib/pages/device_managment/wall_sensor/bloc/bloc.dart b/lib/pages/device_managment/wall_sensor/bloc/bloc.dart
index a2697cd3..bda4d968 100644
--- a/lib/pages/device_managment/wall_sensor/bloc/bloc.dart
+++ b/lib/pages/device_managment/wall_sensor/bloc/bloc.dart
@@ -99,7 +99,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     try {
       await DevicesManagementApi.getDeviceReports(deviceId, event.code)
           .then((value) {
-        emit(DeviceReportsState(deviceReport: value));
+        emit(DeviceReportsState(deviceReport: value, code:event.code));
       });
     } catch (e) {
       emit(DeviceReportsFailedState(error: e.toString()));
diff --git a/lib/pages/device_managment/wall_sensor/bloc/state.dart b/lib/pages/device_managment/wall_sensor/bloc/state.dart
index 67ce0d19..19a154a9 100644
--- a/lib/pages/device_managment/wall_sensor/bloc/state.dart
+++ b/lib/pages/device_managment/wall_sensor/bloc/state.dart
@@ -42,7 +42,8 @@ class DeviceReportsLoadingState extends WallSensorState {}
 
 class DeviceReportsState extends WallSensorState {
   final DeviceReport deviceReport;
-  const DeviceReportsState({required this.deviceReport});
+  final String code;
+  const DeviceReportsState({required this.deviceReport, required this.code});
 }
 
 class DeviceReportsFailedState extends WallSensorState {
diff --git a/lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart b/lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart
index 8448ef67..fce90593 100644
--- a/lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart
+++ b/lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart
@@ -38,8 +38,10 @@ class WallSensorControls extends StatelessWidget with HelperResponsiveLayout {
           } else if (state is DeviceReportsState) {
             return ReportsTable(
               report: state.deviceReport,
-              thirdColumnTitle: "Value",
-              thirdColumnDescription: "Lux",
+              thirdColumnTitle:
+                  state.code == 'illuminance_value' ? "Value" : 'Status',
+              thirdColumnDescription:
+                  state.code == 'illuminance_value' ? "Lux" : null,
               onRowTap: (index) {},
               onClose: () {
                 context.read<WallSensorBloc>().add(BackToGridViewEvent());