From 58b3557d6df4628883ca1eb16da52ab82ee0ee6c Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 20 Aug 2019 12:21:58 +0000 Subject: [PATCH] [IMP] base_import: Improve import general UX (back2basics) Purpose ======= Improve error management UX on import. TaskID: 2049992 closes odoo/odoo#35804 Signed-off-by: Yannick Tivisse (yti) --- .../static/csv/o2m_customers_contacts.csv | 18 +++--- .../static/src/js/import_action.js | 52 ++++++++++++++--- .../static/src/scss/base_import.scss | 8 ++- .../static/src/xml/base_import.xml | 55 +++++++++++++----- odoo/addons/base/models/ir_fields.py | 15 +++-- odoo/addons/base/static/xls/res_partner.xls | Bin 7168 -> 7168 bytes odoo/addons/base/tests/test_mimetypes.py | 6 +- odoo/addons/test_impex/tests/test_load.py | 4 +- odoo/models.py | 9 ++- 9 files changed, 123 insertions(+), 44 deletions(-) diff --git a/addons/base_import/static/csv/o2m_customers_contacts.csv b/addons/base_import/static/csv/o2m_customers_contacts.csv index d29a600f18b..ac91202579d 100644 --- a/addons/base_import/static/csv/o2m_customers_contacts.csv +++ b/addons/base_import/static/csv/o2m_customers_contacts.csv @@ -1,9 +1,9 @@ -Name,Is a company,Related company,Address type,Customer,Supplier,Street,ZIP,City,State,Country -Aurora Shelves,1,,,1,0,25 Pacific Road,95101,San José,California,United States -Roger Martins,0,Aurora Shelves,Invoice address,1,0,27 Pacific Road,95102,San José,California,United States -House Sales Direct,1,,,1,0,104 Saint Mary Avenue,94059,Redwood,California,United States -Yvan Holiday,0,House Sales Direct,Contact,1,0,104 Saint Mary Avenue,94060,Redwood,California,United States -Jack Unsworth,0,House Sales Direct,Invoice address,1,0,227 Jackson Road,94061,Redwood,California,United States -Michael Mason,0,,,1,0,16 5th Avenue,94104,San Francisco,California,United States -International Wood,1,,,1,0,748 White House Boulevard,20004,Washington,D.C.,United States -Sharon Pecker,0,International Wood,Invoice address,1,0,755 White House Boulevard,20005,Washington,D.C.,United States +Name,Is a company,Related company,Address type,Street,ZIP,City,State,Country +Aurora Shelves,1,,,25 Pacific Road,95101,San José,California,United States +Roger Martins,0,Aurora Shelves,Invoice address,27 Pacific Road,95102,San José,California,United States +House Sales Direct,1,,,104 Saint Mary Avenue,94059,Redwood,California,United States +Yvan Holiday,0,House Sales Direct,Contact,104 Saint Mary Avenue,94060,Redwood,California,United States +Jack Unsworth,0,House Sales Direct,Invoice address,227 Jackson Road,94061,Redwood,California,United States +Michael Mason,0,,,16 5th Avenue,94104,San Francisco,California,United States +International Wood,1,,,748 White House Boulevard,20004,Washington,D.C.,United States +Sharon Pecker,0,International Wood,Invoice address,755 White House Boulevard,20005,Washington,D.C.,United States \ No newline at end of file diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js index bf41800a41b..a4a4db8d690 100644 --- a/addons/base_import/static/src/js/import_action.js +++ b/addons/base_import/static/src/js/import_action.js @@ -102,7 +102,7 @@ var DataImport = AbstractAction.extend({ }, 'click .oe_import_report a.oe_import_report_count': function (e) { e.preventDefault(); - $(e.target).parent().toggleClass('oe_import_report_showmore'); + $(e.target).parent().parent().toggleClass('oe_import_report_showmore'); }, 'click .oe_import_moreinfo_action a': function (e) { e.preventDefault(); @@ -140,6 +140,7 @@ var DataImport = AbstractAction.extend({ this.session = session; this._title = _t('Import a File'); // Displayed in the breadcrumbs this.do_not_change_match = false; + this.preview = [[]]; }, /** * @override @@ -374,6 +375,8 @@ var DataImport = AbstractAction.extend({ this.$('input.oe_import_advanced_mode').prop('checked', result.advanced_mode); this.$('.oe_import_grid').html(QWeb.render('ImportView.preview', result)); + this.preview = result.preview; + if (result.headers.length === 1) { this.$('.oe_import_options').show(); this.onresults(null, null, null, {'messages': [{ @@ -625,6 +628,12 @@ var DataImport = AbstractAction.extend({ this.trigger_up('history_back'); }, onresults: function (event, from, to, results) { + var self = this; + var fields = this.$('.oe_import_fields input.oe_import_match_field').map(function (index, el) { + return $(el).select2('val') || false; + }).get(); + var nameIndex = _.indexOf(fields, 'name'); + var message = results.messages; var no_messages = _.isEmpty(message); if (no_messages) { @@ -639,19 +648,48 @@ var DataImport = AbstractAction.extend({ // offset more if header if (this.import_options().headers) { offset += 1; } + var messagesSorted = _.sortBy(_(message).groupBy('message'), function (messageGroupped) { + var order = 0; + if (messageGroupped[0].type === 'warning') { + order = fields.length + 1; + } + return order + _.indexOf(fields, messageGroupped[0].field); + }); + this.$form.addClass('oe_import_error'); this.$('.oe_import_error_report').html( QWeb.render('ImportView.error', { - errors: _(message).groupBy('message'), + errors: messagesSorted, at: function (rows) { var from = rows.from + offset; var to = rows.to + offset; + var rowName = ''; + if (nameIndex !== -1) { + rowName = _.str.sprintf(' (%s)', self.preview[rows.from][nameIndex]); + } if (from === to) { - return _.str.sprintf(_t("at row %d"), from); + return _.str.sprintf(_t("at row %d%s"), from, rowName); } return _.str.sprintf(_t("between rows %d and %d"), from, to); }, + at_multi: function (rows) { + var from = rows.from + offset; + var to = rows.to + offset; + var rowName = ''; + if (nameIndex !== -1) { + rowName = _.str.sprintf(' (%s)', self.preview[rows.from][nameIndex]); + } + if (from === to) { + return _.str.sprintf(_t("Row %d%s"), from, rowName); + } + return _.str.sprintf(_t("Between rows %d and %d"), + from, to); + }, + at_multi_header: function (numberLines) { + return _.str.sprintf(_t("at %d different rows:"), + numberLines); + }, more: function (n) { return _.str.sprintf(_t("(%d more)"), n); }, @@ -663,8 +701,8 @@ var DataImport = AbstractAction.extend({ } if (msg instanceof Array) { return _.str.sprintf( - '
%s
    %s
', - _.str.escapeHTML(_t("Here are the possible values:")), + '
%s
    %s
', + _.str.escapeHTML(_t("See possible values")), _(msg).map(function (msg) { return '
  • ' + _.str.escapeHTML(msg) @@ -674,10 +712,10 @@ var DataImport = AbstractAction.extend({ // Final should be object, action descriptor return [ '
    ', - _.str.sprintf('', + _.str.sprintf(' ', _.str.escapeHTML(JSON.stringify(msg))), _.str.escapeHTML( - _t("Get all possible values")), + _t("See possible values")), '', '
    ' ].join(''); diff --git a/addons/base_import/static/src/scss/base_import.scss b/addons/base_import/static/src/scss/base_import.scss index d32cffdfb32..68d9603a813 100644 --- a/addons/base_import/static/src/scss/base_import.scss +++ b/addons/base_import/static/src/scss/base_import.scss @@ -75,7 +75,7 @@ &.oe_import_error .oe_import_error_report, &.oe_import_noheaders .oe_import_noheaders, .oe_import_report_showmore .oe_import_report_more { - display: block; + display: list-item; } /* ------------- ERRORS AND WARNINGS REPORT ------------ */ @@ -95,6 +95,12 @@ @extend .text-danger; } } + .oe_import_report_count, .oe_import_see_all { + color: white; + &:hover { + color: lightgrey; + } + } } /* ------------- THE CSV TABLE ------------ */ diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml index c475a30036d..c8896a9da3a 100644 --- a/addons/base_import/static/src/xml/base_import.xml +++ b/addons/base_import/static/src/xml/base_import.xml @@ -18,6 +18,7 @@

    @@ -28,6 +29,7 @@

    @@ -140,23 +142,48 @@
    • - - - - - - - -
        -
      • - - + + + + + +
          + +
        • + + + + +
          • +
        • + + + +
          • - -
        +
      + + + + + + + +
    - + + + + + + + + + + + + diff --git a/odoo/addons/base/models/ir_fields.py b/odoo/addons/base/models/ir_fields.py index 59fabcca860..a1c4c79b0d9 100644 --- a/odoo/addons/base/models/ir_fields.py +++ b/odoo/addons/base/models/ir_fields.py @@ -305,10 +305,13 @@ class IrFieldsConverter(models.AbstractModel): id = None warnings = [] error_msg = '' - action = {'type': 'ir.actions.act_window', 'target': 'new', - 'view_mode': 'tree,form', - 'views': [(False, 'tree'), (False, 'form')], - 'help': _(u"See all possible values")} + action = { + 'name': 'Possible Values', + 'type': 'ir.actions.act_window', 'target': 'new', + 'view_mode': 'tree,form', + 'views': [(False, 'list'), (False, 'form')], + 'context': {'create': False}, + 'help': _(u"See all possible values")} if subfield is None: action['res_model'] = field.comodel_name elif subfield in ('id', '.id'): @@ -353,8 +356,8 @@ class IrFieldsConverter(models.AbstractModel): if name_create_enabled_fields.get(field.name): try: id, _name = RelatedModel.name_create(name=value) - except Exception as e: - error_msg = repr(e) + except (Exception, psycopg2.IntegrityError): + error_msg = _(u"Cannot create new '%s' records from their name alone. Please create those records manually and try importing again.") % RelatedModel._description else: raise self._format_import_error( Exception, diff --git a/odoo/addons/base/static/xls/res_partner.xls b/odoo/addons/base/static/xls/res_partner.xls index dbdec5bf2292a5194a66bc029c627c06738a7ca9..9f7321c28b2d78bb33a0be7fc3613f2d85b18b74 100644 GIT binary patch delta 1268 zcmZvcF>ezw6vv^mpD#%YsqX#RZ}?Z5^C zp2Wl#U_sCT6NL;6EJ!ST06qXCNJN70p3gaIltlL3-_L$O|KItp+v#>*eu~OD+82+_vtm5pFtV88OL7Q*tJ zfq-UgLjn>&+{bm(m@LtV4yx1xl<={sEtgalBBn_F{H$CoA~jLWj7cSh(xfJxVpj$#)H5Nl z1Ri5Tfa_B#W4cuk(o9n*rgOdWbxa>PdO&;pM-SjIJ%Gb>uAhM^mnHQ4h1TD6RsxBCWxO%PDg_T+JOyVEn$rOAjwSy!7zO z;*a33=~l)*8Kk^QDho>829@Q!bsXh!l*dsXhfjrprppp}HX}=z8C5c}h&%7|N=6nj z>$Vnoh{!|mQ8mzVh}e5ru|*s$VqB~z9bxUpmT(MC=I&#QIPQS4hv1WMU=FwIty>J@ zYH6=p+Ja6{jL)66R-QVLcA(KZK6fLI&N&!1?w$h5K`%Zvx|3@)1>a-D{q{ws7;Sz_zU8YTCy~a?xvF(&wUrTg{!IpWvXm hCC=gIOeW6b59%-A=4__;Lv;^#1gh5XWcl_U<MSudy!C9 zl}armeC~76S3!&LP9fewc@lSX!444qz~CJi#ydJ~s$Cv?m`)XtFqKEiz_s#r3&E}i z#|G?b@VnhSZ&!n-4a&8^uDl0wZTp_)rkoyqBe22X3~*TE~);Assr`Dtuas>3Iv!Lu}YmIlw#K&>WW zHjk2FNa{ao4NBfG1p69XGhknX?|sSZ;A?Qd;d~41TVQ%)BpfqQ0?l3PH-1nE4m5af zaD+1Mrc75Y(BL}mQ4IqPK0dI9JC9yV2@SP1Ra+xG{a#r2Eeh#E(@)?DdQpW=`=y}^ zi!Lm>$kSGhxE007!9O;L@$0(kbzE0>_}tE3oU(8Mcb0L$jZCU?602$wiqogAb${*e zGu7a+T2A)5)hA4<_3DQ6W