Skip to content

Issue/back 213/filter archived us epics #263

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

Open
daetanbhuck wants to merge 7 commits into
base: main
Choose a base branch
from
+38 −4
Open

Issue/back 213/filter archived us epics #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
632d6ed
Fix column widths in project-status.jade
daetanbhuck Mar 3, 2026
44fccb6
Merge pull request #2 from daetanbhuck/issue/2737/status-columns-misa…
daetanbhuck Mar 3, 2026
d095d0a
COMMIT BROKEN Implement front-end changes for archiveable statuses on…
daetanbhuck Mar 5, 2026
b001a44
Found radio menu.
daetanbhuck Mar 5, 2026
6d1511b
Add mapping and condition to hide Epics or User Stories based on is-a…
daetanbhuck Mar 6, 2026
3c89854
Reverting addition to Locale and reusing US fields to reduce need for…
daetanbhuck Mar 7, 2026
3aa5c5d
Merge pull request #3 from daetanbhuck/issue/2737/status-columns-misa…
daetanbhuck Mar 8, 2026
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
4 changes: 2 additions & 2 deletions app/modules/epics/dashboard/epic-row/epic-row.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//- Copyright (c) 2021-present Kaleidos INC

.epic-row.e2e-epic-row(
ng-class="{'is-blocked': vm.epic.get('is_blocked'), 'is-closed': vm.epic.get('is_closed'), 'unfold': vm.displayUserStories, 'not-empty': vm.epic.getIn(['user_stories_counts', 'opened']) || vm.epic.getIn(['user_stories_counts', 'closed'])}"
ng-class="{'is-blocked': vm.epic.get('is_blocked'), 'is-closed': vm.epic.get('is_closed'), 'is-archived': vm.epic.get('is_archived'), 'unfold': vm.displayUserStories, 'not-empty': vm.epic.getIn(['user_stories_counts', 'opened']) || vm.epic.getIn(['user_stories_counts', 'closed'])}"
ng-click="vm.toggleUserStoryList()"
ng-hide="!vm.options.closed && vm.epic.get('is_closed')"
ng-hide="!vm.options.closed && vm.epic.get('is_closed') || (!vm.options.archived && vm.epic.get('is_archived'))"
)
tg-svg.icon-drag(
svg-icon="icon-draggable"
Expand Down
12 changes: 12 additions & 0 deletions app/modules/epics/dashboard/epics-table/epics-table.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,18 @@ mixin epicSwitch(name, model)
for="switch-closed_us"
)
+epicSwitch('switch-closed_us', 'vm.options.closed_us')
.fieldset
label.epics-table-options-vote(
translate="EPICS.TABLE.ARCHIVED_EPICS"
for="switch-archived"
)
+epicSwitch('switch-archived', 'vm.options.archived')
.fieldset
label.epics-table-options-vote(
translate="EPICS.TABLE.ARCHIVED_US"
for="switch-archived_us"
)
+epicSwitch('switch-archived_us', 'vm.options.archived_us')

.epics-table-body(
tg-epics-sortable="vm.reorderEpic(epic, newIndex)"
Expand Down
4 changes: 2 additions & 2 deletions app/modules/epics/dashboard/story-row/story-row.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//- Copyright (c) 2021-present Kaleidos INC

.story-row(
ng-class="{'is-blocked': vm.story.get('is_blocked'), 'is-closed': vm.story.get('is_closed')}"
ng-hide="!vm.options.closed_us && vm.story.get('is_closed')"
ng-class="{'is-blocked': vm.story.get('is_blocked'), 'is-closed': vm.story.get('is_closed'), 'is-archived': vm.story.get('is_archived')}"
ng-hide="(!vm.options.closed_us && vm.story.get('is_closed')) || (!vm.options.archived_us && vm.story.get('is_archived'))"
)
.name(ng-if="vm.options.name")
.name-container
Expand Down
22 changes: 22 additions & 0 deletions app/partials/includes/modules/admin/project-status.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ section.admin-status-table
div.status-name(translate="COMMON.FIELDS.NAME")
div.status-slug(translate="COMMON.FIELDS.SLUG")
div.is-closed-column(translate="COMMON.FIELDS.IS_CLOSED")
div.is-archived-column(translate="ADMIN.US_STATUS.IS_ARCHIVED_COLUMN")
div.options-column
div.sortable
div(ng-repeat="value in values", tg-bind-scope)
Expand All @@ -42,6 +43,12 @@ section.admin-status-table
svg-icon="icon-check"
)

div.is-archived-column
tg-svg(
ng-show="value.is_archived"
svg-icon="icon-check"
)

div.options-column
a.edit-value(href="")
tg-svg(
Expand Down Expand Up @@ -78,6 +85,13 @@ section.admin-status-table
data-required="true"
ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]")

div.is-archived-column
select(
name="is_archived"
ng-model="value.is_archived"
data-required="true"
ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]")

div.options-column
a.save.e2e-save(href="", title="{{'COMMON.SAVE' | translate}}")
tg-svg(svg-icon="icon-check-empty")
Expand Down Expand Up @@ -111,6 +125,14 @@ section.admin-status-table
ng-options="e.id as e.name | translate for e in [{'id':true, 'name': 'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]"
)

div.is-archived-column
select(
name="is_archived"
ng-model="newValue.is_archived"
data-required="true"
ng-options="e.id as e.name | translate for e in [{'id':true, 'name': 'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]"
)

div.options-column
a.add-new.e2e-save(href="", title="{{'COMMON.ADD' | translate}}")
tg-svg(svg-icon="icon-check-empty")
Expand Down