Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Provide filter query by job displayName, add pristine jobs reports #897

Merged
merged 26 commits into from
Mar 22, 2021
Merged

Provide filter query by job displayName, add pristine jobs reports #897

merged 26 commits into from
Mar 22, 2021

Conversation

MGSousa
Copy link
Contributor

@MGSousa MGSousa commented Jan 25, 2021 •
edited
Loading

  • Provide filter query by job displayName in main search
  • Change var DKRON_FAILED_JOBS to receive only "failed jobs"
  • Added pristine jobs reports (jobs that have not yet been performed)

@MGSousa MGSousa changed the title Provide filter query by job displayName, add disabled pristine jobs reports Provide filter query by job displayName, add pristine jobs reports Jan 25, 2021
vcastellm
vcastellm requested changes Mar 8, 2021
View reviewed changes
Copy link
Member

@vcastellm vcastellm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but I miss the change in React UI to use PRISTINE_JOBS

@MGSousa
Copy link
Contributor Author

MGSousa commented Mar 10, 2021

LGTM but I miss the change in React UI to use PRISTINE_JOBS

Done

yvanoers
yvanoers requested changes Mar 12, 2021
View reviewed changes
dkron/store.go Outdated Show resolved Hide resolved
dkron/ui.go Outdated Show resolved Hide resolved
yvanoers
yvanoers requested changes Mar 14, 2021
View reviewed changes
dkron/ui.go Outdated Show resolved Hide resolved
vcastellm
vcastellm requested changes Mar 15, 2021
View reviewed changes
Copy link
Member

@vcastellm vcastellm left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whops! you will need to rebase your commits with master, or maybe open a new PR?

@MGSousa
Copy link
Contributor Author

MGSousa commented Mar 15, 2021

@Victorcoder Conflicts resolved

@vcastellm
Copy link
Member

@MGSousa but the history is polluted with commits from master, try to rebase and squash to one commit

Miguel Sousa added 2 commits March 15, 2021 16:21
Squashed commit of the following:
52c44af 
commit a127a76
Merge: ffaf975 347cf72
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Mon Mar 15 15:39:45 2021 +0000

    Merge branch 'master' of https://github.com/MGSousa/dkron

commit ffaf975
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Mon Mar 15 13:07:06 2021 +0000

    Remove custom status for untriggered/pristine jobs && Minor changes

commit 8c9440b
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Mon Mar 15 11:44:07 2021 +0000

    Added public directory

commit aa96dcf
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Wed Mar 10 12:52:52 2021 +0000

    Added Pristine Jobs to React UI

commit eb18129
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Mon Jan 25 11:53:02 2021 +0000

    FIX change header name DKRON_PRISTINE_JOBS

commit d1c3184
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Mon Jan 25 10:22:15 2021 +0000

    Provide filter query by job displayName, add disabled pristine jobs reports

commit 347cf72
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Mon Mar 15 13:07:06 2021 +0000

    Remove custom status for untriggered/pristine jobs && Minor changes

commit 92fd8f5
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Mon Mar 15 11:44:07 2021 +0000

    Added public directory

commit b6b593a
Author: Yuri van Oers <yvanoers@gmail.com>
Date:   Sun Mar 14 23:40:46 2021 +0100

    Fix XSS vulnerability (distribworks#922)

    * Tidy modules

    * Fix "can't import package" error

    * Fix XSS vulnerability

commit 2b2a2b2
Author: Etienne Duclos <duclosetienne@gmail.com>
Date:   Sun Mar 14 13:41:24 2021 -0400

    feat(ui): add a filter on disabled state (distribworks#923)

commit 31c6324
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Wed Mar 10 12:52:52 2021 +0000

    Added Pristine Jobs to React UI

commit 92a9709
Author: Victor Castell <victor@victorcastell.com>
Date:   Tue Mar 9 09:37:53 2021 +0100

    Update go.sum

commit 296a9fa
Author: Victor Castell <victor@victorcastell.com>
Date:   Mon Mar 8 22:44:39 2021 +0100

    Update changelog

commit 1a982e0
Author: Victor Castell <victor@victorcastell.com>
Date:   Mon Mar 8 22:30:55 2021 +0100

    Add the ui/public dir (distribworks#919)

    It was missing because of wrong gitignore

commit 20ab436
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Mon Jan 25 11:53:02 2021 +0000

    FIX change header name DKRON_PRISTINE_JOBS

commit 5be4196
Author: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local>
Date:   Mon Jan 25 10:22:15 2021 +0000

    Provide filter query by job displayName, add disabled pristine jobs reports
Merge branch 'master' of https://github.com/MGSousa/dkron
7aad02a
@MGSousa
Copy link
Contributor Author

MGSousa commented Mar 15, 2021

@Victorcoder Commits already squashed, check if history yet prevails

@yvanoers
Copy link
Collaborator

I would prefer it if 'pristine' was replaced with 'untriggered' in the front-end code as well, so it is consistent with the backend.
But I'll be ok with whatever @Victorcoder wants in this regard.

Other than that, LGTM.

vcastellm
vcastellm requested changes Mar 21, 2021
View reviewed changes
Copy link
Member

@vcastellm vcastellm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer it if 'pristine' was replaced with 'untriggered' in the front-end code as well, so it is consistent with the backend.

Agree with @yvanoers suggestion

@MGSousa
Copy link
Contributor Author

MGSousa commented Mar 21, 2021

I would prefer it if 'pristine' was replaced with 'untriggered' in the front-end code as well, so it is consistent with the backend.

Agree with @yvanoers suggestion

Done

vcastellm
vcastellm reviewed Mar 21, 2021
View reviewed changes
dkron/ui.go Outdated Show resolved Hide resolved
vcastellm
vcastellm reviewed Mar 21, 2021
View reviewed changes
ui/public/index.html Outdated Show resolved Hide resolved
MGSousa and others added 6 commits March 21, 2021 23:58
@MGSousa
Update ui/src/jobs/StatusField.tsx
0959b09 
Co-authored-by: Victor Castell <victor@victorcastell.com>
@MGSousa
Update ui/src/jobs/StatusField.tsx
61ab77b 
Co-authored-by: Victor Castell <victor@victorcastell.com>
@MGSousa
Update ui/public/index.html
210ddcf 
Co-authored-by: Victor Castell <victor@victorcastell.com>
Minor change on fmt
0d9163e
Merge branch 'master' of https://github.com/MGSousa/dkron
a6d1f2a
FIX only consider untriggered jobs with empty status
04fcfb8
vcastellm
vcastellm approved these changes Mar 22, 2021
View reviewed changes
Copy link
Member

@vcastellm vcastellm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@vcastellm vcastellm merged commit 79eaa39 into distribworks:master Mar 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yvanoers yvanoers yvanoers requested changes

@vcastellm vcastellm vcastellm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MGSousa @vcastellm @yvanoers