Add global time tracking report
What does this MR do and why?
This is the first iteration about introducing the global time tracking report and, as such, some functionalities are definitely missing. Notable examples are:
- filters do not apply the URL
- cannot filter by project or group
- filters don't use the filtered search bar
total spent time is missing- grouping issuables is missing
- and more
Screenshots or screen recordings
Registrazione_schermo_2023-03-10_alle_19.37.15
Large view | Small view |
---|---|
![]() |
![]() |
How to set up and validate locally
Optional: seed some timelog using this command
bundle exec rake db:seed_fu FILTER=37_timelogs SEED_TIMELOGS=true
- Enable the
global_time_tracking_report
feature flag-
gdk rails c
then, from the rails console,Feature.enable(:global_time_tracking_report)
-
- Add some time entries to one (or more) issuables (issues or MRs)
- Go to
http://127.0.0.1:3000/-/timelogs
to view the report
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Related to #344002
Merge request reports
Activity
added Leading Organization label
Hey @zillemarco!
Thank you for your contribution to GitLab. Please refer to the contribution flow documentation for a quick overview of the process, and the merge request (MR) guidelines for the detailed process.
When you're ready for a first review, post
@gitlab-bot ready
. If you know a relevant reviewer(s) (for example, someone that was involved in a related issue), you can also assign them directly with@gitlab-bot ready @user1 @user2
.At any time, if you need help, feel free to post
@gitlab-bot help
or initiate a mentor session on Discord. Read more on how to get help.To enable automated checks on your MR, please configure Danger for your fork.
You can comment
@gitlab-bot label <label1> <label2>
to add labels to your MR. Please see the list of allowed labels in thelabel
command documentation.This message was generated automatically. You're welcome to improve it.
added Community contribution workflowin dev labels
assigned to @zillemarco
mentioned in merge request !88243 (closed)
4 Warnings Please add a merge request subtype to this merge request. Please add a merge request type to this merge request. This Merge Request needs to be labelled with frontend, backend, documentation, typefeature, featureaddition. Please request a reviewer or maintainer to add them. This merge request does not refer to an existing milestone. 1 Message This merge request adds or changes documentation files. A review from the Technical Writing team before you merge is recommended. Reviews can happen after you merge. Documentation review
The following files require a review from a technical writer:
-
doc/api/graphql/reference/index.md
(Link to current live version)
The review does not need to block merging this merge request. See the:
-
Metadata for the
*.md
files that you've changed. The first few lines of each*.md
file identify the stage and group most closely associated with your docs change. - The Technical Writer assigned for that stage and group.
- Documentation workflows for information on when to assign a merge request for review.
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend Diogo Frazão (
@dfrazao-gitlab
) (UTC+1)Tetiana Chupryna (
@brytannia
) (UTC+1)frontend Lee Tickett (
@leetickett-gitlab
) (UTC+0)Jannik Lehmann (
@jannik_lehmann
) (UTC+1)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
Danger-
mentioned in issue gitlab-org/quality/triage-reports#10730 (closed)
mentioned in issue gitlab-org/quality/triage-reports#10733 (closed)
added typefeature label
@zillemarco, it seems we're waiting on an action from you for approximately two weeks.
- Do you still have capacity to work on this? If not, you might want to close this MR and/or ask someone to take over.
- Do you need help in getting it ready? At any time, you can:
- If you're actually ready for a review, you can post
@gitlab-bot ready
.
added automation:author-reminded label
added 5628 commits
-
a3acf666...ce878cd6 - 5626 commits from branch
gitlab-org:master
- 7d33b2cc - Add global time tracking report
- 43dd28ff - Restored gitlab.pot file
-
a3acf666...ce878cd6 - 5626 commits from branch
added workflowready for review label and removed workflowin dev label
Hi
@ashrafkhamis
! Please review this documentation merge request. This message was generated automatically. You're welcome to improve it.added documentation twtriaged labels
requested review from @ashrafkhamis
@ashrafkhamis
, this Community contribution is ready for review.- Do you have capacity and domain expertise to review this? We are mindful of your time, so if you are not able to take this on, please re-assign to one or more other reviewers.
- Add the workflowin dev label if the merge request needs action from the author. This message was generated automatically. You're welcome to improve it.
removed automation:author-reminded label
removed review request for @ashrafkhamis
added workflowin dev label and removed workflowready for review label
- Resolved by Lee Tickett
Sorry Marco- I was just using this MR to test a triage policy
https://gitlab.com/gitlab-org/quality/triage-ops/-/jobs/3755865811
requested review from @ashrafkhamis
- Resolved by Tetiana Chupryna
Hi @zillemarco
I see this MR is still in draft. Please add me again when it's ready for review. Thank you
added Technical Writing label
changed milestone to %15.9
removed review request for @ashrafkhamis
added docsfeature label
added 2 commits
- Resolved by Tetiana Chupryna
Hi @leetickett-gitlab, I just pushed up some changes and I'd love to have your feedback on the current status of the report
To recap, I:
- added pagination
- tweaked the layout of the page
- cleaned up the table
- grouped together project and group columns into namespace column
- removed the CRM-related columns (we'll add them back later on as I'd like to keep it simple for now)
- added the status badge of the issuable
- made the namespace cell a link to the namespace
- made the ticket cell a link to the issuable
Things missing:
- Dropdown to search usernames
- Dropdown to search projects
- Dropdown to search groups
- Table sorting
- Show total amount of time spent
- Gouping (by issuable, by user, ...)
- Probably others
For all these missing things though, I am thinking about tackling them later on in the next iterations. This first iteration gets the ball rolling, especially because I'd love to use a search bar to handle 1-4 I mentioned, I need to figure out how to handle the rest (potentially with some design discussions), ... and that will require some work
WDYT?
Edited by Marco Zille
changed milestone to %15.10
requested review from @leetickett-gitlab
removed review request for @leetickett-gitlab
mentioned in issue #394715
added 2727 commits
Toggle commit list- Resolved by Tetiana Chupryna
Hi @nickleonard
Some new(ish) time-tracking stuff coming it for you to check
Could you please give it a glance and see it there's something immediate to be addressed on the global time tracking report?
Thanks a lotKeep in mind that this is really only the first MVC to get things started, so things are pretty rough. For example, the filters will become a filtered search bar, filters will update the query string, total spent time is missing (I'd love some ideas on where to show it
), etc.
marked the checklist item I have evaluated the MR acceptance checklist for this MR. as completed
requested review from @nickleonard
added UI text label
added 1360 commits
-
1bfb468a...c18bc8b4 - 1357 commits from branch
gitlab-org:master
- f328046c - Add global time tracking report
- 91c97462 - Improved UI
- 79920418 - Applied suggestions from review
Toggle commit list-
1bfb468a...c18bc8b4 - 1357 commits from branch
added 1012 commits
-
79920418...50bed815 - 1008 commits from branch
gitlab-org:master
- d0be06b5 - Add global time tracking report
- 1f547233 - Improved UI
- 8e64c2ef - Applied suggestions from review
- d8d1df6e - Resolved conflicts with master
Toggle commit list-
79920418...50bed815 - 1008 commits from branch
mentioned in issue #25266
- Resolved by Lee Tickett
@zillemarco Thanks for the video and the amount of work you've put in all this so far!
Some more feedback for the table headers:
- For Summary/Note, can we pick one of them? For example, Summary?
- The header titles should use sentence case to match most other places, so:
- User
- Source
- Spent at
- Time spent
- Summary
added 592 commits
-
4b90a55a...0149b195 - 585 commits from branch
gitlab-org:master
- c45660fd - Add global time tracking report
- 32fe3829 - Improved UI
- 06737355 - Applied suggestions from review
- 17ed94fc - Resolved conflicts with master
- cb92ba3d - Applied suggestions from review
- ee3f1c8f - Applied suggestions from review
- 010f951a - Fixed merge conflict
Toggle commit list-
4b90a55a...0149b195 - 585 commits from branch
added 746 commits
-
010f951a...04d81247 - 739 commits from branch
gitlab-org:master
- dc5daa6c - Add global time tracking report
- baca0488 - Improved UI
- b542f6fc - Applied suggestions from review
- 00a03906 - Resolved conflicts with master
- 5a44035e - Applied suggestions from review
- 4243b5a4 - Applied suggestions from review
- bec417ee - Fixed merge conflict
Toggle commit list-
010f951a...04d81247 - 739 commits from branch
added 2 commits
removed review request for @nickleonard
added 2 commits
added 1330 commits
-
4bbcd3bc...74dc0ec3 - 1318 commits from branch
gitlab-org:master
- 74dc0ec3...ac260b4a - 2 earlier commits
- 462eed8d - Applied suggestions from review
- 341b0461 - Resolved conflicts with master
- bfb3ad2c - Applied suggestions from review
- d905ebfd - Applied suggestions from review
- 905e3032 - Fixed merge conflict
- e0a2dd8f - Reverted unneeded changes
- f5ca0d00 - Improved source column layout
- 5adc8986 - Started working on tests
- 3d015318 - Extracted cell component
- b21b8e29 - Added more specs
Toggle commit list-
4bbcd3bc...74dc0ec3 - 1318 commits from branch
changed milestone to %15.11
- A deleted user
added backend feature flag frontend labels
4 Warnings This merge request is quite big (1436 lines changed), please consider splitting it into multiple merge requests. 956b1f3d: Commits that change 30 or more lines across at least 3 files should describe these changes in the commit body. For more information, take a look at our Commit message guidelines. 606736a0: Commits that change 30 or more lines across at least 3 files should describe these changes in the commit body. For more information, take a look at our Commit message guidelines. This merge request adds a new rule to app/assets/stylesheets/framework/common.scss or app/assets/stylesheets/utilities.scss. 1 Message This merge request adds or changes documentation files. A review from the Technical Writing team before you merge is recommended. Reviews can happen after you merge. Documentation review
The following files require a review from a technical writer:
-
doc/api/graphql/reference/index.md
(Link to current live version)
The review does not need to block merging this merge request. See the:
-
Metadata for the
*.md
files that you've changed. The first few lines of each*.md
file identify the stage and group most closely associated with your docs change. - The Technical Writer assigned for that stage and group.
- Documentation workflows for information on when to assign a merge request for review.
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend Smriti Garg (
@sgarg_gitlab
) (UTC+5.5)George Koltsov (
@georgekoltsov
) (UTC+1)frontend Dheeraj Joshi (
@djadmin
) (UTC+5.5)Peter Hegman (
@peterhegman
) (UTC-7)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
Changes to utility SCSS files
Addition to
app/assets/stylesheets/utilities.scss
You have added a new rule to
app/assets/stylesheets/utilities.scss
. Are you sure you need this rule?If it is a component class shared across items, could it be added to the component as a utility class or to the component's stylesheet? If not, consider adding it to
app/assets/stylesheets/framework/common.scss
If it is a new utility class, is there another class that shares the same values in either this file or in
app/assets/stylesheets/utilities.scss
? If not, please be sure this addition follows the Gitlab UI naming style so it may be removed when these rules are included. See Include gitlab-ui utility-class library for more about this project.If needed, you can retry the
danger-review
job that generated this comment.Generated by
Danger-
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@75081ea5
Bundle size analysis [beta]
This compares changes in bundle size for entry points between the commits 47d8aca4 and 7df96743
Special assetsEntrypoint / Name Size before Size after Diff Diff in percent mainChunk 2.08 MB 2.08 MB - 0.0 % average 3.62 MB 3.62 MB - -0.0 % New entry points: 1Expand
Entrypoint / Name Size before Size after Diff Diff in percent pages.time_tracking.timelogs 0 Bytes 1003.05 KB +1003.05 KB 100.0 %
Note: We do not have exact data for 47d8aca4. So we have used data from: fa7faec7.
The intended commit has no webpack pipeline, so we chose the last commit with one before it.Please look at the full report for more details
Read more about how this report works.
Generated by
Dangermentioned in commit gitlab-org-sandbox/gitlab-jh-validation@d79a98e5
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@07b5a6b5
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@458b8ca9
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@c9590dc1
added 662 commits
-
0d1474e2...bdf49110 - 660 commits from branch
gitlab-org:master
- 45b55506 - Add global time tracking report
- 606736a0 - Improved UI and added specs
-
0d1474e2...bdf49110 - 660 commits from branch
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@8a77634a
Allure report
allure-report-publisher
generated test report!e2e-review-qa:
test report for 7df96743expand test summary
+------------------------------------------------------------+ | suites summary | +-------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------+--------+--------+---------+-------+-------+--------+ | Plan | 49 | 0 | 1 | 0 | 50 | ✅ | +-------+--------+--------+---------+-------+-------+--------+ | Total | 49 | 0 | 1 | 0 | 50 | ✅ | +-------+--------+--------+---------+-------+-------+--------+
e2e-package-and-test:
test report for 7df96743expand test summary
+-----------------------------------------------------------------------+ | suites summary | +------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------+--------+--------+---------+-------+-------+--------+ | Manage | 58 | 0 | 12 | 36 | 70 | ❗ | | Create | 322 | 0 | 16 | 136 | 338 | ❗ | | Release | 12 | 0 | 0 | 10 | 12 | ❗ | | Plan | 120 | 0 | 0 | 46 | 120 | ❗ | | Verify | 108 | 0 | 8 | 106 | 116 | ❗ | | Data Stores | 68 | 0 | 0 | 24 | 68 | ❗ | | Govern | 92 | 0 | 0 | 92 | 92 | ❗ | | Growth | 0 | 0 | 4 | 0 | 4 | ➖ | | Secure | 8 | 0 | 16 | 8 | 24 | ❗ | | Fulfillment | 4 | 0 | 44 | 0 | 48 | ✅ | | Monitor | 20 | 0 | 0 | 20 | 20 | ❗ | | ModelOps | 0 | 0 | 2 | 0 | 2 | ➖ | | Configure | 0 | 0 | 6 | 0 | 6 | ➖ | | Framework sanity | 0 | 0 | 2 | 0 | 2 | ➖ | | Package | 0 | 0 | 6 | 0 | 6 | ➖ | | Analytics | 4 | 0 | 0 | 4 | 4 | ❗ | +------------------+--------+--------+---------+-------+-------+--------+ | Total | 816 | 0 | 116 | 482 | 932 | ❗ | +------------------+--------+--------+---------+-------+-------+--------+
mentioned in issue #339759 (closed)
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@2340fe0f
assigned to @leetickett-gitlab
- Resolved by Lee Tickett
Hi @pgascouvaillancourt
If you have capacity, could you please review these frontend changes? Thanks a lotHi @ddieulivol
If you have capacity, could you please review these backend changes? Most of them are FE related Thanks a lot
added workflowready for review label and removed workflowin dev label
requested review from @pgascouvaillancourt and @ddieulivol
@pgascouvaillancourt
@ddieulivol
, this Community contribution is ready for review.- Do you have capacity and domain expertise to review this? We are mindful of your time, so if you are not able to take this on, please re-assign to one or more other reviewers.
- Add the workflowin dev label if the merge request needs action from the author. This message was generated automatically. You're welcome to improve it.
requested review from @nickleonard
requested review from @brytannia and removed review request for @ddieulivol
- Resolved by Tetiana Chupryna
@ddieulivol
, thanks for approving this merge request.This is the first time the merge request is approved. To ensure full test coverage, please start a new pipeline before merging.
For more info, please refer to the following links:
added pipeline:mr-approved label
mentioned in merge request gitlab-ui!3371 (merged)
- Resolved by Marco Zille
- Resolved by Marco Zille
- Resolved by Paul Gascou-Vaillancourt
- Resolved by Paul Gascou-Vaillancourt
- Resolved by Paul Gascou-Vaillancourt
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
- Resolved by Marco Zille
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
- Resolved by Marco Zille
@zillemarco I did a partial review for now. I'll have to get back to this later today. I though I'd post the first batch of comments in case you can address them before I'm back. Thanks for this!
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@9985be3f
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
- Resolved by Paul Gascou-Vaillancourt
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
Great work @zillemarco! I reviewed the frontend production code and left a few more comments. I'd like to have another look once we have migrated to
GlKeysetPagination
. I'll review the specs then as I didn't have capacity to look at them today. Please ping me again when this is ready for another round.
removed review request for @pgascouvaillancourt
mentioned in issue #403819
removed review request for @nickleonard
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@8e7c99dc
requested review from @pgascouvaillancourt
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@5eabeac6
- Resolved by Tetiana Chupryna
- Resolved by Marco Zille
mentioned in issue gitlab-org/quality/triage-reports#11905 (closed)
- Resolved by Marco Zille
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
Great work @zillemarco, LGTM!
I left a few more non-blocking suggestions, but let's move on to the maintainer review.@jannik_lehmann could you have a look please?
requested review from @jannik_lehmann and removed review request for @pgascouvaillancourt
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@bc1b1b41
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@c9b8ca27
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@58ae3b9a
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
- Resolved by Tetiana Chupryna
- Resolved by Jannik Lehmann
- Resolved by Jannik Lehmann
- Resolved by Marco Zille
Thanks for working on this @zillemarco great Job! And thanks for the great initial review @pgascouvaillancourt There wasn't a lot for me to find, just a question of understanding. With that
over to you @zillemarco
mentioned in issue #404735 (closed)
requested review from @msedlakjakubowski
mentioned in issue #404745
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@c76653d6
requested review from @phillipwells and removed review request for @msedlakjakubowski
removed review request for @jannik_lehmann
mentioned in issue #404790
removed review request for @phillipwells
- Resolved by Lee Tickett
@leetickett-gitlab, did you forget to run a pipeline before you merged this work? Based on our code review process, if the latest pipeline was created more than 6 hours ago OR finished more than 2 hours ago, you should:
- Ensure the merge request is not in Draft status.
- Start a pipeline (especially important for Community contribution merge requests).
- Set the merge request to merge when pipeline succeeds.
This is a guideline, not a rule. Please consider replying to this comment for transparency.
This message was generated automatically. You're welcome to improve it.
@zillemarco, how was your code review experience with this merge request? Please tell us how we can continue to iterate and improve:
- React with a
or a on this comment to describe your experience. - Create a new comment starting with
@gitlab-bot feedback
below, and leave any additional feedback you have for us in the comment.
Interested in learning more tips and tricks to solve your next challenge faster? Subscribe to the GitLab Community Newsletter for contributor-focused content and opportunities to level up.
Thanks for your help!
This message was generated automatically. You're welcome to improve it.
- React with a
mentioned in commit 0d017d93
added workflowstaging-canary label and removed workflowready for review label
added workflowcanary label and removed workflowstaging-canary label
added workflowstaging label and removed workflowcanary label
added workflowproduction label and removed workflowstaging label
mentioned in epic &8429
- Resolved by Lee Tickett
I enabled the feature flag for me and you @zillemarco
When I hit the new endpoint i'm getting a 500 from the GraphQL request at the moment.
Digging in elastic I can see:
Integer out of bounds: 2409876072 @ timelogs.totalSpentTime (TimelogConnection.totalSpentTime). Consider using ID or GraphQL::Types::BigInt instead.
I'm going to log some time on this MR then run for today and see what happens
mentioned in issue #406548 (closed)
- Resolved by Lee Tickett
mentioned in issue #406549
- Resolved by Lee Tickett
mentioned in issue #406550
mentioned in issue #344002
mentioned in issue #407539 (closed)
added releasedcandidate label
added releasedpublished label and removed releasedcandidate label
mentioned in merge request kubitus-project/kubitus-installer!2061 (merged)
added linked-issue label
mentioned in merge request !119124 (closed)
mentioned in merge request !132020 (merged)
mentioned in issue gitlab-org/quality/triage-reports#15288 (closed)
mentioned in issue gitlab-org/quality/triage-reports#15714 (closed)
mentioned in issue gitlab-org/quality/triage-reports#16020 (closed)
mentioned in issue gitlab-org/quality/triage-reports#16483 (closed)
mentioned in issue gitlab-org/quality/triage-reports#17016 (closed)
mentioned in issue gitlab-org/quality/triage-reports#17464 (closed)
mentioned in issue gitlab-org/quality/triage-reports#17923 (closed)
mentioned in issue gitlab-org/quality/triage-reports#18456 (closed)
mentioned in issue gitlab-org/quality/triage-reports#18935 (closed)
mentioned in issue gitlab-org/quality/triage-reports#19389 (closed)
mentioned in issue gitlab-org/quality/triage-reports#20621 (closed)
mentioned in issue #502683
mentioned in issue gitlab-org/quality/triage-reports#20958 (closed)
mentioned in issue gitlab-org/quality/triage-reports#21532 (closed)
mentioned in issue gitlab-org/quality/triage-reports#22012