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.

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

update tabs on tiles #1064

Merged
merged 60 commits into from
Oct 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
403bb40
populate roles if clicked
ThatGalNatalie Sep 27, 2021
4f8d4ac
Update Changelog.md
ThatGalNatalie Sep 27, 2021
d2cd0f4
rm apiToken
ThatGalNatalie Sep 28, 2021
ada317b
refactored upcoming-runs-tile; broke out sub components to simplify; …
stackoverfloweth Sep 28, 2021
c1bd2b6
rm apiToken check
ThatGalNatalie Sep 28, 2021
8665dee
addressed automatic switching to late if late flows come in and state…
stackoverfloweth Sep 28, 2021
22af26e
moved to v-tabs component
stackoverfloweth Sep 28, 2021
4eb2ebd
or null for api_token_secret
ThatGalNatalie Sep 28, 2021
7a8d1f5
implemented a better solution to cache invalidation
stackoverfloweth Sep 28, 2021
d44cb70
removed now unused laterInterval
stackoverfloweth Sep 28, 2021
74b135e
wording
ThatGalNatalie Sep 28, 2021
d118500
Update Changelog.md
ThatGalNatalie Sep 28, 2021
d5e258b
add optional to apiToken label
ThatGalNatalie Sep 28, 2021
ab0e15a
fixed vue warning when either run array is null
stackoverfloweth Sep 28, 2021
7dad4ac
same refactor and v-tab adding to details-tile
stackoverfloweth Sep 28, 2021
2b5637a
de-componentized tabs on details
stackoverfloweth Sep 28, 2021
9eb8649
de-componentized upcoming-runs-tile
stackoverfloweth Sep 28, 2021
2bb24ed
reverted unnecissary changes
stackoverfloweth Sep 28, 2021
de291ba
reverted unnecisary changes
stackoverfloweth Sep 28, 2021
36a6a64
moved title buttons into v-tabs for flow-run details-tile
stackoverfloweth Sep 28, 2021
ad58fdb
add check for apiToken for action name
ThatGalNatalie Sep 28, 2021
706cf71
moved title buttons into v-tabs for 3 agent related tiles
stackoverfloweth Sep 28, 2021
d926a11
hide tabs bar if only overview tab is visible
stackoverfloweth Sep 28, 2021
7e6b069
added tab for all in-progress
stackoverfloweth Sep 28, 2021
4830085
fixed loading for submittable-runs
stackoverfloweth Sep 28, 2021
eb2d64d
Merge pull request #1062 from PrefectHQ/issue-1059
ThatGalNatalie Sep 29, 2021
5ebe337
Merge branch 'master' of https://github.com/PrefectHQ/ui into issue-1051
ThatGalNatalie Sep 29, 2021
ad555de
Merge pull request #1065 from PrefectHQ/issue-1051
ThatGalNatalie Sep 29, 2021
f0c9010
removed extra markup for fading
stackoverfloweth Sep 29, 2021
4b87712
expanding available room for card titles
stackoverfloweth Sep 29, 2021
07ae971
initial code review changes
stackoverfloweth Sep 29, 2021
549b9ec
even with showAll if isCloud is false showing tabs is pointless
stackoverfloweth Sep 29, 2021
47d7cda
changelog
stackoverfloweth Sep 29, 2021
0569ae3
refactored upcoming-runs-tile; broke out sub components to simplify; …
stackoverfloweth Sep 28, 2021
c87c14e
addressed automatic switching to late if late flows come in and state…
stackoverfloweth Sep 28, 2021
a20eedd
moved to v-tabs component
stackoverfloweth Sep 28, 2021
3cb8ab8
implemented a better solution to cache invalidation
stackoverfloweth Sep 28, 2021
cc2b987
removed now unused laterInterval
stackoverfloweth Sep 28, 2021
7e97ed4
fixed vue warning when either run array is null
stackoverfloweth Sep 28, 2021
3cc2af7
same refactor and v-tab adding to details-tile
stackoverfloweth Sep 28, 2021
5a0a32c
de-componentized tabs on details
stackoverfloweth Sep 28, 2021
fc25853
de-componentized upcoming-runs-tile
stackoverfloweth Sep 28, 2021
860eb39
reverted unnecissary changes
stackoverfloweth Sep 28, 2021
9fb5206
reverted unnecisary changes
stackoverfloweth Sep 28, 2021
85bd77a
moved title buttons into v-tabs for flow-run details-tile
stackoverfloweth Sep 28, 2021
543fbd7
moved title buttons into v-tabs for 3 agent related tiles
stackoverfloweth Sep 28, 2021
89864fa
hide tabs bar if only overview tab is visible
stackoverfloweth Sep 28, 2021
f1081f4
added tab for all in-progress
stackoverfloweth Sep 28, 2021
7ee005b
fixed loading for submittable-runs
stackoverfloweth Sep 28, 2021
74b1e24
removed extra markup for fading
stackoverfloweth Sep 29, 2021
c0631a0
expanding available room for card titles
stackoverfloweth Sep 29, 2021
325c82a
initial code review changes
stackoverfloweth Sep 29, 2021
56197a9
even with showAll if isCloud is false showing tabs is pointless
stackoverfloweth Sep 29, 2021
19bab5d
changelog
stackoverfloweth Sep 29, 2021
28a9afc
code review suggestions
stackoverfloweth Sep 30, 2021
0f183a6
Merge branch 'issues/1056' of github.com:PrefectHQ/ui into issues/1056
stackoverfloweth Sep 30, 2021
531fed9
applied v-tabs to missed upcoming-runs-tile on dashboard
stackoverfloweth Sep 30, 2021
46330f9
code review changes
stackoverfloweth Sep 30, 2021
e902ad0
fixed border created by nesting card-text inside of tabs-items
stackoverfloweth Oct 1, 2021
0ecce8d
fixed a small sizing bugs
stackoverfloweth Oct 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@

### Features and Improvements

- None
- Remove requirement to add an API Secret for Pager Duty - [#1065](https://github.com/PrefectHQ/ui/pull/1065)
- Updated experience of "tabs" on all tiles from buttons next to the title to standard v-tabs - [#1064](https://github.com/PrefectHQ/ui/pull/1064)

### Bugfixes

- None
- Fix member invitation bug - [#1062](https://github.com/PrefectHQ/ui/pull/1062)
- Fixed [#1056](https://github.com/PrefectHQ/ui/issues/1056) with improvements above - [#1064](https://github.com/PrefectHQ/ui/pull/1064)
- Submittable/Upcoming Runs Tiles would automatically switch tabs when user explicitly set the tab they want to view - [#1064](https://github.com/PrefectHQ/ui/pull/1064)
- Loading indicator was not showing up for Submittable Runs Tile - [#1064](https://github.com/PrefectHQ/ui/pull/1064)
- Loading indicator was showing whenever there was no upcoming runs for Upcoming Runs Tile - [#1064](https://github.com/PrefectHQ/ui/pull/1064)

## 2021-09-20

Expand Down
80 changes: 31 additions & 49 deletions src/pages/Agents/AgentTile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,20 @@ export default {
}
},
data() {
const tabs = {
overview: 0,
config: 1
}

return {
copiedText: {},
labelMenuOpen: false,
isDeleting: false,
showConfirmDialog: false,
loading: 0,
showIcon: true,
tab: 'overview'
tab: tabs.overview,
tabs
}
},
computed: {
Expand Down Expand Up @@ -280,54 +286,10 @@ export default {
<v-system-bar :color="statusColor" :height="5" absolute> </v-system-bar>
<CardTitle :title="name">
<div slot="icon" :class="iconClass" class="ml-2" icon>
<i class="fa-2x pi-2x nav-bar-duotone-icon" :class="agentIcon"
/></div>
<div v-if="showAll" slot="action" class="d-flex align-end flex-column">
<v-btn
depressed
small
tile
icon
class="button-transition w-100 d-flex justify-end"
:color="tab == 'overview' ? 'primary' : ''"
:style="{
'border-right': `3px solid ${
tab == 'overview'
? 'var(--v-primary-base)'
: 'var(--v-appForeground-base)'
}`,
'box-sizing': 'content-box',
'min-width': '100px'
}"
@click="tab = 'overview'"
>
Overview
<v-icon small>calendar_view_day</v-icon>
</v-btn>
<v-btn
v-if="isCloud"
depressed
small
tile
icon
class="button-transition w-100 d-flex justify-end"
:color="tab == 'config' ? 'primary' : ''"
:style="{
'border-right': `3px solid ${
tab == 'config'
? 'var(--v-primary-base)'
: 'var(--v-appForeground-base)'
}`,
'box-sizing': 'content-box',
'min-width': '100px'
}"
@click="tab = 'config'"
>
Config
<v-icon x-small>inventory_2</v-icon>
</v-btn>
<i class="fa-2x pi-2x nav-bar-duotone-icon" :class="agentIcon" />
</div>
</CardTitle>

<v-dialog v-model="showConfirmDialog" max-width="480">
<v-card>
<v-card-title class="word-break-normal">
Expand Down Expand Up @@ -356,9 +318,24 @@ export default {
</v-card>
</v-dialog>

<v-tabs
v-if="showAll && isCloud"
v-model="tab"
tabs-border-bottom
color="primary"
class="flex-grow-0"
>
<v-tab :key="tabs.overview" data-cy="details-tile-overview">
Overview
</v-tab>
<v-tab :key="tabs.config" data-cy="details-tile-config">
Config
</v-tab>
</v-tabs>

<v-card-text
v-if="tab == 'overview' || !showAll"
class="py-2"
v-if="tab == tabs.overview || !showAll"
class="py-2 card-content"
:style="showAll ? '' : { height: '250px' }"
>
<div v-if="!showAll" class="my-2 text-subtitle-1 font-weight-light ">
Expand Down Expand Up @@ -595,6 +572,11 @@ export default {
--fa-primary-color: var(--v-utilGrayLight-base);
}

.card-content {
max-height: calc(310px - var(--v-tabs-height));
overflow-y: auto;
}

.timeline-no-runs {
left: 50%;
position: absolute;
Expand Down
Loading