From c5d7725e3f0e1b7fabf953c9b367aab9a6cf26bd Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 08:26:56 +0900 Subject: [PATCH 1/3] chore(deps): update all npm dependencies for playwright (#5429) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- playwright/package-lock.json | 85 ++++++++++++++++++++++++++---------- playwright/package.json | 2 +- 2 files changed, 63 insertions(+), 24 deletions(-) diff --git a/playwright/package-lock.json b/playwright/package-lock.json index 559419ecf..376500a97 100644 --- a/playwright/package-lock.json +++ b/playwright/package-lock.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@playwright/test": "1.31.2", - "eslint": "8.35.0", + "eslint": "8.36.0", "eslint-config-standard": "17.0.0", "eslint-plugin-import": "2.27.5", "eslint-plugin-n": "15.6.1", @@ -25,6 +25,30 @@ "npm-check-updates": "16.7.10" } }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.1.tgz", + "integrity": "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, "node_modules/@eslint/eslintrc": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz", @@ -49,9 +73,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz", - "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz", + "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1429,13 +1453,15 @@ } }, "node_modules/eslint": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz", - "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz", + "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^2.0.0", - "@eslint/js": "8.35.0", + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.4.0", + "@eslint/eslintrc": "^2.0.1", + "@eslint/js": "8.36.0", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -1446,9 +1472,8 @@ "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", "eslint-scope": "^7.1.1", - "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.4.0", + "espree": "^9.5.0", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -1470,7 +1495,6 @@ "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.1", - "regexpp": "^3.2.0", "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" @@ -5787,6 +5811,21 @@ } }, "dependencies": { + "@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^3.3.0" + } + }, + "@eslint-community/regexpp": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.1.tgz", + "integrity": "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==", + "dev": true + }, "@eslint/eslintrc": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz", @@ -5805,9 +5844,9 @@ } }, "@eslint/js": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz", - "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz", + "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==", "dev": true }, "@faker-js/faker": { @@ -6826,13 +6865,15 @@ "dev": true }, "eslint": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz", - "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz", + "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==", "dev": true, "requires": { - "@eslint/eslintrc": "^2.0.0", - "@eslint/js": "8.35.0", + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.4.0", + "@eslint/eslintrc": "^2.0.1", + "@eslint/js": "8.36.0", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -6843,9 +6884,8 @@ "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", "eslint-scope": "^7.1.1", - "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.4.0", + "espree": "^9.5.0", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -6867,7 +6907,6 @@ "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.1", - "regexpp": "^3.2.0", "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" diff --git a/playwright/package.json b/playwright/package.json index e985ea5ec..24d350eaa 100644 --- a/playwright/package.json +++ b/playwright/package.json @@ -8,7 +8,7 @@ }, "devDependencies": { "@playwright/test": "1.31.2", - "eslint": "8.35.0", + "eslint": "8.36.0", "eslint-config-standard": "17.0.0", "eslint-plugin-import": "2.27.5", "eslint-plugin-n": "15.6.1", From 8b815fc76d628f4254a8a65bbbcd453951b8f639 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Fri, 31 Mar 2023 10:29:07 +0900 Subject: [PATCH 2/3] feat: Add list of sub-groups to group's "about" page (#5450) * feat: Add list of sub-groups to group's "about" page Fixes #5441 * Address review comments --- ietf/group/views.py | 2 ++ ietf/templates/group/group_about.html | 33 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/ietf/group/views.py b/ietf/group/views.py index d34645abb..4d83a6b4c 100644 --- a/ietf/group/views.py +++ b/ietf/group/views.py @@ -544,6 +544,7 @@ def group_about(request, acronym, group_type=None): can_provide_update = can_provide_status_update(request.user, group) status_update = group.latest_event(type="status_update") + subgroups = Group.objects.filter(parent=group, state="active").exclude(type__slug__in=["sdo", "individ", "nomcom"]).order_by("type", "acronym") return render(request, 'group/group_about.html', construct_group_menu_context(request, group, "about", group_type, { @@ -556,6 +557,7 @@ def group_about(request, acronym, group_type=None): "charter_submit_url": charter_submit_url, "editable_roles": group.used_roles or group.features.default_used_roles, "closing_note": e, + "subgroups": subgroups, })) def all_status(request): diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html index 6b2a36e90..0ad9813e2 100644 --- a/ietf/templates/group/group_about.html +++ b/ietf/templates/group/group_about.html @@ -12,6 +12,9 @@ height: 100vh; text-decoration: none; } {% endblock %} +{% block pagehead %} + +{% endblock %} {% block group_content %} {% origin %} {% if group.state_id == "conclude" %} @@ -401,8 +404,38 @@ height: 100vh;

{% endif %} {% endif %} + {% if subgroups %} +

+ Groups in {{ group.acronym|upper }} +

+ + + + + + + + + + {% for sg in subgroups %} + + + + + + {% endfor %} + +
GroupNameType
+ + {{ sg.name }}{{ sg.type }}
+ {% endif %} {% endblock %} {% block js %} + From 50e716e440c72f34d85880a8f02fec0565761998 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Fri, 31 Mar 2023 10:38:02 +0900 Subject: [PATCH 3/3] fix: Only presort tables if sort order is specified (#5408) Thanks to @kivinen --- ietf/static/js/list.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js index bd8c9df75..6a854afc0 100644 --- a/ietf/static/js/list.js +++ b/ietf/static/js/list.js @@ -277,9 +277,11 @@ $(document) const presort_col = $(header_row).children("[data-default-sort]:first"); if (presort_col) { const order = presort_col.attr("data-default-sort"); - $.each(list_instance, (i, e) => { - e.sort(presort_col.attr("data-sort"), { order: order, sortFunction: text_sort }); - }); + if (order == "asc" || order == "desc") { + $.each(list_instance, (i, e) => { + e.sort(presort_col.attr("data-sort"), { order: order, sortFunction: text_sort }); + }); + } } });