[IMP] openupgrade_160, openupgrade_tools: BS4 to BS5 transformation yeahhhhh by daiduongnguyen-odoo · Pull Request #1 · Viindoo/openupgradelib

daiduongnguyen-odoo · 2023-08-24T09:31:21Z

PR OCA: https://github.com/OCA/openupgradelib/pull/338

…ranslation [FIX] delete_record_translation: invalid input syntax for type json

column

…ranslation [FIX] delete_record_translations: error when only update for 1 one column

[ADD] get_model2table: method to map nonstandard table names

…n model

[FIX] merge_records: assure don't break on method="orm" if KeyError on model

…ry,date,datetime,selection

daiduongnguyen-odoo · 2023-08-24T09:36:56Z

@ngochuy97hp a Huy có thể check xem e có miss case nào trong việc migration BS5 này ko với ạ
cc @phamgiang2510 @royleviindoo

ngochuy97hp · 2023-08-24T10:02:59Z

@ngochuy97hp a Huy có thể check xem e có miss case nào trong việc migration BS5 này ko với ạ cc @phamgiang2510 @royleviindoo

ok e

phamgiang2510 · 2023-08-24T10:11:35Z

@duong77476 a chưa rõ có miss case nào hay ko nhưng bản staging của Viindoo (staging.viindoo.com) đang có rất nhiều template ngoài website mà chưa đc migrate sang BS5

daiduongnguyen-odoo · 2023-08-24T13:21:08Z

@duong77476 a chưa rõ có miss case nào hay ko nhưng bản staging của Viindoo (staging.viindoo.com) đang có rất nhiều template ngoài website mà chưa đc migrate sang BS5

Có thể do đoạn query này chưa đủ ạ https://github.com/Viindoo/OpenUpgrade/blob/5601d50ab7378de73055a4658ea419666ebdf0cf/openupgrade_scripts/scripts/website/16.0.1.0/pre-migration.py#L82 , A check var xem e query như này cần thêm gì không a và có thể thử vs DB Viindoo xem nó được nhiêu bản ghi ạ
cc @royleviindoo

ngochuy97hp · 2023-08-25T02:28:29Z

openupgradelib/openupgrade_160.py

+    _r("rounded-sm", "rounded-0"),
+    _r("rounded-lg", "rounded-1"),


Suggested change

_r("rounded-sm", "rounded-0"),

_r("rounded-lg", "rounded-1"),

_r("rounded-sm", "rounded-1"),

_r("rounded-lg", "rounded-3"),

ngochuy97hp · 2023-08-25T02:36:43Z

openupgradelib/openupgrade_160.py

+    _r("custom-control-input", "form-check-input"),
+    _r("custom-control-label", "form-check-label"),
+    _r("custom-switch", "form-switch"),
+    _r("custom-select", "form-select"),


viết kiểu này thì nó có đè cả custom-select-sm thành form-select-sm không? Cả -lg nữa, anh thấy trên staging chưa được.

@ngochuy97hp A cho e xin link cái page đó để có gì e test thử
cc @phamgiang2510 @royleviindoo

https://staging.viindoo.com/vi/odoo-instance/trial
https://staging.viindoo.com/vi/pricing

Nếu thế thì chắc phải viết hẳn ra kiểu _r("custom-select-sm", "form-select-sm") , tương tự với lg. Còn viết như trên nó chỉ selector đến đúng class đó xong replace thôi ạ

ngochuy97hp · 2023-08-25T02:36:59Z

openupgradelib/openupgrade_160.py

+    _r("mr", "me"),
+    # Forms
+    _r("custom-control", "form-control"),
+    _r("custom-check", "form-check"),


Suggested change

_r("custom-check", "form-check"),

_r("custom-checkbox", "form-check"),

custom-checkbox mới đúng.
Ở BS4 1 checkbox sẽ cần cặp custom-control custom-checkbox nhưng lên BS5 nó chỉ còn form-check
Ở trên có đoạn replace custom-control thành form-control. Như vậy sẽ thành form-control form-check -> lỗi

à đungs rồi, chắc e viết nhầm 👯

ngochuy97hp · 2023-08-25T02:54:18Z

openupgradelib/openupgrade_160.py

+    _r("pl", "ps"),
+    _r("pr", "pe"),
+    _r("ml", "ms"),
+    _r("mr", "me"),


Mấy cái này nó cũng có sm với lg đấy

Đúng rồi , e vừa search có cả kiểu ms-1 xong cả ms-sm-2 nữa, theo như https://getbootstrap.com/docs/5.0/utilities/spacing/ đây sẽ có nhiều case hơn để cover ✌️

daiduongnguyen-odoo · 2023-08-25T07:53:55Z

@ngochuy97hp E đã sửa a nhé, a test được với db Viindoo thì có thể cài lại thư viện để test cc @phamgiang2510

ngochuy97hp · 2023-08-26T01:45:09Z

openupgradelib/openupgrade_160.py

+    _r(
+        "text-justify", "text-center"
+    ),  # actually boostrap 5 only drop without any replacements


cái này chuyển thành style inline style="text-align: justify;"

Vâng a, e search thấy thằng odoo ko có class naò trong core cả, phải inline rồi :((

daiduongnguyen-odoo · 2023-08-26T03:44:45Z

openupgradelib/openupgrade_160.py

+    _class_rp_by_inline(
+        selector="//*[contains(@class, 'text-justify')]",
+        selector_mode="xpath",
+        class_rp_by_inline={"text-justify": ["text-align: justify"]},
+    ),
+    _r(class_rm="text-justify", class_add=""),


Done #1 (comment)

daiduongnguyen-odoo · 2023-08-26T03:45:46Z

openupgradelib/openupgrade_tools.py

+        if class_rp_by_inline:
+            inline_style = ""
+            for _, value in class_rp_by_inline.items():
+                for inline_css_style in value:
+                    inline_style += inline_css_style + ";"
+            if "style" in node.attrib and node.attrib["style"]:
+                node.attrib["style"] += inline_style
+            else:
+                node.attrib["style"] = inline_style


Done #1 (comment)
Video test : https://drive.google.com/file/d/1zc2YCuE07w1hz3AFRbeVIpzAPlZ7xnVB/view?usp=sharing . E ko biết thêm class text-justify bằng website editor kiểu gì nên sửa view thủ công

fix filtering of columns in delete_record_translations() for versions >= 16. the loop was wrong as it was changing the size of the list while looping over it.

…umns_16 [FIX] fix columns filter in `delete_record_translations()` for versions >= 16

…irst_not_null-mle [IMP] openupgrade_merge_records: add first_not_null operation on several field types

text-justify removed

ngochuy97hp · 2023-09-07T09:16:01Z

openupgradelib/openupgrade_160.py

+    _r("custom-control", "form-control"),
+    _r("custom-checkbox", "form-check"),


@duong77476 trường hợp custom-checkbox thì cần chuyển cả custom-checkbox custom-control thành form-check. Để như này nó sẽ thành form-check form-control gây lỗi

ok anh để e xử ở con master của em

@ngochuy97hp Kiểu như này đúng ko a
_r( selector=".custom-checkbox + .custom-control", class_rm="custom-checkbox", class_add="form-check" ),
e chưa test , thấy thằng khác dùng như thế thôi
cc @royleviindoo

à có khi ko cần dấu +

Bắt chước ở https://github.com/OCA/openupgradelib/blob/f5be91a5c77220285af04e9b0d1d3bc4273b33e9/openupgradelib/openupgrade_120.py#L118
cc @royleviindoo @ngochuy97hp

anh chưa đọc cái hàm _r này miễn là 2 thằng này custom-checkbox custom-control biến thành form-check là được

@ngochuy97hp oh ok a, vậy nó nên là
_r( selector=".custom-checkbox .custom-control", class_rm="custom-checkbox custom-control", class_add="form-check", ),

nghĩa là selector đến element nào có 2 class trên, xóa 2 thk đó thay bằng thk form-check

Done in daiduongnguyen-odoo#7

uh đúng r e

Đã merged PR daiduongnguyen-odoo#7

daiduongnguyen-odoo and others added 14 commits July 5, 2023 15:46

[FIX] delete_record_translation: invalid input syntax for type json

76cda7a

Merge pull request OCA#335 from duong77476/master_fix_delete_record_t…

b354ed4

…ranslation [FIX] delete_record_translation: invalid input syntax for type json

[UPD] HTML documentation

9599992

[FIX] delete_record_translations: error when only update for 1 one

86aca62

column

Merge pull request OCA#337 from duong77476/master_fix_delete_record_t…

ea53875

…ranslation [FIX] delete_record_translations: error when only update for 1 one column

[UPD] HTML documentation

bb6dbfe

[ADD] get_model2table: method to map nonstandard table names

88973d2

Merge pull request OCA#336 from ForgeFlow/master-add-get_model2table

7819744

[ADD] get_model2table: method to map nonstandard table names

[UPD] HTML documentation

66c1f84

[FIX] merge_records: assure don't break on method="orm" if KeyError o…

b63812a

…n model

Merge pull request OCA#340 from ForgeFlow/master-minor-fix-merge

fb09131

[FIX] merge_records: assure don't break on method="orm" if KeyError on model

[UPD] HTML documentation

d6a7093

[IMP] Merge records: add first_not_null operation on int,float,moneta…

f411bf2

…ry,date,datetime,selection

[IMP] Replace deprecated recompute() in version 16

52841c8

ngochuy97hp suggested changes Aug 25, 2023

View reviewed changes

ngochuy97hp reviewed Aug 25, 2023

View reviewed changes

daiduongnguyen-odoo force-pushed the master_imp_bs4_to_bs5_migration branch 2 times, most recently from a1759d0 to 4f04503 Compare August 25, 2023 07:53

ngochuy97hp suggested changes Aug 26, 2023

View reviewed changes

daiduongnguyen-odoo force-pushed the master_imp_bs4_to_bs5_migration branch from 4f04503 to b0e1d53 Compare August 26, 2023 03:43

daiduongnguyen-odoo commented Aug 26, 2023

View reviewed changes

huguesdk and others added 4 commits August 28, 2023 13:32

[FIX] fix columns in delete_record_translations()

47e566b

fix filtering of columns in delete_record_translations() for versions >= 16. the loop was wrong as it was changing the size of the list while looping over it.

Merge pull request OCA#342 from coopiteasy/fix_delete_translation_col…

ddce67b

…umns_16 [FIX] fix columns filter in `delete_record_translations()` for versions >= 16

[UPD] HTML documentation

86bd35d

Merge pull request OCA#341 from acsone/openupgradelib_merge_records_f…

de0fe1f

…irst_not_null-mle [IMP] openupgrade_merge_records: add first_not_null operation on several field types

github-actions bot and others added 3 commits August 29, 2023 13:42

[UPD] HTML documentation

f5be91a

[IMP] openupgrade_160, openupgrade_tools: BS4 to BS5 Tranformation

dd46873

[IMP] openupgrade_160, openupgrade_tool: special case for class

b76b002

text-justify removed

daiduongnguyen-odoo force-pushed the master_imp_bs4_to_bs5_migration branch from b0e1d53 to b76b002 Compare August 30, 2023 01:16

ngochuy97hp reviewed Sep 7, 2023

View reviewed changes

		_r("rounded-sm", "rounded-0"),
		_r("rounded-lg", "rounded-1"),

	_r("custom-check", "form-check"),
	_r("custom-checkbox", "form-check"),

		_r("custom-control", "form-control"),
		_r("custom-checkbox", "form-check"),

Comments

Conversation

daiduongnguyen-odoo commented Aug 24, 2023

Uh oh!

daiduongnguyen-odoo commented Aug 24, 2023

Uh oh!

ngochuy97hp commented Aug 24, 2023

Uh oh!

phamgiang2510 commented Aug 24, 2023

Uh oh!

daiduongnguyen-odoo commented Aug 24, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

daiduongnguyen-odoo commented Aug 25, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants