From 013969569787fe800a567905766c13b3c5c05ece Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 6 Sep 2021 12:41:10 +0200 Subject: [PATCH 1/4] Prepare forms for future update --- www/form/inner.js | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/www/form/inner.js b/www/form/inner.js index 089db8b57..75fe1db3c 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -82,6 +82,14 @@ define([ var MAX_OPTIONS = 15; var MAX_ITEMS = 10; + var extractValues = function (values) { + if (!Array.isArray(values)) { return []; } + return values.map(function (obj) { + if (typeof(obj) === "string") { return obj; } + return obj.v; + }); + }; + var saveAndCancelOptions = function (getRes, cb) { // Cancel changes var cancelBlock = h('button.btn.btn-secondary', Messages.cancel); @@ -313,7 +321,8 @@ define([ }); return el; }; - var inputs = v.values.map(function (val) { return getOption(val, false); }); + // TODO uid + var inputs = extractValues(v.values).map(function (val) { return getOption(val, false); }); inputs.push(add); var container = h('div.cp-form-edit-block', inputs); @@ -346,7 +355,7 @@ define([ if (v.type) { var calendarInput = h('input'); calendarView = h('div', calendarInput); - var calendarDefault = v.type === "day" ? v.values.map(function (time) { + var calendarDefault = v.type === "day" ? extractValues(v.values).map(function (time) { if (!time) { return; } var d = new Date(time); if (!isNaN(d)) { return d; } @@ -597,13 +606,13 @@ define([ var makePollTable = function (answers, opts, resultsPageObj) { // Sort date values if (opts.type !== "text") { - opts.values.sort(function (a, b) { + extractValues(opts.values).sort(function (a, b) { // TODO uid return +new Date(a) - +new Date(b); }); } // Create first line with options var allDays = getWeekDays(true); - var els = opts.values.map(function (data) { + var els = extractValues(opts.values).map(function (data) { // TODO uid var _date; if (opts.type === "day") { _date = new Date(data); @@ -634,7 +643,7 @@ define([ if (opts.type === "time") { var days = [h('div.cp-poll-cell')]; var _days = {}; - opts.values.forEach(function (d) { + extractValues(opts.values).forEach(function (d) { var date = new Date(d); var day = date.toLocaleDateString(); _days[day] = { @@ -665,7 +674,7 @@ define([ var avatar = h('span.cp-avatar'); APP.common.displayAvatar($(avatar), Util.find(answerObj, ['user', 'avatar']), name); var values = answer.values || {}; - var els = opts.values.map(function (data) { + var els = extractValues(opts.values).map(function (data) { var res = values[data] || 0; var v = (Number(res) === 1) ? h('i.fa.fa-check.cp-yes') : undefined; var cell = h('div.cp-poll-cell.cp-form-poll-answer', { @@ -703,7 +712,7 @@ define([ var myTotals = {}; var updateMyTotals = function () { if (!myLine) { return; } - opts.values.forEach(function (data) { + extractValues(opts.values).forEach(function (data) { myLine.some(function (el) { if ($(el).data('option') !== data) { return; } var res = Number($(el).attr('data-value')) || 0; @@ -726,7 +735,7 @@ define([ }); }; - var totalEls = opts.values.map(function (data) { + var totalEls = extractValues(opts.values).map(function (data) { var y = 0; // Yes var m = 0; // Maybe answers.forEach(function (answerObj) { @@ -1122,7 +1131,7 @@ define([ if (!opts) { opts = TYPES.radio.defaultOpts; } if (!Array.isArray(opts.values)) { return; } var name = Util.uid(); - var els = opts.values.map(function (data, i) { + var els = extractValues(opts.values).map(function (data, i) { var radio = UI.createRadio(name, 'cp-form-'+name+'-'+i, data, false, { mark: { tabindex:1 } }); $(radio).find('input').data('val', data); @@ -1201,7 +1210,7 @@ define([ var lines = opts.items.map(function (itemData) { var name = itemData.uid; var item = itemData.v; - var els = opts.values.map(function (data, i) { + var els = extractValues(opts.values).map(function (data, i) { var radio = UI.createRadio(name, 'cp-form-'+name+'-'+i, '', false, { mark: { tabindex:1 } }); $(radio).find('input').data('uid', name); @@ -1211,7 +1220,7 @@ define([ els.unshift(h('div.cp-form-multiradio-item', item)); return h('div.radio-group', {'data-uid':name}, els); }); - var header = opts.values.map(function (v) { return h('span', v); }); + var header = extractValues(opts.values).map(function (v) { return h('span', v); }); header.unshift(h('span')); lines.unshift(h('div.cp-form-multiradio-header', header)); @@ -1353,7 +1362,7 @@ define([ if (!opts) { opts = TYPES.checkbox.defaultOpts; } if (!Array.isArray(opts.values)) { return; } var name = Util.uid(); - var els = opts.values.map(function (data, i) { + var els = extractValues(opts.values).map(function (data, i) { var cbox = UI.createCheckbox('cp-form-'+name+'-'+i, data, false, { mark: { tabindex:1 } }); $(cbox).find('input').data('val', data); @@ -1444,7 +1453,7 @@ define([ var lines = opts.items.map(function (itemData) { var name = itemData.uid; var item = itemData.v; - var els = opts.values.map(function (data, i) { + var els = extractValues(opts.values).map(function (data, i) { var cbox = UI.createCheckbox('cp-form-'+name+'-'+i, '', false, { mark: { tabindex:1 } }); $(cbox).find('input').data('uid', name); @@ -1467,7 +1476,7 @@ define([ }); }); - var header = opts.values.map(function (v) { return h('span', v); }); + var header = extractValues(opts.values).map(function (v) { return h('span', v); }); header.unshift(h('span')); lines.unshift(h('div.cp-form-multiradio-header', header)); @@ -1616,7 +1625,7 @@ define([ */ Util.shuffleArray(opts.values); } - var els = opts.values.map(function (data) { + var els = extractValues(opts.values).map(function (data) { var uid = Util.uid(); map[uid] = data; invMap[data] = uid; @@ -1670,7 +1679,7 @@ define([ }, reset: function () { Util.shuffleArray(opts.values); - var toSort = (opts.values).map(function (val) { + var toSort = extractValues(opts.values).map(function (val) { return invMap[val]; }); sortable.sort(toSort); @@ -1728,7 +1737,7 @@ define([ var lines = makePollTable(answers, opts, false); // Add form - var addLine = opts.values.map(function (data) { + var addLine = extractValues(opts.values).map(function (data) { var cell = h('div.cp-poll-cell.cp-form-poll-choice', [ h('i.fa.fa-times.cp-no'), h('i.fa.fa-check.cp-yes'), @@ -1829,7 +1838,7 @@ define([ var opts = form.opts || TYPES.poll.defaultOpts; var q = form.q || Messages.form_default; if (answer === false) { - var cols = opts.values.map(function (key) { + var cols = extractValues(opts.values).map(function (key) { return q + ' | ' + key; }); cols.unshift(q); @@ -1845,7 +1854,7 @@ define([ if (i !== 0) { str += ';'; } str += k.replace(';', '').replace(':', '') + ':' + answer.values[k]; }); - var res = opts.values.map(function (key) { + var res = extractValues(opts.values).map(function (key) { return answer.values[key] || ''; }); res.unshift(str); From f28987bce5aaf2bddec9ec3d682482fac8234562 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 6 Sep 2021 13:34:34 +0200 Subject: [PATCH 2/4] Prepare for forms migration --- www/form/inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/form/inner.js b/www/form/inner.js index 75fe1db3c..6e70260c7 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -85,7 +85,7 @@ define([ var extractValues = function (values) { if (!Array.isArray(values)) { return []; } return values.map(function (obj) { - if (typeof(obj) === "string") { return obj; } + if (!Util.isObject(obj)) { return obj; } return obj.v; }); }; From 86ff13a4efbf10b9f995b2771610d114c5a72985 Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 20 Aug 2021 17:47:54 +0530 Subject: [PATCH 3/4] factor debugging data generation from support ticket transmission and fix two incorrectly set width/height properties which overwrote 'appVersion' --- www/support/ui.js | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/www/support/ui.js b/www/support/ui.js index fac6ef438..2f97ec412 100644 --- a/www/support/ui.js +++ b/www/support/ui.js @@ -10,14 +10,12 @@ define([ '/customize/messages.js', ], function ($, ApiConfig, h, UI, Hash, Util, Clipboard, UIElements, Messages) { - var send = function (ctx, id, type, data, dest) { + var getDebuggingData = function (ctx, data) { var common = ctx.common; - var supportKey = ApiConfig.supportMailbox; - var supportChannel = Hash.getChannelIdFromKey(supportKey); var metadataMgr = common.getMetadataMgr(); - var user = metadataMgr.getUserData(); var privateData = metadataMgr.getPrivateData(); - + var user = metadataMgr.getUserData(); + var teams = privateData.teams || {}; data = data || {}; data.sender = { @@ -34,16 +32,12 @@ define([ data.sender.quota = ctx.pinUsage; } - data.id = id; - data.time = +new Date(); - - var teams = privateData.teams || {}; if (!ctx.isAdmin) { data.sender.userAgent = Util.find(window, ['navigator', 'userAgent']); data.sender.vendor = Util.find(window, ['navigator', 'vendor']); data.sender.appVersion = Util.find(window, ['navigator', 'appVersion']); - data.sender.appVersion = Util.find(window, ['screen', 'width']); - data.sender.appVersion = Util.find(window, ['screen', 'height']); + data.sender.screenWidth = Util.find(window, ['screen', 'width']); + data.sender.screenHeight = Util.find(window, ['screen', 'height']); data.sender.blockLocation = privateData.blockLocation || ''; data.sender.teams = Object.keys(teams).map(function (key) { var team = teams[key]; @@ -57,7 +51,25 @@ define([ } return ret; }).filter(Boolean); + } + return data; + }; + + var send = function (ctx, id, type, data, dest) { + var common = ctx.common; + var supportKey = ApiConfig.supportMailbox; + var supportChannel = Hash.getChannelIdFromKey(supportKey); + var metadataMgr = common.getMetadataMgr(); + var user = metadataMgr.getUserData(); + var privateData = metadataMgr.getPrivateData(); + + data = getDebuggingData(ctx, data); + + data.id = id; + data.time = +new Date(); + + if (!ctx.isAdmin) { // "dest" is the recipient that is not the admin support mailbox. // In the support page, make sure dest is always ourselves. dest.channel = privateData.support; @@ -474,6 +486,10 @@ define([ ui.makeCloseMessage = function (content, hash) { return makeCloseMessage(ctx, content, hash); }; + ui.getDebuggingData = function (data) { + return getDebuggingData(ctx, data); + }; + return ui; }; From aad654e18410f689f86d034d8e74be1d20c0d1e6 Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 20 Aug 2021 11:29:16 +0200 Subject: [PATCH 4/4] Fix calendar .ics import (#784) --- www/calendar/export.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/www/calendar/export.js b/www/calendar/export.js index 64775762b..5967e2027 100644 --- a/www/calendar/export.js +++ b/www/calendar/export.js @@ -123,6 +123,7 @@ define([ var jcalData = ICAL.parse(content); vcalendar = new ICAL.Component(jcalData); } catch (e) { + console.error(e); return void cb(e); } @@ -147,6 +148,18 @@ define([ var isAllDay = false; var start = ev.getFirstPropertyValue('dtstart'); var end = ev.getFirstPropertyValue('dtend'); + var duration = ev.getFirstPropertyValue('duration'); + if (!end && !duration) { + if (start.isDate) { + end = start.clone(); + end.adjust(1); // Add one day + } else { + end = start.clone(); + } + } else if (!end) { + end = start.clone(); + end.addDuration(duration); + } if (start.isDate && end.isDate) { isAllDay = true; start = String(start); @@ -175,7 +188,7 @@ define([ hidden.push(al.toString()); } var trigger = al.getFirstPropertyValue('trigger'); - var minutes = -trigger.toSeconds() / 60; + var minutes = trigger ? (-trigger.toSeconds() / 60) : 0; if (reminders.indexOf(minutes) === -1) { reminders.push(minutes); } });