refactor: update views and models with recently added fields

refs conjoon/conjoon#23

Author: ThorstenSuckow

classic/src/view/mail/account/MailAccountView.js

@@ -1,7 +1,7 @@
 /**
  * conjoon
  * extjs-app-webmail
- * Copyright (C) 2017-2022 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
+ * Copyright (C) 2017-2023 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -321,6 +321,31 @@ Ext.define("conjoon.cn_mail.view.mail.account.MailAccountView", {
                         value: "{mailAccount.outbox_password}"
                     }
                 }]}]
+        }, {
+            xtype: "fieldset",
+            title: "Subscriptions",
+            listeners: {
+                // fix for tagfield growing horizontally
+                afterrender: cmp => cmp.setWidth(1)
+            },
+            items: [{
+                xtype: "tagfield",
+                flex: 1,
+                labelWidth: 160,
+                fieldLabel: " ",
+                name: "subscriptions",
+                queryMode: "local",
+                forceSelection: false,
+                triggerOnClick: false,
+                createNewOnEnter: true,
+                hideTrigger: true,
+                createNewOnBlur: true,
+                bind: {
+                    value: "{mailAccount.subscriptions}",
+                    store: "{subscriptionStore}"
+                }
+            }]
+
         }]
     }],
 

src/view/mail/account/MailAccountViewModel.js

@@ -1,7 +1,7 @@
 /**
  * conjoon
  * extjs-app-webmail
- * Copyright (C) 2017-2022 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
+ * Copyright (C) 2017-2023 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -57,6 +57,12 @@ Ext.define("conjoon.cn_mail.view.mail.account.MailAccountViewModel", {
         mailAccount: null
     },
 
+    stores: {
+        subscriptionStore: {
+            data: []
+        }
+    },
+
     formulas: {
 
         /**
@@ -266,6 +272,7 @@ Ext.define("conjoon.cn_mail.view.mail.account.MailAccountViewModel", {
                 "inbox_password",
 
                 "active",
+                "subscriptions",
 
                 "outbox_type",
                 "outbox_address",

tests/classic/src/view/mail/account/MailAccountViewTest.js

@@ -1,7 +1,7 @@
 /**
  * conjoon
  * extjs-app-webmail
- * Copyright (C) 2017-2022 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
+ * Copyright (C) 2017-2023 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -34,14 +34,17 @@ StartTest(t => {
 
             inbox_type: "inbox_type",
             inbox_address: "inbox_address",
-            inbox_port: "inbox_port",
+            inbox_port: 8080,
             inbox_ssl: true,
             inbox_user: "inbox_user",
             inbox_password: "inbox_password",
 
+            active: true,
+            subscriptions: ["INBOX"],
+
             outbox_type: "outbox_type",
             outbox_address: "outbox_address",
-            outbox_port: "outbox_port",
+            outbox_port: 8088,
             outbox_secure: "tsl",
             outbox_user: "outbox_user",
             outbox_password: "outbox_password"
@@ -178,10 +181,21 @@ StartTest(t => {
                     t.expect(data["replyTo"].address).toBe(values[i]);
                     break;
 
-                case "inactive":
-                    t.expect(data["inactive"]).toBe(!values[i]);
+                case "active":
+                    t.expect(data["active"]).toBe(values[i]);
+                    break;
+
+                case "inbox_port":
+                case "outbox_port":
+                    t.expect(data[i]).toBe(parseInt(values[i]));
                     break;
 
+
+                case "subscriptions":
+                    t.expect(data["subscriptions"]).toEqual(["INBOX"]);
+                    break;
+
+
                 default:
                     t.expect(data[i]).toBe(values[i]);
                     break;

tests/src/view/mail/account/MailAccountViewModelTest.js

@@ -1,7 +1,7 @@
 /**
  * conjoon
  * extjs-app-webmail
- * Copyright (C) 2017-2022 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
+ * Copyright (C) 2017-2023 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -40,14 +40,17 @@ StartTest(async t => {
 
                     inbox_type: "inbox_type",
                     inbox_address: "inbox_address",
-                    inbox_port: "inbox_port",
+                    inbox_port: 8080,
                     inbox_ssl: true,
                     inbox_user: "inbox_user",
                     inbox_password: "inbox_password",
 
+                    active: false,
+                    subscriptions: ["INBOX"],
+
                     outbox_type: "outbox_type",
                     outbox_address: "outbox_address",
-                    outbox_port: "outbox_port",
+                    outbox_port: 8088,
                     outbox_secure: "ssl",
                     outbox_user: "outbox_user",
                     outbox_password: "outbox_password"
@@ -317,6 +320,9 @@ StartTest(async t => {
                 "inbox_user",
                 "inbox_password",
 
+                "subscriptions",
+                "active",
+
                 "outbox_type",
                 "outbox_address",
                 "outbox_port",
@@ -337,6 +343,16 @@ StartTest(async t => {
                 case "replyTo":
                     record.data[fields[i]] = {name: Ext.id(), address: Ext.id()};
                     break;
+                case "subscriptions":
+                    record.data[fields[i]] = ["INBOX"];
+                    break;
+                case "active":
+                    record.data[fields[i]] = true;
+                    break;
+                case "inbox_port":
+                case "outbox_port":
+                    record.data[fields[i]] = parseInt(Ext.id().split("-").pop());
+                    break;
 
                 default:
                     record.data[fields[i]] = fields[i].indexOf("_ssl") !== -1 ? true : Ext.id();
@@ -363,25 +379,18 @@ StartTest(async t => {
 
                 switch (fields[i]) {
                 case "from":
-
-                    t.expect(record.data[fields[i]]).toEqual(
-                        viewModel.sourceMailAccounts[id].data[fields[i]]
-                    );
-                    break;
-
                 case "replyTo":
+                case "subscriptions":
                     t.expect(record.data[fields[i]]).toEqual(
                         viewModel.sourceMailAccounts[id].data[fields[i]]
                     );
                     break;
 
+
                 default:
                     t.expect(record.data[fields[i]]).toBe(viewModel.sourceMailAccounts[id].data[fields[i]]);
                     break;
-
                 }
-
-
             }
 
             t.expect(viewModel.sourceMailAccounts[id].modified).toBeFalsy();