-
Notifications
You must be signed in to change notification settings - Fork 63
Restructure moderation tab #1330
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
Merged
adlius
merged 2 commits into
CenterForOpenScience:feature/versioning-mirage
from
futa-ikeda:moderator-tabs-restructure
Oct 29, 2021
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
lib/registries/addon/branded/moderation/pending/controller.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import Controller from '@ember/controller'; | ||
| import { action } from '@ember/object'; | ||
| import { tracked } from '@glimmer/tracking'; | ||
|
|
||
| import { RegistrationReviewStates } from 'ember-osf-web/models/registration'; | ||
| import { RevisionReviewStates } from 'ember-osf-web/models/schema-response'; | ||
|
|
||
| type PendingStates = | ||
| RegistrationReviewStates.Pending | | ||
| RegistrationReviewStates.PendingWithdrawRequest | | ||
| RevisionReviewStates.RevisionPendingModeration; | ||
| export default class RegistriesModerationPendingController extends Controller { | ||
| queryParams = ['state']; | ||
|
|
||
| @tracked state?: PendingStates; | ||
|
|
||
| @action | ||
| changeTab(tab: PendingStates) { | ||
| this.state = tab; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import { action } from '@ember/object'; | ||
| import Transition from '@ember/routing/-private/transition'; | ||
| import Route from '@ember/routing/route'; | ||
| import { inject as service } from '@ember/service'; | ||
|
|
||
| import { RegistrationReviewStates } from 'ember-osf-web/models/registration'; | ||
| import RegistrationProviderModel from 'ember-osf-web/models/registration-provider'; | ||
| import { RevisionReviewStates } from 'ember-osf-web/models/schema-response'; | ||
| import Analytics from 'ember-osf-web/services/analytics'; | ||
|
|
||
| import RegistriesModerationPendingController from './controller'; | ||
|
|
||
| export default class BrandedModerationPendingRoute extends Route { | ||
| @service analytics!: Analytics; | ||
|
|
||
| setupController( | ||
| controller: RegistriesModerationPendingController, | ||
| model: RegistrationProviderModel, | ||
| transition: Transition, | ||
| ) { | ||
| super.setupController(controller, model, transition); | ||
| const { state } = controller; | ||
| if (!state | ||
| || ![ | ||
| RegistrationReviewStates.Pending, | ||
| RegistrationReviewStates.PendingWithdraw, | ||
| RevisionReviewStates.RevisionPendingModeration, | ||
| ].includes(state!)) { | ||
| controller.set('state', 'pending'); | ||
| this.replaceWith('branded.moderation.pending'); | ||
| } | ||
| } | ||
|
|
||
| @action | ||
| didTransition() { | ||
| this.analytics.trackPage(); | ||
| } | ||
| } |
File renamed without changes.
52 changes: 52 additions & 0 deletions
52
lib/registries/addon/branded/moderation/pending/template.hbs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| {{page-title (t 'registries.moderation.pending.title') prepend=false}} | ||
| {{!-- TODO: Add number of registrations in each state in tab --}} | ||
| <Registries::RegistrationList::Manager | ||
| local-class='registrationListContainer' | ||
| @provider={{this.model}} | ||
| @state={{this.state}} | ||
| as |manager| | ||
| > | ||
| <div local-class='tabSortingWrapper'> | ||
| <div local-class='tabs'> | ||
| <button | ||
| data-test-submissions-type='pending' | ||
| data-test-is-selected={{if (eq this.state 'pending') 'true' 'false'}} | ||
| type='button' | ||
| {{on 'click' (fn this.changeTab 'pending')}} | ||
| local-class='tab {{if (eq this.state 'pending') 'selected'}}' | ||
| > | ||
| <FaIcon @icon='hourglass' /> | ||
| {{t 'registries.moderation.states.pending'}} | ||
| </button> | ||
| {{#if this.model.allowUpdates}} | ||
| <button | ||
| data-test-submissions-type='revision-pending' | ||
| data-test-is-selected={{if (eq this.state 'pending_moderation') 'true' 'false'}} | ||
| type='button' | ||
| {{on 'click' (fn this.changeTab 'pending_moderation')}} | ||
| local-class='tab {{if (eq this.state 'pending_moderation') 'selected'}}' | ||
| > | ||
| <FaIcon @icon='hourglass' /> | ||
| {{t 'registries.moderation.states.revisionPending'}} | ||
| </button> | ||
| {{/if}} | ||
| <button | ||
| data-test-submissions-type='pending-withdraw' | ||
| data-test-is-selected={{if (eq this.state 'pending_withdraw') 'true' 'false'}} | ||
| type='button' | ||
| {{on 'click' (fn this.changeTab 'pending_withdraw')}} | ||
| local-class='tab {{if (eq this.state 'pending_withdraw') 'selected'}}' | ||
| > | ||
| <FaIcon @icon='clock' /> | ||
| {{t 'registries.moderation.states.pendingWithdraw'}} | ||
| </button> | ||
| </div> | ||
| <SortButton | ||
| local-class='sortButton' | ||
| @sortAction={{manager.sortRegistrationsBy}} | ||
| @sort={{manager.sort}} | ||
| @sortBy='date_registered' | ||
| /> | ||
| </div> | ||
| <Registries::RegistrationList::List @manager={{manager}} /> | ||
| </Registries::RegistrationList::Manager> |
16 changes: 0 additions & 16 deletions
16
lib/registries/addon/branded/moderation/submissions/controller.ts
This file was deleted.
Oops, something went wrong.
22 changes: 22 additions & 0 deletions
22
lib/registries/addon/branded/moderation/submitted/controller.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import Controller from '@ember/controller'; | ||
| import { action } from '@ember/object'; | ||
| import { tracked } from '@glimmer/tracking'; | ||
|
|
||
| import { RegistrationReviewStates } from 'ember-osf-web/models/registration'; | ||
|
|
||
| type SubmittedStates = | ||
| RegistrationReviewStates.Accepted | | ||
| RegistrationReviewStates.Embargo | | ||
| RegistrationReviewStates.Withdrawn | | ||
| RegistrationReviewStates.Rejected; | ||
|
|
||
| export default class RegistriesModerationSubmittedController extends Controller { | ||
| queryParams = ['state']; | ||
|
|
||
| @tracked state?: SubmittedStates; | ||
|
|
||
| @action | ||
| changeTab(tab: SubmittedStates) { | ||
| this.state = tab; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
lib/registries/addon/branded/moderation/submitted/styles.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| .contentBorder { | ||
| composes: childNav from '../styles.scss'; | ||
| } | ||
|
|
||
| .registrationListContainer { | ||
| ul { | ||
| margin: 0; | ||
| border: 1px solid $color-border-gray; | ||
| } | ||
|
|
||
| li { | ||
| background-color: initial; | ||
| border-left: 0; | ||
| border-right: 0; | ||
| border-top: 0; | ||
| } | ||
|
|
||
| li:last-of-type { | ||
| border-bottom: 0; | ||
| } | ||
| } | ||
|
|
||
| .tabSortingWrapper { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-between; | ||
| font-size: 15px; | ||
| background-color: $color-bg-gray-light; | ||
| border-bottom: 1px solid $color-border-gray; | ||
| padding: 10px 20px; | ||
| } | ||
|
|
||
| .tabs { | ||
| position: relative; | ||
| } | ||
|
|
||
| .tab { | ||
| height: 30px; | ||
| border: 0; | ||
| background: none; | ||
|
|
||
| &.selected { | ||
| font-weight: 700; | ||
| position: relative; | ||
| } | ||
| } | ||
|
|
||
| .sortButton { | ||
| margin-right: 15px; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The default for the submission tab was to show pending registrations. Is this now changed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
Submittedtab doesn't show pending registrations anymore, so I've changed it to Accepted