From 29d10b26b7f2821d6f11ae4a0b2ea1dc3335334b Mon Sep 17 00:00:00 2001 From: Ping <5123601+pingren@users.noreply.github.com> Date: Tue, 12 Sep 2023 00:29:38 +0800 Subject: [PATCH] parent 404a3ae89b9095c37f0801c0b4b61fc8817a4baf author Ping <5123601+pingren@users.noreply.github.com> 1694449778 +0800 committer Daniel Smith <56164590+DanielRyanSmith@users.noreply.github.com> 1695414849 -0700 parent 404a3ae89b9095c37f0801c0b4b61fc8817a4baf author Ping <5123601+pingren@users.noreply.github.com> 1694449778 +0800 committer Daniel Smith <56164590+DanielRyanSmith@users.noreply.github.com> 1695414839 -0700 parent 404a3ae89b9095c37f0801c0b4b61fc8817a4baf author Ping <5123601+pingren@users.noreply.github.com> 1694449778 +0800 committer Daniel Smith <56164590+DanielRyanSmith@users.noreply.github.com> 1695414831 -0700 parent 404a3ae89b9095c37f0801c0b4b61fc8817a4baf author Ping <5123601+pingren@users.noreply.github.com> 1694449778 +0800 committer Daniel Smith <56164590+DanielRyanSmith@users.noreply.github.com> 1695414745 -0700 Documentation for feature links (#3317) * Add documentation for feature links * Update documentation for feature links npm: bump tar from 6.1.15 to 6.2.0 (#3318) Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.15 to 6.2.0. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v6.1.15...v6.2.0) --- updated-dependencies: - dependency-name: tar dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> npm: bump eslint from 8.48.0 to 8.49.0 (#3319) Bumps [eslint](https://github.com/eslint/eslint) from 8.48.0 to 8.49.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.48.0...v8.49.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> npm: bump @babel/register from 7.22.5 to 7.22.15 (#3320) Bumps [@babel/register](https://github.com/babel/babel/tree/HEAD/packages/babel-register) from 7.22.5 to 7.22.15. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.15/packages/babel-register) --- updated-dependencies: - dependency-name: "@babel/register" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> npm: bump rollup from 3.28.1 to 3.29.1 (#3321) Bumps [rollup](https://github.com/rollup/rollup) from 3.28.1 to 3.29.1. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v3.28.1...v3.29.1) --- updated-dependencies: - dependency-name: rollup dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Enforce rollout milestones to have a minimum value of 100 (#3316) Revert "temporarily remove OT cron" (#3322) This reverts commit 5da4d251a99a5d6bcb1f453203671b90940ae071. Update cron description (#3323) * Update cron.yaml * Update cron.yaml Update chromedash-feature-detail.js (#3324) Record vote activities with amendments instead of text. (#3314) * Record vote activities with amendments instead of text. * Stop checking comments_only Add support for testing mobile (i.e. narrow window). (#3325) * Add support for testing mobile (i.e. narrow window). * Cleanup Ensure all available features for a release note are fetched (#3328) - Add new query parameter releaseNotesMilestone to the GET /features route - Ensure all shipping and enterprise features are returned from the milestone specified in releaseNotesMilestone until the latest available feature - Update front end logic to wait for a channel to be selected before getting the features for the release notes - Update front end logic to fetch policies each time the target milestone is changed Add 3 more fields for OT creation (#3327) * Add 3 more fields for OT creation * `stage_description` -> `ot_description` With a more detailed description of the field and its relation to OT * remove test line Add indexes needed for enterprise release notes. (#3329) Hide enterprise features from /features page (#3330) Enterprise features were shown on /features when they should never be shown there. This PR filters out enterprise features from the features sent to /features Ensure milestone comparison is made between two int types (#3331) Add `ot_feedback_submission_url` field (#3333) Add 3 more fields for OT creation `stage_description` -> `ot_description` With a more detailed description of the field and its relation to OT remove test line Add basic UI for trial creation request Add `ot_feedback_submission_url` to ot creation ot button only shows on ot stage details Update chromedash-feature-detail.js fix OT button cancel button returns to feature detail add ot milestone fields Update chromedash-feature-detail.js Add action_requested field for creation/extension show button disabled if already requested trial association cron clears ot action requests `/admin/ot_requests.html` Fix base.css unix perms. (#3338) don't write to the same entity multiple times (#3345) npm: bump @babel/preset-env from 7.22.15 to 7.22.20 (#3340) Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.15 to 7.22.20. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.20/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> npm: bump @lit-labs/context from 0.4.0 to 0.4.1 (#3341) Bumps [@lit-labs/context](https://github.com/lit/lit/tree/HEAD/packages/labs/context) from 0.4.0 to 0.4.1. - [Release notes](https://github.com/lit/lit/releases) - [Changelog](https://github.com/lit/lit/blob/main/packages/labs/context/CHANGELOG.md) - [Commits](https://github.com/lit/lit/commits/@lit-labs/context@0.4.1/packages/labs/context) --- updated-dependencies: - dependency-name: "@lit-labs/context" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> npm: bump sass from 1.66.1 to 1.67.0 (#3342) Bumps [sass](https://github.com/sass/dart-sass) from 1.66.1 to 1.67.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.66.1...1.67.0) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> npm: bump @playwright/test from 1.37.1 to 1.38.0 (#3343) Bumps [@playwright/test](https://github.com/Microsoft/playwright) from 1.37.1 to 1.38.0. - [Release notes](https://github.com/Microsoft/playwright/releases) - [Commits](https://github.com/Microsoft/playwright/compare/v1.37.1...v1.38.0) --- updated-dependencies: - dependency-name: "@playwright/test" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Add test of entering a blink_component name (#3349) * Add test to enter blink component * Update the README a bit. * Change name of test, update images. * Delete commented out code. npm: bump @babel/core from 7.22.11 to 7.22.20 (#3344) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.11 to 7.22.20. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.20/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Add `ot_owner_email` and `ot_display_name` fields Add 3 more fields for OT creation `stage_description` -> `ot_description` With a more detailed description of the field and its relation to OT remove test line Add basic UI for trial creation request Update chromedash-feature-detail.js cancel button returns to feature detail add ot milestone fields fix test Add "overdue" to the tooltip on overdue gate chips. (#3350) * Add "overdue" to the tooltip on overdue gate chips. * Also remove gate name. Add `ot_action_requested` field to denote sent requests (#3336) * Add 3 more fields for OT creation * `stage_description` -> `ot_description` With a more detailed description of the field and its relation to OT * remove test line * Add basic UI for trial creation request * Add `ot_feedback_submission_url` to ot creation * ot button only shows on ot stage details * Update chromedash-feature-detail.js * fix OT button * cancel button returns to feature detail * add ot milestone fields * Update chromedash-feature-detail.js * Add action_requested field for creation/extension --- main.py | 2 + pages/ot_requests.py | 32 +++++++++++ templates/admin/features/ot_requests.html | 67 +++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 pages/ot_requests.py create mode 100644 templates/admin/features/ot_requests.html diff --git a/main.py b/main.py index b4d24d2969c9..30469c415213 100644 --- a/main.py +++ b/main.py @@ -53,6 +53,7 @@ from pages import guide from pages import intentpreview from pages import metrics +from pages import ot_requests from pages import users import settings @@ -208,6 +209,7 @@ class Route: mpa_page_routes: list[Route] = [ Route('/admin/users/new', users.UserListHandler), + Route('/admin/ot_requests', ot_requests.OriginTrialsRequests), Route('/admin/features/launch/', intentpreview.IntentEmailPreviewHandler), diff --git a/pages/ot_requests.py b/pages/ot_requests.py new file mode 100644 index 000000000000..9aa0a324dfaa --- /dev/null +++ b/pages/ot_requests.py @@ -0,0 +1,32 @@ +# Copyright 2023 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from api.converters import stage_to_json_dict +from internals.core_models import Stage + +from framework import basehandlers +from framework import permissions + + +class OriginTrialsRequests(basehandlers.FlaskHandler): + """Display any origin trials requests.""" + + TEMPLATE_PATH = 'admin/features/ot_requests.html' + + @permissions.require_admin_site + def get_template_data(self, **kwargs): + stages_with_requests = Stage.query( + Stage.ot_action_requested == True).fetch() + + return {'stages': [stage_to_json_dict(s) for s in stages_with_requests]} diff --git a/templates/admin/features/ot_requests.html b/templates/admin/features/ot_requests.html new file mode 100644 index 000000000000..4acd6e516fa5 --- /dev/null +++ b/templates/admin/features/ot_requests.html @@ -0,0 +1,67 @@ +{% extends "_base.html" %} + +{% block page_title %}OT Requests - {% endblock %} + +{% block css %} + + +{% endblock %} + +{% block content %} +

Body + + + + + +

+{# #} +

Daniel Test

+ +{% endblock %} + +{% block js %} + +{% endblock %}