Skip to content

Commit 890aa33

Browse files
committed
fix import errors, onclickoutside for cv component
1 parent aed77d0 commit 890aa33

6 files changed

Lines changed: 51 additions & 162 deletions

File tree

@libs/users-front/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
"decorator-transforms": "catalog:",
6363
"ember-auto-import": "2.12.0",
6464
"ember-cli-page-object": "catalog:",
65+
"ember-click-outside": "^6.1.1",
66+
"ember-click-outside-modifier": "^4.1.2",
6567
"ember-immer-changeset": "catalog:",
6668
"ember-intl": "catalog:",
6769
"ember-simple-auth": "catalog:",

@libs/users-front/src/components/curriculums/curriculum-item.gts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class CurriculumItem extends Component<CurriculumItemSignature> {
6262
/>
6363
<span class="text-sm text-gray-500">
6464
{{t "curriculums.view.lastModified"}}
65-
{{relativeTime @curriculum.lastModified}}
65+
{{relativeTime (String @curriculum.lastModified)}}
6666
</span>
6767
</div>
6868
</template>

@libs/users-front/src/components/curriculums/curriculum-more-actions.gts

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { tracked } from '@glimmer/tracking';
55
import t from 'ember-intl/helpers/t';
66
import type RouterService from '@ember/routing/router-service';
77
import { service } from '@ember/service';
8+
import { clickOutside } from 'ember-click-outside-modifier';
89

910
import EditIcon from '#src/assets/icons/edit.gts';
1011
import RenameIcon from '#src/assets/icons/rename.gts';
@@ -24,39 +25,16 @@ class CurriculumMoreActions extends Component<CurriculumMoreActionsSignature> {
2425

2526
@tracked isOpen = false;
2627

27-
private handleClickOutside = (event: MouseEvent) => {
28-
const target = event.target as HTMLElement;
29-
const popup = document.querySelector('.curriculum-popup');
30-
31-
if (popup && !popup.contains(target)) {
32-
this.isOpen = false;
33-
}
34-
};
35-
3628
@action
37-
toggle(event: MouseEvent) {
38-
event.stopPropagation();
29+
toggle() {
3930
this.isOpen = !this.isOpen;
40-
41-
if (this.isOpen) {
42-
document.addEventListener('click', this.handleClickOutside);
43-
} else {
44-
document.removeEventListener('click', this.handleClickOutside);
45-
}
46-
}
47-
48-
willDestroy() {
49-
super.willDestroy();
50-
document.removeEventListener('click', this.handleClickOutside);
5131
}
5232

5333
@action
54-
rename(event: MouseEvent) {
34+
rename(event: MouseEvent) {
5535
event.stopPropagation();
5636

5737
this.isOpen = false;
58-
document.removeEventListener('click', this.handleClickOutside);
59-
6038
this.args.onRename?.();
6139
}
6240

@@ -75,7 +53,7 @@ class CurriculumMoreActions extends Component<CurriculumMoreActionsSignature> {
7553
<button
7654
type="button"
7755
class="cursor-pointer p-2 rounded-full w-8 h-8 flex items-center justify-center bg-white shadow-lg hover:border-blue-500 hover:bg-blue-50 hover:border transition-colors duration-200"
78-
{{on "click" this.toggle}}
56+
{{clickOutside this.close}} {{on "click" this.toggle}}
7957
>
8058
<span class="text-lg">⋮</span>
8159
</button>

@libs/users-front/src/helpers/relative-time.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default class RelativeTimeHelper extends Helper {
3535
}
3636

3737
const formatter = new Intl.RelativeTimeFormat(
38-
this.intl.locales,
38+
this.intl.primaryLocale,
3939
{ numeric: 'auto' }
4040
);
4141

0 commit comments

Comments
 (0)