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

AGM Location Change 4th and final PR #556

Merged
merged 9 commits into from
Oct 30, 2023
Merged

AGM Location Change 4th and final PR #556

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
527b6e0
AGM Location Change 4th and final PR
JazzarKarim Oct 25, 2023
15a1329
changed method name
JazzarKarim Oct 25, 2023
a06d3a6
changed comment
JazzarKarim Oct 25, 2023
14d9df4
fixed lint error
JazzarKarim Oct 25, 2023
77d4621
removed unnecessary line
JazzarKarim Oct 25, 2023
d5c141e
Fix in response to Sev's comment
JazzarKarim Oct 26, 2023
3ae327e
Fixed in response to Sev's comment + simplified logic
JazzarKarim Oct 26, 2023
8339703
Removed staff payment dialog
JazzarKarim Oct 30, 2023
480e5ce
update agm location variable
JazzarKarim Oct 30, 2023
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 package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-filings-ui",
"version": "6.9.3",
"version": "6.9.4",
"private": true,
"appName": "Filings UI",
"sbcName": "SBC Common Components",
Expand Down
9 changes: 8 additions & 1 deletion src/components/Dashboard/TodoList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
<v-btn
class="ma-1 affiliation-invitation-action-button"
color="primary"
@click.native.stop="authorizeAffiliationInvitation(true, item)"

Check warning on line 244 in src/components/Dashboard/TodoList.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1) 

'.native' modifier on 'v-on' directive is deprecated
>
<span>Authorize</span>
</v-btn>
Expand All @@ -249,7 +249,7 @@
class="ma-1 affiliation-invitation-action-button"
outlined
color="primary"
@click.native.stop="authorizeAffiliationInvitation(false, item)"

Check warning on line 252 in src/components/Dashboard/TodoList.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1) 

'.native' modifier on 'v-on' directive is deprecated
>
<span>Do not authorize</span>
</v-btn>
Expand Down Expand Up @@ -315,7 +315,7 @@
class="btn-draft-resume"
color="primary"
:disabled="!item.enabled"
@click.native.stop="doResumeFiling(item)"

Check warning on line 318 in src/components/Dashboard/TodoList.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1) 

'.native' modifier on 'v-on' directive is deprecated
>
<template v-if="isTypeIncorporationApplication(item) && item.isEmptyFiling">
<span v-if="getNameRequest">Incorporate using this NR</span>
Expand Down Expand Up @@ -397,22 +397,23 @@
class="btn-change-payment-type"
color="primary"
:disabled="!item.enabled"
@click.native.stop="doResumePayment(item)"

Check warning on line 400 in src/components/Dashboard/TodoList.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1) 

'.native' modifier on 'v-on' directive is deprecated
>
<span>Change Payment Type</span>
</v-btn>
<v-btn
v-else
class="btn-resume-payment"
:class="{ 'btn-resume-payment': !isCancellableTodoItem(item) }"
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
color="primary"
:disabled="!item.enabled"
@click.native.stop="doResumePayment(item)"

Check warning on line 409 in src/components/Dashboard/TodoList.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1) 

'.native' modifier on 'v-on' directive is deprecated
>
<span>Resume Payment</span>
</v-btn>

<!-- dropdown menu -->
<v-menu
v-if="!isCancellableTodoItem(item)"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I created dummy data for two todo tasks (annual report and AGM location change) with both the payment being pending.
different types of payment pending

As you can see, only the AGM location will not have the cancel payment option since it does not have a salvageable draft. I also went for a general name here since we might have more of those in the future. We can just plug in the extra types in the function below (we're going to probably add it for Extensions 😁 ).

Copy link
Collaborator

Choose a reason for hiding this comment

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

Two thumbs up! 👍 👍

offset-y
left
>
Expand All @@ -423,7 +424,7 @@
color="primary"
:disabled="!item.enabled"
v-on="on"
@click.native.stop

Check warning on line 427 in src/components/Dashboard/TodoList.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1) 

'.native' modifier on 'v-on' directive is deprecated
>
<v-icon>mdi-menu-down</v-icon>
</v-btn>
Expand All @@ -445,7 +446,7 @@
class="btn-retry-payment"
color="primary"
:disabled="!item.enabled"
@click.native.stop="doResumePayment(item)"

Check warning on line 449 in src/components/Dashboard/TodoList.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1) 

'.native' modifier on 'v-on' directive is deprecated
>
<span>Retry Payment</span>
</v-btn>
Expand Down Expand Up @@ -671,6 +672,7 @@
// for template
readonly EnumUtilities = EnumUtilities
readonly FilingStatus = FilingStatus
readonly FilingTypes = FilingTypes

/** Whether a COA is pending. */
get isCoaPending (): boolean {
Expand Down Expand Up @@ -823,6 +825,11 @@
})
}

/** Check if todo item is cancellable (has a draft). */
isCancellableTodoItem(item: TodoItemIF): boolean {

Check failure on line 829 in src/components/Dashboard/TodoList.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1) 

Missing space before function parentheses
return (item.name === FilingTypes.AGM_LOCATION_CHANGE)
}

/** Loads a todo item into the Todo Items array. */
loadTodoItem (task: ApiTaskIF): void {
const todo = task.task.todo // already checked for not falsey in loadData()
Expand Down
5 changes: 3 additions & 2 deletions src/interfaces/api-filing-interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CorpTypeCd, EffectOfOrderTypes, FilingStatus, FilingSubTypes, FilingTypes } from '@/enums'
import { AddressIF, ApiDateTimeUtc, CommentIF, DocumentIF, FormattedDateTimeGmt, IsoDatePacific, SpecialResolutionIF }
import { ApiDateTimeUtc, CommentIF, DocumentIF, FormattedDateTimeGmt, IsoDatePacific, SpecialResolutionIF }
from '@/interfaces'

/**
Expand Down Expand Up @@ -43,7 +43,8 @@ export interface ApiFilingIF {

agmLocationChange?: {
year: string,
newAgmLocation: AddressIF
reason: string,
agmLocation: string
}

// alteration filings only
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/EntityMenu.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,6 @@ describe('Entity Menu - Consent to Continuation click tests', () => {
})

describe('Entity Menu - Request AGM Extension click tests', () => {
let vm: any

beforeAll(() => {
// override feature flag
vi.spyOn(utils, 'GetFeatureFlag').mockImplementation(flag => {
Expand Down
Loading