Merge pull request #30 from icefoganalytics/main

Fixing offline submissions

api/src/data/migrations/029.drop_auth_index.ts

@@ -0,0 +1,15 @@
+import * as knex from "knex";
+
+export async function up(knex: knex.Knex) {
+  return knex.schema.alterTable("users", (table) => {
+    table.dropChecks("unique_users_auth_subject")
+  });
+}
+
+export async function down(knex: knex.Knex) {
+  return knex.schema.alterTable("users", (table) => {
+    table.unique(["auth_subject"], {
+      indexName: "unique_users_auth_subject",
+    });
+  });
+}

api/src/routes/offline-report-router.ts

@@ -26,17 +26,21 @@ const userService = new UserService();
 offlineReportRouter.post("/", async (req: Request, res: Response) => {
   const {} = req.body;
 
-  let currentUserEmail = req.body.email;
+  let currentUserEmail = req.body.on_behalf_email;
   let currentUserId = 1;
-  let currentUserName = req.body.email;
+  let currentUserName = req.body.on_behalf_email;
 
   const existingUser = await userService.getByEmail(currentUserEmail);
 
   if (existingUser) {
     currentUserId = existingUser.id;
     currentUserEmail = existingUser.email;
     currentUserName = existingUser.display_name;
+
+    console.log("Using Existing user", req.body.on_behalf_email);
   } else {
+    console.log("Creating new user", req.body.on_behalf_email);
+
     const createdUser = await userService.create({
       department: "",
       division: "",

api/src/services/user-service.ts

@@ -25,7 +25,7 @@ export class UserService {
 
   async getByEmail(email: string): Promise<User | undefined> {
     if (email) {
-      let user = await db<User>("users").where({ email }).first();
+      let user = await db<User>("users").whereRaw(`LOWER("email") = '${email.toLowerCase()}'`).first();
       if (user) user.roles = await roleService.getRolesForUser(user.id);
       return user;
     }

web/public/serviceWorker.js

@@ -66,7 +66,7 @@ registerRoute(
     plugins: [
       new ExpirationPlugin({
         maxEntries: 16,
-        maxAgeSeconds: 120,
+        maxAgeSeconds: 30 * 24 * 60, // 30 days
       }),
     ],
   })

web/src/components/incident/CreatePageOffline.vue

@@ -5,6 +5,11 @@
     Incident investigation and corrective action. For further information, contant the Director of Health, Safety &
     Wellbeing at 867-332-5974.
   </p>
+  <v-overlay v-model="isLoading" class="align-center justify-center">
+    <div class="text-center">
+      <v-progress-circular indeterminate size="64" class="mb-5" color="#f3b228" width="6"></v-progress-circular>
+    </div>
+  </v-overlay>
 
   <v-form class="mt-6" v-model="isValid">
     <section>
@@ -103,7 +108,7 @@
           <v-row>
             <v-col cols="12" sm="6" class="py-0">
               <v-label>Your email</v-label>
-              <v-text-field v-model="report.email" :rules="[requiredRule, emailRule]" type="email" />
+              <v-text-field v-model="report.on_behalf_email" :rules="[requiredRule, emailRule]" type="email" />
             </v-col>
             <v-col cols="12" sm="6" class="py-0">
               <v-label>Supervisor's email</v-label>
@@ -134,7 +139,7 @@ import { requiredRule, emailRule } from "@/utils/validation";
 
 const reportStore = useReportStore();
 const { initialize, addReportOffline } = reportStore;
-const { locations, urgencies } = storeToRefs(reportStore);
+const { locations, urgencies, isLoading } = storeToRefs(reportStore);
 
 const isValid = ref(false);
 

web/src/store/ReportStore.ts

@@ -9,6 +9,7 @@ export const useReportStore = defineStore("reports", {
     locations: [] as Location[],
     urgencies: [] as Urgency[],
     selectedReport: undefined as Incident | undefined,
+    isLoading: false,
   }),
   actions: {
     async initialize() {
@@ -89,6 +90,7 @@ export const useReportStore = defineStore("reports", {
 
     async addReportOffline(report: Incident) {
       console.log("ADDREPORTOFFLINE", report);
+      this.isLoading = true;
 
       const api = useApiStore();
 
@@ -107,7 +109,9 @@ export const useReportStore = defineStore("reports", {
         formData.append("files", file);
       }
 
-      return api.upload("post", `${OFFLINEREPORTS_URL}`, formData);
+      return api.upload("post", `${OFFLINEREPORTS_URL}`, formData).finally(() => {
+        this.isLoading = false;
+      });
 
       /* const storedJson = this.getStoredReports();
       storedJson.push(report);