Skip to content

Commit

Permalink
15951 - Special Resolution Corrections (#508)
Browse files Browse the repository at this point in the history
* Touch ups from UX.

* Special Resolution Corrections

* Update package + package.lock.

* Fixes based on feedback.

* Typo

* Update remove debugger, update interfaces.

* Add in null

* Small fixes for base filing.

* Feedback changes.

* One more spot.

* Remove comment

* Remove comment

* Unit test fix.

* Use beforeEach instead of beforeAll.
  • Loading branch information
seeker25 authored Jun 23, 2023
1 parent 828912e commit 7e18d4a
Show file tree
Hide file tree
Showing 98 changed files with 1,601 additions and 486 deletions.
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ module.exports = {
}
},
preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel',
transformIgnorePatterns: []
transformIgnorePatterns: [],
setupFiles: ['./tests/unit/setup.ts']
}
32 changes: 16 additions & 16 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"@bcrs-shared-components/court-order-poa": "2.1.3",
"@bcrs-shared-components/date-picker": "1.2.5",
"@bcrs-shared-components/detail-comment": "1.1.1",
"@bcrs-shared-components/enums": "1.0.38",
"@bcrs-shared-components/enums": "1.0.39",
"@bcrs-shared-components/fee-summary": "1.2.5",
"@bcrs-shared-components/folio-number": "1.1.1",
"@bcrs-shared-components/help-business-number": "1.1.1",
"@bcrs-shared-components/interfaces": "1.0.60",
"@bcrs-shared-components/interfaces": "1.0.63",
"@bcrs-shared-components/limited-restoration-panel": "2.0.1",
"@bcrs-shared-components/nature-of-business": "1.2.4",
"@bcrs-shared-components/relationships-panel": "1.0.14",
Expand Down
109 changes: 0 additions & 109 deletions src/components/SpecialResolution/CreateSpecialResolution.vue

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<template>
<div id="help-special-resolution">
<div
v-if="isSpecialResolutionFiling"
id="help-resolution"
class="mb-4"
>
<div class="ma-6">
<div
class="help-btn top"
Expand Down Expand Up @@ -123,8 +127,10 @@ import { ResourceIF, SpecialResolutionSampleFormIF } from '@/interfaces/'
import { useStore } from '@/store/store'
@Component({})
export default class HelpSpecialResolution extends Vue {
export default class HelpResolution extends Vue {
@Getter(useStore) isSpecialResolutionFiling!: boolean
@Getter(useStore) getResource!: ResourceIF
helpToggle = false
get getSpecialResolutionResource (): SpecialResolutionSampleFormIF {
Expand All @@ -137,7 +143,9 @@ export default class HelpSpecialResolution extends Vue {
* In session is stored the BASE_URL with business ID
* So we are taking from process.env.BASE_URL
*/
return `${sessionStorage.getItem('BASE_URL')}${this.getSpecialResolutionResource?.path}`
const baseUrl = new URL(sessionStorage.getItem('BASE_URL'))
// Strip out the /CP10230123/ from the end of the url.
return `${baseUrl.origin}${this.getSpecialResolutionResource?.path}`
}
}
</script>
Expand Down
11 changes: 9 additions & 2 deletions src/components/SpecialResolution/InstructionalText.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<template>
<article class="instructional-text section-container">
<article
v-if="isSpecialResolutionFiling"
class="instructional-text section-container"
>
You have made changes that require a
<v-tooltip
top
Expand All @@ -24,10 +27,14 @@

<script lang="ts">
import Vue from 'vue'
import { Getter } from 'pinia-class'
import { Component } from 'vue-property-decorator'
import { useStore } from '@/store/store'
@Component({})
export default class InstructionalText extends Vue { }
export default class InstructionalText extends Vue {
@Getter(useStore) isSpecialResolutionFiling: boolean
}
</script>

<style lang="scss" scoped>
Expand Down
12 changes: 9 additions & 3 deletions src/components/SpecialResolution/Memorandum.vue
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@
<div
v-if="getSpecialResolutionMemorandum && getSpecialResolutionMemorandum.key"
:key="getSpecialResolutionMemorandum.key"
class="mb-2"
>
<v-icon
color="primary"
Expand Down Expand Up @@ -243,7 +242,7 @@
<v-icon small>
mdi-pencil
</v-icon>
<span>Change</span>
<span>{{ getEditLabel }}</span>
</v-btn>
</div>
</v-col>
Expand Down Expand Up @@ -272,12 +271,14 @@ import { LegalServices } from '@/services'
export default class Memorandum extends Vue {
@Getter(useStore) getComponentValidate!: boolean
@Getter(useStore) getEditedLabel!: string
@Getter(useStore) getEditLabel!: string
@Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
@Getter(useStore) getSpecialResolutionMemorandum!: RulesMemorandumIF
@Getter(useStore) hasSpecialResolutionMemorandumChanged!: boolean
@Action(useStore) setSpecialResolutionMemorandum!: ActionBindingIF
@Action(useStore) setEditingMemorandum!: ActionBindingIF
@Action(useStore) setSpecialResolutionMemorandumValid!: ActionBindingIF
@Action(useStore) setSpecialResolutionMemorandum!: ActionBindingIF
$refs!: {
memorandumForm: FormIF
Expand Down Expand Up @@ -367,6 +368,11 @@ export default class Memorandum extends Vue {
onComponentValidate (): void {
this.validate(true)
}
@Watch('isEditing', { immediate: true })
async onIsEditingChanged (value: boolean): Promise<void> {
await this.setEditingMemorandum(value)
}
}
</script>

Expand Down
Loading

0 comments on commit 7e18d4a

Please sign in to comment.