@aerogel/core 0.0.0-next.d824b40e5d06757cd9f47c9f771d916185df4f05 → 0.0.0-next.eed7a057cf5b844cd9f7fc6bda2d8df49fcd6736

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (137) hide show
  1. package/dist/aerogel-core.d.ts +3212 -485
  2. package/dist/aerogel-core.js +2789 -0
  3. package/dist/aerogel-core.js.map +1 -0
  4. package/package.json +25 -31
  5. package/src/bootstrap/bootstrap.test.ts +7 -10
  6. package/src/bootstrap/index.ts +43 -15
  7. package/src/bootstrap/options.ts +4 -1
  8. package/src/components/AGAppLayout.vue +7 -2
  9. package/src/components/AGAppModals.vue +1 -1
  10. package/src/components/AGAppOverlays.vue +6 -2
  11. package/src/components/AGAppSnackbars.vue +2 -2
  12. package/src/components/composition.ts +23 -0
  13. package/src/components/forms/AGButton.vue +2 -2
  14. package/src/components/forms/AGCheckbox.vue +10 -3
  15. package/src/components/forms/AGForm.vue +11 -12
  16. package/src/components/forms/AGInput.vue +13 -7
  17. package/src/components/forms/AGSelect.story.vue +46 -0
  18. package/src/components/forms/AGSelect.vue +60 -0
  19. package/src/components/forms/index.ts +5 -6
  20. package/src/components/headless/forms/AGHeadlessButton.ts +3 -0
  21. package/src/components/headless/forms/AGHeadlessButton.vue +24 -13
  22. package/src/components/headless/forms/AGHeadlessInput.ts +37 -4
  23. package/src/components/headless/forms/AGHeadlessInput.vue +24 -8
  24. package/src/components/headless/forms/AGHeadlessInputDescription.vue +28 -0
  25. package/src/components/headless/forms/AGHeadlessInputError.vue +2 -2
  26. package/src/components/headless/forms/AGHeadlessInputInput.vue +45 -6
  27. package/src/components/headless/forms/AGHeadlessInputLabel.vue +9 -3
  28. package/src/components/headless/forms/AGHeadlessInputTextArea.vue +43 -0
  29. package/src/components/headless/forms/AGHeadlessSelect.ts +42 -0
  30. package/src/components/headless/forms/AGHeadlessSelect.vue +77 -0
  31. package/src/components/headless/forms/AGHeadlessSelectButton.vue +24 -0
  32. package/src/components/headless/forms/AGHeadlessSelectError.vue +26 -0
  33. package/src/components/headless/forms/AGHeadlessSelectLabel.vue +24 -0
  34. package/src/components/headless/forms/AGHeadlessSelectOption.ts +4 -0
  35. package/src/components/headless/forms/AGHeadlessSelectOption.vue +39 -0
  36. package/src/components/headless/forms/AGHeadlessSelectOptions.ts +3 -0
  37. package/src/components/headless/forms/composition.ts +10 -0
  38. package/src/components/headless/forms/index.ts +13 -1
  39. package/src/components/headless/modals/AGHeadlessModal.ts +30 -1
  40. package/src/components/headless/modals/AGHeadlessModal.vue +16 -12
  41. package/src/components/headless/modals/AGHeadlessModalPanel.vue +13 -9
  42. package/src/components/headless/modals/AGHeadlessModalTitle.vue +14 -4
  43. package/src/components/headless/modals/index.ts +4 -6
  44. package/src/components/headless/snackbars/index.ts +25 -10
  45. package/src/components/index.ts +3 -1
  46. package/src/components/interfaces.ts +24 -0
  47. package/src/components/lib/AGErrorMessage.vue +16 -0
  48. package/src/components/lib/AGMarkdown.vue +54 -0
  49. package/src/components/lib/AGMeasured.vue +16 -0
  50. package/src/components/lib/AGProgressBar.vue +55 -0
  51. package/src/components/lib/AGStartupCrash.vue +31 -0
  52. package/src/components/lib/index.ts +6 -0
  53. package/src/components/modals/AGAlertModal.ts +18 -0
  54. package/src/components/modals/AGAlertModal.vue +4 -15
  55. package/src/components/modals/AGConfirmModal.ts +42 -0
  56. package/src/components/modals/AGConfirmModal.vue +10 -14
  57. package/src/components/modals/AGErrorReportModal.ts +32 -3
  58. package/src/components/modals/AGErrorReportModal.vue +8 -16
  59. package/src/components/modals/AGErrorReportModalButtons.vue +13 -11
  60. package/src/components/modals/AGErrorReportModalTitle.vue +3 -3
  61. package/src/components/modals/AGLoadingModal.ts +29 -0
  62. package/src/components/modals/AGLoadingModal.vue +4 -8
  63. package/src/components/modals/AGModal.ts +2 -1
  64. package/src/components/modals/AGModal.vue +18 -13
  65. package/src/components/modals/AGModalContext.ts +1 -1
  66. package/src/components/modals/AGModalContext.vue +15 -5
  67. package/src/components/modals/AGPromptModal.ts +41 -0
  68. package/src/components/modals/AGPromptModal.vue +34 -0
  69. package/src/components/modals/index.ts +13 -19
  70. package/src/components/snackbars/AGSnackbar.vue +4 -10
  71. package/src/components/utils.ts +13 -0
  72. package/src/directives/index.ts +7 -5
  73. package/src/directives/measure.ts +40 -0
  74. package/src/errors/Errors.state.ts +1 -1
  75. package/src/errors/Errors.ts +32 -30
  76. package/src/errors/JobCancelledError.ts +3 -0
  77. package/src/errors/index.ts +19 -29
  78. package/src/errors/utils.ts +35 -0
  79. package/src/forms/Form.test.ts +32 -3
  80. package/src/forms/Form.ts +90 -21
  81. package/src/forms/composition.ts +2 -2
  82. package/src/forms/index.ts +3 -1
  83. package/src/forms/utils.ts +34 -3
  84. package/src/forms/validation.ts +19 -0
  85. package/src/{main.ts → index.ts} +3 -0
  86. package/src/jobs/Job.ts +147 -0
  87. package/src/jobs/index.ts +10 -0
  88. package/src/jobs/listeners.ts +3 -0
  89. package/src/jobs/status.ts +4 -0
  90. package/src/lang/DefaultLangProvider.ts +46 -0
  91. package/src/lang/Lang.state.ts +11 -0
  92. package/src/lang/Lang.ts +44 -29
  93. package/src/lang/index.ts +7 -5
  94. package/src/plugins/Plugin.ts +1 -1
  95. package/src/plugins/index.ts +10 -7
  96. package/src/services/App.state.ts +29 -7
  97. package/src/services/App.ts +41 -6
  98. package/src/services/Cache.ts +43 -0
  99. package/src/services/Events.test.ts +39 -0
  100. package/src/services/Events.ts +112 -32
  101. package/src/services/Service.ts +154 -49
  102. package/src/services/Storage.ts +20 -0
  103. package/src/services/index.ts +14 -5
  104. package/src/services/store.ts +8 -5
  105. package/src/services/utils.ts +18 -0
  106. package/src/testing/index.ts +26 -0
  107. package/src/testing/setup.ts +11 -0
  108. package/src/ui/UI.state.ts +9 -2
  109. package/src/ui/UI.ts +251 -41
  110. package/src/ui/index.ts +13 -7
  111. package/src/ui/utils.ts +16 -0
  112. package/src/utils/composition/events.ts +3 -2
  113. package/src/utils/composition/persistent.test.ts +33 -0
  114. package/src/utils/composition/persistent.ts +11 -0
  115. package/src/utils/composition/state.test.ts +47 -0
  116. package/src/utils/composition/state.ts +24 -0
  117. package/src/utils/index.ts +3 -0
  118. package/src/utils/markdown.test.ts +50 -0
  119. package/src/utils/markdown.ts +19 -6
  120. package/src/utils/tailwindcss.test.ts +26 -0
  121. package/src/utils/tailwindcss.ts +7 -0
  122. package/src/utils/vue.ts +30 -9
  123. package/.eslintrc.js +0 -3
  124. package/dist/aerogel-core.cjs.js +0 -2
  125. package/dist/aerogel-core.cjs.js.map +0 -1
  126. package/dist/aerogel-core.esm.js +0 -2
  127. package/dist/aerogel-core.esm.js.map +0 -1
  128. package/dist/virtual.d.ts +0 -11
  129. package/noeldemartin.config.js +0 -5
  130. package/src/components/basic/AGErrorMessage.vue +0 -16
  131. package/src/components/basic/AGMarkdown.vue +0 -36
  132. package/src/components/basic/index.ts +0 -5
  133. package/src/directives/initial-focus.ts +0 -11
  134. package/src/types/virtual.d.ts +0 -11
  135. package/tsconfig.json +0 -11
  136. package/vite.config.ts +0 -14
  137. /package/src/components/{basic → lib}/AGLink.vue +0 -0
@@ -1,28 +1,32 @@
1
1
  <template>
2
- <DialogPanel>
2
+ <component :is="rootComponent">
3
3
  <slot />
4
4
 
5
5
  <template v-if="childModal">
6
- <div class="pointer-events-none fixed inset-0 z-50 bg-black/30" />
7
- <AGModalContext :child-index="modal.childIndex + 1" :modal="childModal" />
6
+ <div
7
+ class="pointer-events-none inset-0 z-50 bg-black/30"
8
+ :class="childModal.properties.inline ? 'absolute' : 'fixed'"
9
+ />
10
+ <AGModalContext :child-index="childIndex + 1" :modal="childModal" />
8
11
  </template>
9
- </DialogPanel>
12
+ </component>
10
13
  </template>
11
14
 
12
15
  <script setup lang="ts">
13
16
  import { computed } from 'vue';
14
17
  import { DialogPanel } from '@headlessui/vue';
15
18
 
16
- import UI from '@/ui/UI';
17
- import { injectReactiveOrFail } from '@/utils/vue';
18
- import type { IAGModalContext } from '@/components/modals/AGModalContext';
19
+ import UI from '@aerogel/core/ui/UI';
20
+ import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
21
+ import type { IAGModalContext } from '@aerogel/core/components/modals/AGModalContext';
19
22
 
20
23
  import AGModalContext from '../../modals/AGModalContext.vue';
21
24
 
22
- const modal = injectReactiveOrFail<IAGModalContext>(
25
+ const { modal, childIndex } = injectReactiveOrFail<IAGModalContext>(
23
26
  'modal',
24
27
  'could not obtain modal reference from <AGHeadlessModalPanel>, ' +
25
28
  'did you render this component manually? Show it using $ui.openModal() instead',
26
29
  );
27
- const childModal = computed(() => UI.modals[modal.childIndex] ?? null);
30
+ const rootComponent = computed(() => (modal.properties.inline ? 'div' : DialogPanel));
31
+ const childModal = computed(() => UI.modals[childIndex] ?? null);
28
32
  </script>
@@ -1,13 +1,23 @@
1
1
  <template>
2
- <DialogTitle :as="as">
2
+ <component :is="rootComponent" v-bind="rootProps">
3
3
  <slot />
4
- </DialogTitle>
4
+ </component>
5
5
  </template>
6
6
 
7
7
  <script setup lang="ts">
8
+ import { computed } from 'vue';
8
9
  import { DialogTitle } from '@headlessui/vue';
9
10
 
10
- import { stringProp } from '@/utils/vue';
11
+ import { injectReactiveOrFail, stringProp } from '@aerogel/core/utils/vue';
12
+ import type { IAGModalContext } from '@aerogel/core/components/modals/AGModalContext';
11
13
 
12
- defineProps({ as: stringProp('h2') });
14
+ const props = defineProps({ as: stringProp('h2') });
15
+
16
+ const { modal } = injectReactiveOrFail<IAGModalContext>(
17
+ 'modal',
18
+ 'could not obtain modal reference from <AGHeadlessModalPanel>, ' +
19
+ 'did you render this component manually? Show it using $ui.openModal() instead',
20
+ );
21
+ const rootComponent = computed(() => (modal.properties.inline ? 'div' : DialogTitle));
22
+ const rootProps = computed(() => (modal.properties.inline ? {} : { as: props.as }));
13
23
  </script>
@@ -1,6 +1,4 @@
1
- import AGHeadlessModal from './AGHeadlessModal.vue';
2
- import AGHeadlessModalPanel from './AGHeadlessModalPanel.vue';
3
- import AGHeadlessModalTitle from './AGHeadlessModalTitle.vue';
4
- import type { IAGHeadlessModal } from './AGHeadlessModal';
5
-
6
- export { AGHeadlessModal, AGHeadlessModalPanel, AGHeadlessModalTitle, IAGHeadlessModal };
1
+ export * from './AGHeadlessModal';
2
+ export { default as AGHeadlessModal } from './AGHeadlessModal.vue';
3
+ export { default as AGHeadlessModalPanel } from './AGHeadlessModalPanel.vue';
4
+ export { default as AGHeadlessModalTitle } from './AGHeadlessModalTitle.vue';
@@ -1,17 +1,13 @@
1
- import { arrayProp, enumProp, requiredStringProp } from '@/utils/vue';
2
- import { Colors } from '@/components/constants';
1
+ import type { ExtractPropTypes } from 'vue';
2
+ import type { ObjectWithoutEmpty } from '@noeldemartin/utils';
3
+
4
+ import UI from '@aerogel/core/ui/UI';
5
+ import { arrayProp, enumProp, requiredStringProp } from '@aerogel/core/utils/vue';
6
+ import { Colors } from '@aerogel/core/components/constants';
3
7
  import { objectWithout } from '@noeldemartin/utils';
4
8
 
5
9
  export { default as AGHeadlessSnackbar } from './AGHeadlessSnackbar.vue';
6
10
 
7
- export interface SnackbarAction {
8
- text: string;
9
- dismiss?: boolean;
10
- handler?(): unknown;
11
- }
12
-
13
- export type SnackbarColor = (typeof SnackbarColors)[keyof typeof SnackbarColors];
14
-
15
11
  export const SnackbarColors = objectWithout(Colors, ['Primary', 'Clear']);
16
12
  export const snackbarProps = {
17
13
  id: requiredStringProp(),
@@ -20,6 +16,25 @@ export const snackbarProps = {
20
16
  color: enumProp(SnackbarColors, Colors.Secondary),
21
17
  };
22
18
 
19
+ export interface SnackbarAction {
20
+ text: string;
21
+ dismiss?: boolean;
22
+ handler?(): unknown;
23
+ }
24
+
25
+ export type SnackbarColor = (typeof SnackbarColors)[keyof typeof SnackbarColors];
26
+ export type AGSnackbarProps = ObjectWithoutEmpty<ExtractPropTypes<typeof snackbarProps>>;
27
+
23
28
  export function useSnackbarProps(): typeof snackbarProps {
24
29
  return snackbarProps;
25
30
  }
31
+
32
+ // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
33
+ export function useSnackbar(props: ExtractPropTypes<typeof snackbarProps>) {
34
+ function activate(action: SnackbarAction): void {
35
+ action.handler?.();
36
+ action.dismiss && UI.hideSnackbar(props.id);
37
+ }
38
+
39
+ return { activate };
40
+ }
@@ -3,9 +3,11 @@ import AGAppOverlays from './AGAppOverlays.vue';
3
3
 
4
4
  export { AGAppLayout, AGAppOverlays };
5
5
 
6
- export * from './basic';
6
+ export * from './composition';
7
7
  export * from './constants';
8
8
  export * from './forms';
9
9
  export * from './headless';
10
+ export * from './interfaces';
11
+ export * from './lib';
10
12
  export * from './modals';
11
13
  export * from './snackbars';
@@ -0,0 +1,24 @@
1
+ import { isObject } from '@noeldemartin/utils';
2
+ import type { Ref, UnwrapNestedRefs } from 'vue';
3
+
4
+ export function getElement(value: unknown): HTMLElement | undefined {
5
+ if (value instanceof HTMLElement) {
6
+ return value;
7
+ }
8
+
9
+ if (hasElement(value)) {
10
+ return value.$el;
11
+ }
12
+ }
13
+
14
+ export function hasElement(value: unknown): value is UnwrapNestedRefs<HasElement> {
15
+ return isObject(value) && '$el' in value;
16
+ }
17
+
18
+ export interface __SetsElement {
19
+ __setElement(element?: HTMLElement): void;
20
+ }
21
+
22
+ export interface HasElement {
23
+ $el: Readonly<Ref<HTMLElement | undefined>>;
24
+ }
@@ -0,0 +1,16 @@
1
+ <template>
2
+ <AGMarkdown :text="message" inline />
3
+ </template>
4
+
5
+ <script setup lang="ts">
6
+ import { computed } from 'vue';
7
+
8
+ import { requiredObjectProp } from '@aerogel/core/utils/vue';
9
+ import { getErrorMessage } from '@aerogel/core/errors/utils';
10
+ import type { ErrorSource } from '@aerogel/core/errors/Errors.state';
11
+
12
+ import AGMarkdown from './AGMarkdown.vue';
13
+
14
+ const props = defineProps({ error: requiredObjectProp<ErrorSource>() });
15
+ const message = computed(() => getErrorMessage(props.error));
16
+ </script>
@@ -0,0 +1,54 @@
1
+ <template>
2
+ <root />
3
+ </template>
4
+
5
+ <script setup lang="ts">
6
+ import { computed, h, useAttrs } from 'vue';
7
+ import { isInstanceOf } from '@noeldemartin/utils';
8
+
9
+ import { renderMarkdown } from '@aerogel/core/utils/markdown';
10
+ import { booleanProp, mixedProp, objectProp, stringProp } from '@aerogel/core/utils/vue';
11
+ import { translate } from '@aerogel/core/lang';
12
+
13
+ const props = defineProps({
14
+ as: stringProp(),
15
+ inline: booleanProp(),
16
+ langKey: stringProp(),
17
+ langParams: mixedProp<number | Record<string, unknown>>(),
18
+ text: stringProp(),
19
+ actions: objectProp<Record<string, () => unknown>>(),
20
+ });
21
+
22
+ const attrs = useAttrs();
23
+ const markdown = computed(() => props.text ?? (props.langKey && translate(props.langKey, props.langParams ?? {})));
24
+ const html = computed(() => {
25
+ if (!markdown.value) {
26
+ return null;
27
+ }
28
+
29
+ let renderedHtml = renderMarkdown(markdown.value);
30
+
31
+ if (props.inline) {
32
+ renderedHtml = renderedHtml.replace('<p>', '<span>').replace('</p>', '</span>');
33
+ }
34
+
35
+ return renderedHtml;
36
+ });
37
+ const root = () =>
38
+ h(props.as ?? (props.inline ? 'span' : 'div'), {
39
+ innerHTML: html.value,
40
+ onClick,
41
+ ...attrs,
42
+ class: `${attrs.class ?? ''} ${props.inline ? '' : 'prose'}`,
43
+ });
44
+
45
+ async function onClick(event: Event) {
46
+ const { target } = event;
47
+
48
+ if (isInstanceOf(target, HTMLElement) && target.dataset.markdownAction) {
49
+ props.actions?.[target.dataset.markdownAction]?.();
50
+
51
+ return;
52
+ }
53
+ }
54
+ </script>
@@ -0,0 +1,16 @@
1
+ <template>
2
+ <component :is="as" v-measure="() => (measured = true)" :class="{ '!invisible !absolute !w-auto': !measured }">
3
+ <slot />
4
+ </component>
5
+ </template>
6
+
7
+ <script setup lang="ts">
8
+ import { ref } from 'vue';
9
+
10
+ import { stringProp } from '@aerogel/core/utils/vue';
11
+
12
+ defineProps({ as: stringProp('span') });
13
+
14
+ // TODO use v-measure.css
15
+ const measured = ref(false);
16
+ </script>
@@ -0,0 +1,55 @@
1
+ <template>
2
+ <div class="mt-1 h-2 w-full overflow-hidden rounded-full bg-gray-200">
3
+ <div :class="barClasses" :style="`transform:translateX(-${(1 - renderedProgress) * 100}%)`" />
4
+ <span class="sr-only">
5
+ {{
6
+ $td('ui.progress', '{progress}% complete', {
7
+ progress: renderedProgress * 100,
8
+ })
9
+ }}
10
+ </span>
11
+ </div>
12
+ </template>
13
+
14
+ <script setup lang="ts">
15
+ import { computed, onUnmounted, ref, watch } from 'vue';
16
+
17
+ import { numberProp, objectProp, stringProp } from '@aerogel/core/utils/vue';
18
+ import type { Job } from '@aerogel/core/jobs';
19
+
20
+ const props = defineProps({
21
+ progress: numberProp(),
22
+ barClass: stringProp(''),
23
+ job: objectProp<Job>(),
24
+ });
25
+
26
+ let cleanup: Function | undefined;
27
+ const jobProgress = ref(0);
28
+ const barClasses = computed(() => {
29
+ const classes = props.barClass ?? '';
30
+
31
+ return `h-full w-full transition-transform duration-500 ease-linear ${
32
+ classes.includes('bg-') ? classes : `${classes} bg-gray-700`
33
+ }`;
34
+ });
35
+ const renderedProgress = computed(() => {
36
+ if (typeof props.progress === 'number') {
37
+ return props.progress;
38
+ }
39
+
40
+ return jobProgress.value;
41
+ });
42
+
43
+ watch(
44
+ () => props.job,
45
+ () => {
46
+ cleanup?.();
47
+
48
+ jobProgress.value = props.job?.progress ?? 0;
49
+ cleanup = props.job?.listeners.add({ onUpdated: (progress) => (jobProgress.value = progress) });
50
+ },
51
+ { immediate: true },
52
+ );
53
+
54
+ onUnmounted(() => cleanup?.());
55
+ </script>
@@ -0,0 +1,31 @@
1
+ <template>
2
+ <div class="grid flex-grow place-items-center">
3
+ <div class="flex flex-col items-center space-y-6 p-8">
4
+ <h1 class="mt-2 text-center text-4xl font-medium text-red-600">
5
+ {{ $td('startupCrash.title', 'Something went wrong!') }}
6
+ </h1>
7
+ <AGMarkdown
8
+ :text="
9
+ $td(
10
+ 'startupCrash.message',
11
+ 'Something failed trying to start the application.\n\nHere\'s some things you can do:'
12
+ )
13
+ "
14
+ class="mt-4 text-center"
15
+ />
16
+ <div class="mt-4 flex flex-col space-y-4">
17
+ <AGButton color="danger" @click="$app.reload()">
18
+ {{ $td('startupCrash.reload', 'Try again') }}
19
+ </AGButton>
20
+ <AGButton color="danger" @click="$errors.inspect($errors.startupErrors)">
21
+ {{ $td('startupCrash.inspect', 'View error details') }}
22
+ </AGButton>
23
+ </div>
24
+ </div>
25
+ </div>
26
+ </template>
27
+
28
+ <script setup lang="ts">
29
+ import AGMarkdown from './AGMarkdown.vue';
30
+ import AGButton from '../forms/AGButton.vue';
31
+ </script>
@@ -0,0 +1,6 @@
1
+ export { default as AGErrorMessage } from './AGErrorMessage.vue';
2
+ export { default as AGLink } from './AGLink.vue';
3
+ export { default as AGMarkdown } from './AGMarkdown.vue';
4
+ export { default as AGMeasured } from './AGMeasured.vue';
5
+ export { default as AGProgressBar } from './AGProgressBar.vue';
6
+ export { default as AGStartupCrash } from './AGStartupCrash.vue';
@@ -0,0 +1,18 @@
1
+ import type { ExtractPropTypes } from 'vue';
2
+ import type { ObjectWithout, Pretty } from '@noeldemartin/utils';
3
+
4
+ import { requiredStringProp, stringProp } from '@aerogel/core/utils';
5
+ import type { AcceptRefs } from '@aerogel/core/utils';
6
+
7
+ export const alertModalProps = {
8
+ title: stringProp(),
9
+ message: requiredStringProp(),
10
+ };
11
+
12
+ export type AGAlertModalProps = Pretty<
13
+ AcceptRefs<ObjectWithout<ExtractPropTypes<typeof alertModalProps>, null | undefined>>
14
+ >;
15
+
16
+ export function useAlertModalProps(): typeof alertModalProps {
17
+ return alertModalProps;
18
+ }
@@ -1,25 +1,14 @@
1
1
  <template>
2
- <AGModal>
3
- <AGMarkdown
4
- v-if="title"
5
- :text="title"
6
- as="h2"
7
- class="font-semibold"
8
- inline
9
- />
2
+ <AGModal :title="title">
10
3
  <AGMarkdown :text="message" />
11
4
  </AGModal>
12
5
  </template>
13
6
 
14
7
  <script setup lang="ts">
15
- import { requiredStringProp, stringProp } from '@/utils/vue';
16
-
17
8
  import AGModal from './AGModal.vue';
9
+ import { useAlertModalProps } from './AGAlertModal';
18
10
 
19
- import AGMarkdown from '../basic/AGMarkdown.vue';
11
+ import AGMarkdown from '../lib/AGMarkdown.vue';
20
12
 
21
- defineProps({
22
- title: stringProp(),
23
- message: requiredStringProp(),
24
- });
13
+ defineProps(useAlertModalProps());
25
14
  </script>
@@ -0,0 +1,42 @@
1
+ import { computed } from 'vue';
2
+ import type { ExtractPropTypes } from 'vue';
3
+ import type { ObjectWithout, Pretty, SubPartial } from '@noeldemartin/utils';
4
+
5
+ import { Colors } from '@aerogel/core/components/constants';
6
+ import { booleanProp, enumProp, objectProp, requiredStringProp, stringProp } from '@aerogel/core/utils';
7
+ import { translateWithDefault } from '@aerogel/core/lang';
8
+ import type { AcceptRefs } from '@aerogel/core/utils';
9
+ import type { ConfirmCheckboxes } from '@aerogel/core/ui';
10
+
11
+ export const confirmModalProps = {
12
+ title: stringProp(),
13
+ message: requiredStringProp(),
14
+ acceptText: stringProp(),
15
+ acceptColor: enumProp(Colors, Colors.Primary),
16
+ cancelText: stringProp(),
17
+ cancelColor: enumProp(Colors, Colors.Clear),
18
+ checkboxes: objectProp<ConfirmCheckboxes>(),
19
+ actions: objectProp<Record<string, () => unknown>>(),
20
+ required: booleanProp(false),
21
+ };
22
+
23
+ export type AGConfirmModalProps = Pretty<
24
+ AcceptRefs<
25
+ SubPartial<
26
+ ObjectWithout<ExtractPropTypes<typeof confirmModalProps>, null | undefined>,
27
+ 'acceptColor' | 'cancelColor'
28
+ >
29
+ >
30
+ >;
31
+
32
+ export function useConfirmModalProps(): typeof confirmModalProps {
33
+ return confirmModalProps;
34
+ }
35
+
36
+ // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
37
+ export function useConfirmModal(props: ExtractPropTypes<typeof confirmModalProps>) {
38
+ const renderedAcceptText = computed(() => props.acceptText ?? translateWithDefault('ui.accept', 'Ok'));
39
+ const renderedCancelText = computed(() => props.cancelText ?? translateWithDefault('ui.cancel', 'Cancel'));
40
+
41
+ return { renderedAcceptText, renderedCancelText };
42
+ }
@@ -1,30 +1,26 @@
1
1
  <template>
2
- <AGModal v-slot="{ close }: IAGModalDefaultSlotProps" :cancellable="false">
3
- <AGMarkdown v-if="title" :text="title" as="h1" />
4
- <AGMarkdown :text="message" />
2
+ <AGModal v-slot="{ close }: IAGModalDefaultSlotProps" :cancellable="false" :title="title">
3
+ <AGMarkdown :text="message" :actions="actions" />
5
4
 
6
5
  <div class="mt-2 flex flex-row-reverse gap-2">
7
- <AGButton @click="close(true)">
8
- {{ $td('ui.ok', 'OK') }}
6
+ <AGButton :color="acceptColor" @click="close(true)">
7
+ {{ renderedAcceptText }}
9
8
  </AGButton>
10
- <AGButton color="secondary" @click="close()">
11
- {{ $td('ui.cancel', 'Cancel') }}
9
+ <AGButton v-if="!required" :color="cancelColor" @click="close()">
10
+ {{ renderedCancelText }}
12
11
  </AGButton>
13
12
  </div>
14
13
  </AGModal>
15
14
  </template>
16
15
 
17
16
  <script setup lang="ts">
18
- import { requiredStringProp, stringProp } from '@/utils/vue';
19
-
20
17
  import AGModal from './AGModal.vue';
18
+ import { useConfirmModal, useConfirmModalProps } from './AGConfirmModal';
21
19
  import type { IAGModalDefaultSlotProps } from './AGModal';
22
20
 
23
21
  import AGButton from '../forms/AGButton.vue';
24
- import AGMarkdown from '../basic/AGMarkdown.vue';
22
+ import AGMarkdown from '../lib/AGMarkdown.vue';
25
23
 
26
- defineProps({
27
- title: stringProp(),
28
- message: requiredStringProp(),
29
- });
24
+ const props = defineProps(useConfirmModalProps());
25
+ const { renderedAcceptText, renderedCancelText } = useConfirmModal(props);
30
26
  </script>
@@ -1,7 +1,11 @@
1
- import type { Component } from 'vue';
1
+ import { computed, ref } from 'vue';
2
+ import type { Component, ExtractPropTypes } from 'vue';
3
+ import type { ObjectWithout, Pretty } from '@noeldemartin/utils';
2
4
 
3
- import { requiredArrayProp } from '@/utils/vue';
4
- import type { ErrorReport } from '@/errors';
5
+ import { requiredArrayProp } from '@aerogel/core/utils/vue';
6
+ import { translateWithDefault } from '@aerogel/core/lang';
7
+ import type { AcceptRefs } from '@aerogel/core/utils/vue';
8
+ import type { ErrorReport } from '@aerogel/core/errors';
5
9
 
6
10
  export interface IAGErrorReportModalButtonsDefaultSlotProps {
7
11
  id: string;
@@ -15,6 +19,31 @@ export const errorReportModalProps = {
15
19
  reports: requiredArrayProp<ErrorReport>(),
16
20
  };
17
21
 
22
+ export type AGErrorReportModalProps = Pretty<
23
+ AcceptRefs<ObjectWithout<ExtractPropTypes<typeof errorReportModalProps>, null | undefined>>
24
+ >;
25
+
18
26
  export function useErrorReportModalProps(): typeof errorReportModalProps {
19
27
  return errorReportModalProps;
20
28
  }
29
+
30
+ // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
31
+ export function useErrorReportModal(props: ExtractPropTypes<typeof errorReportModalProps>) {
32
+ const activeReportIndex = ref(0);
33
+ const report = computed(() => props.reports[activeReportIndex.value] as ErrorReport);
34
+ const details = computed(
35
+ () =>
36
+ report.value.details?.trim() ||
37
+ translateWithDefault('errors.detailsEmpty', 'This error is missing a stacktrace.'),
38
+ );
39
+ const previousReportText = translateWithDefault('errors.previousReport', 'Show previous report');
40
+ const nextReportText = translateWithDefault('errors.nextReport', 'Show next report');
41
+
42
+ return {
43
+ activeReportIndex,
44
+ details,
45
+ nextReportText,
46
+ previousReportText,
47
+ report,
48
+ };
49
+ }
@@ -12,8 +12,8 @@
12
12
  <AGButton
13
13
  color="clear"
14
14
  :disabled="activeReportIndex === 0"
15
- :title="$td('errors.previousReport', 'Show previous report')"
16
- :aria-label="$td('errors.previousReport', 'Show previous report')"
15
+ :title="previousReportText"
16
+ :aria-label="previousReportText"
17
17
  @click="activeReportIndex--"
18
18
  >
19
19
  <IconCheveronLeft aria-hidden="true" class="h-4 w-4" />
@@ -21,8 +21,8 @@
21
21
  <AGButton
22
22
  color="clear"
23
23
  :disabled="activeReportIndex === reports.length - 1"
24
- :title="$td('errors.nextReport', 'Show next report')"
25
- :aria-label="$td('errors.nextReport', 'Show next report')"
24
+ :title="nextReportText"
25
+ :aria-label="nextReportText"
26
26
  @click="activeReportIndex++"
27
27
  >
28
28
  <IconCheveronRight aria-hidden="true" class="h-4 w-4" />
@@ -33,10 +33,7 @@
33
33
  </h2>
34
34
  <AGMarkdown v-if="report.description" :text="report.description" class="mt-2" />
35
35
  </div>
36
- <pre
37
- class="h-full overflow-auto bg-gray-200 p-4 text-xs text-red-900"
38
- v-text="report.details ?? $td('errors.detailsEmpty', 'This error is missing a stacktrace.')"
39
- />
36
+ <pre class="h-full overflow-auto bg-gray-200 p-4 text-xs text-red-900" v-text="details" />
40
37
  </AGModal>
41
38
  </template>
42
39
 
@@ -44,19 +41,14 @@
44
41
  import IconCheveronRight from '~icons/zondicons/cheveron-right';
45
42
  import IconCheveronLeft from '~icons/zondicons/cheveron-left';
46
43
 
47
- import { computed, ref } from 'vue';
48
-
49
- import type { ErrorReport } from '@/errors';
50
-
51
- import { useErrorReportModalProps } from './AGErrorReportModal';
44
+ import { useErrorReportModal, useErrorReportModalProps } from './AGErrorReportModal';
52
45
 
53
46
  import AGButton from '../forms/AGButton.vue';
54
47
  import AGErrorReportModalButtons from './AGErrorReportModalButtons.vue';
55
48
  import AGErrorReportModalTitle from './AGErrorReportModalTitle.vue';
56
- import AGMarkdown from '../basic/AGMarkdown.vue';
49
+ import AGMarkdown from '../lib/AGMarkdown.vue';
57
50
  import AGModal from './AGModal.vue';
58
51
 
59
52
  const props = defineProps(useErrorReportModalProps());
60
- const activeReportIndex = ref(0);
61
- const report = computed(() => props.reports[activeReportIndex.value] as ErrorReport);
53
+ const { activeReportIndex, details, nextReportText, previousReportText, report } = useErrorReportModal(props);
62
54
  </script>
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <div class="flex">
3
- <slot v-for="(button, i) of buttons" v-bind="(button as unknown as ComponentProps)" :key="i">
3
+ <slot v-for="(button, i) of buttons" v-bind="button as unknown as ComponentProps" :key="i">
4
4
  <AGButton
5
5
  color="clear"
6
6
  :url="button.url"
@@ -22,12 +22,12 @@ import IconGitHub from '~icons/mdi/github';
22
22
  import { computed } from 'vue';
23
23
  import { stringExcerpt, tap } from '@noeldemartin/utils';
24
24
 
25
- import App from '@/services/App';
26
- import UI from '@/ui/UI';
27
- import { requiredObjectProp } from '@/utils/vue';
28
- import { translateWithDefault } from '@/lang/utils';
29
- import type { ComponentProps } from '@/utils/vue';
30
- import type { ErrorReport } from '@/errors';
25
+ import App from '@aerogel/core/services/App';
26
+ import UI from '@aerogel/core/ui/UI';
27
+ import { requiredObjectProp } from '@aerogel/core/utils/vue';
28
+ import { translateWithDefault } from '@aerogel/core/lang/utils';
29
+ import type { ComponentProps } from '@aerogel/core/utils/vue';
30
+ import type { ErrorReport } from '@aerogel/core/errors';
31
31
 
32
32
  import AGButton from '../forms/AGButton.vue';
33
33
  import type { IAGErrorReportModalButtonsDefaultSlotProps } from './AGErrorReportModal';
@@ -79,10 +79,12 @@ const buttons = computed(() =>
79
79
  description: 'Log to console',
80
80
  iconComponent: IconConsole,
81
81
  handler() {
82
- (window as { error?: unknown }).error = props.report.error;
82
+ const error = props.report.error ?? props.report;
83
+
84
+ (window as { error?: unknown }).error = error;
83
85
 
84
86
  // eslint-disable-next-line no-console
85
- console.error(props.report.error);
87
+ console.error(error);
86
88
 
87
89
  UI.showSnackbar(
88
90
  translateWithDefault(
@@ -92,8 +94,8 @@ const buttons = computed(() =>
92
94
  );
93
95
  },
94
96
  },
95
- ],
96
- (reportButtons: IAGErrorReportModalButtonsDefaultSlotProps[]) => {
97
+ ] as IAGErrorReportModalButtonsDefaultSlotProps[],
98
+ (reportButtons) => {
97
99
  if (!githubReportUrl.value) {
98
100
  return;
99
101
  }