WIP

Author: neopostmodern

app/actions/data.ts

@@ -1,7 +1,9 @@
 import type {
+  AdditionalFlatData,
   FlatData,
   OverviewDataEntry,
-  RawFlatData,
+  RawFlatDataExpose,
+  RawFlatDataUtag,
   RawOverviewData,
   RawOverviewDataEntry,
   StringBoolean,
@@ -99,17 +101,24 @@ export function getOverviewData(): ThunkAction {
   };
 }
 
-function processFlatData(flatData: RawFlatData): FlatData {
+function processFlatData(
+  flatDataUtag: RawFlatDataUtag,
+  flatDataExpose: RawFlatDataExpose,
+  additionalFlatData: AdditionalFlatData
+): FlatData {
   return {
-    id: flatData.obj_scoutId,
-    yearConstructed: parseInt(flatData.obj_yearConstructed, 10),
-    floor: parseInt(flatData.obj_floor, 10),
+    id: flatDataUtag.obj_scoutId,
+    yearConstructed: parseInt(flatDataUtag.obj_yearConstructed, 10),
+    floor: parseInt(flatDataUtag.obj_floor, 10),
     rent: {
-      total: parseFloat(flatData.obj_totalRent),
-      base: parseFloat(flatData.obj_baseRent),
-      additional: parseFloat(flatData.obj_serviceCharge)
+      total: parseFloat(flatDataUtag.obj_totalRent),
+      base: parseFloat(flatDataUtag.obj_baseRent),
+      additional: parseFloat(flatDataUtag.obj_serviceCharge)
     },
-    requiresWBS: flatData.additionalData.requiresWBS
+    applicationLinksExternally: Boolean(
+      flatDataExpose.contactData.contactButton.clickOutUrl
+    ),
+    requiresWBS: additionalFlatData.requiresWBS
   };
 }
 
@@ -118,13 +127,23 @@ export function getFlatData(): ThunkAction {
     const electronUtils = new ElectronUtils(
       electronObjects.views.puppet.webContents
     );
-    const rawFlatData: RawFlatData = await electronUtils.evaluate(`utag_data`);
-    rawFlatData.additionalData = {
+    const rawFlatDataUtag: RawFlatDataUtag =
+      await electronUtils.evaluate(`utag_data`);
+    const rawFlatDataExpose: RawFlatDataExpose = await electronUtils.evaluate(
+      `JSON.parse(JSON.stringify(IS24.expose))`
+    );
+    const additionalData = {
       requiresWBS: await electronUtils.elementExists(
         '.is24qa-wohnberechtigungsschein-erforderlich-label'
       )
     };
-    const flatData = processFlatData(rawFlatData);
+    console.log(rawFlatDataExpose);
+    const flatData = processFlatData(
+      rawFlatDataUtag,
+      rawFlatDataExpose,
+      additionalData
+    );
+    console.log(flatData);
     dispatch({
       type: SET_FLAT_DATA,
       payload: {

app/flat/assessment.ts

@@ -167,6 +167,13 @@ export function assessFlat(
         result: flatData.yearConstructed < 1950
       });
     }
+
+    if (flatData.applicationLinksExternally) {
+      reasons.push({
+        reason: `Verweist auf externe Website`,
+        result: false
+      });
+    }
   }
 
   const result = reasons.every((reason) => reason.result);

app/reducers/data.ts

@@ -98,17 +98,24 @@ export type OverviewDataEntry = {
   isPartOfProject: boolean;
   hasAlreadyApplied: boolean;
 };
-export type RawFlatData = {
+export type RawFlatDataUtag = {
   obj_scoutId: string;
   obj_yearConstructed: string;
   obj_totalRent: string;
   obj_baseRent: string;
   obj_serviceCharge: string;
   obj_floor: string;
-  additionalData: {
-    requiresWBS: boolean;
+};
+export type RawFlatDataExpose = {
+  contactData: {
+    contactButton: {
+      clickOutUrl?: string;
+    };
   };
 };
+export type AdditionalFlatData = {
+  requiresWBS: boolean;
+};
 export type FlatData = {
   id: string;
   yearConstructed: number;
@@ -118,6 +125,7 @@ export type FlatData = {
     additional: number;
   };
   floor: number;
+  applicationLinksExternally: boolean;
   requiresWBS: boolean;
 };
 export const enum FlatAction {

app/utils/electronUtils.ts

@@ -22,14 +22,23 @@ export default class ElectronUtils {
        try {
           resolve(${javaScript})
        } catch(err) {
+          resolve({ __error: { name: err.name, message: err.message, stack: err.stack } })
           throw { name: err.name, message: err.message, stack: err.stack }
        }
     })`;
     // save a stack trace in case we have an error later
     const { stack } = new Error();
 
     try {
-      return await this.webContents.executeJavaScript(code, isUserGesture);
+      const result = await this.webContents.executeJavaScript(
+        code,
+        isUserGesture
+      );
+      console.log(result);
+      if ('__error' in Object(result)) {
+        throw result.__error;
+      }
+      return result;
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error(`Error executing JavaScript-snippet within webContents:

app/utils/performApplication.ts

@@ -31,6 +31,8 @@ export default function* performApplication(
   // there seems to be a problem with the captcha implementation: https://github.com/google/recaptcha/issues/269
   yield electronUtils.evaluate(`grecaptcha = undefined`);
 
+  // window.IS24.expose.contactData.contactButton.clickOutUrl
+
   //  click on button to compose a message
   if (!(yield electronUtils.elementExists(composeMessageButtonSelector))) {
     dispatch(setBotMessage('"Nachricht schreiben"-Button nicht gefunden'));