Fix lint and test errors

This commit is contained in:
raucao committed 2026-08-22 17:00:44 -06:00
1 parent c538d2c470
commit 1f23823ac0
12 files changed
+216 -246

No files matched your search

+4
View File
@@ -2,4 +2,8 @@
module.exports = {
extends: ['stylelint-config-standard'],
rules: {
'import-notation': null,
'comment-empty-line-before': null,
},
};
+8 -2
View File
@@ -5,8 +5,14 @@ import { hash } from '@ember/helper';
import { modifier } from 'ember-modifier';
export default class ModalDialogComponent extends Component {
@tracked currentComponent = this.args.initialComponent;
@tracked componentProps = this.args.initialProps || {};
@tracked currentComponent = null;
@tracked componentProps = null;
constructor() {
super(...arguments);
this.currentComponent = this.args.initialComponent;
this.componentProps = this.args.initialProps ?? {};
}
setupDialog = modifier((element) => {
const handleClose = () => {
+28 -31
View File
@@ -1,36 +1,33 @@
import Component from '@glimmer/component';
import { on } from '@ember/modifier';
import { fn } from '@ember/helper';
import ModalStepTwo from './modal-step-two.gjs';
export default class ModalStepOneComponent extends Component {
<template>
<div class="p-6">
<h3
id="dialog-title"
class="text-base font-semibold leading-6 text-gray-900"
>Step 1: Welcome</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">
This is the first step of the workflow. Click next to continue.
</p>
</div>
<div class="mt-5 sm:mt-6 flex gap-3">
<button
type="button"
{{on "click" (fn @switchComponent ModalStepTwo)}}
class="inline-flex w-full justify-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
>
Next
</button>
<button
type="button"
{{on "click" @closeDialog}}
class="inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50"
>
Cancel
</button>
</div>
<template>
<div class="p-6">
<h3
id="dialog-title"
class="text-base font-semibold leading-6 text-gray-900"
>Step 1: Welcome</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">
This is the first step of the workflow. Click next to continue.
</p>
</div>
</template>
}
<div class="mt-5 sm:mt-6 flex gap-3">
<button
type="button"
{{on "click" (fn @switchComponent ModalStepTwo)}}
class="inline-flex w-full justify-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
>
Next
</button>
<button
type="button"
{{on "click" @closeDialog}}
class="inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50"
>
Cancel
</button>
</div>
</div>
</template>
+28 -31
View File
@@ -1,36 +1,33 @@
import Component from '@glimmer/component';
import { on } from '@ember/modifier';
import { fn } from '@ember/helper';
import ModalStepOne from './modal-step-one.gjs';
export default class ModalStepTwoComponent extends Component {
<template>
<div class="p-6">
<h3
id="dialog-title"
class="text-base font-semibold leading-6 text-gray-900"
>Step 2: Configuration</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">
This is the second step. You can go back or finish.
</p>
</div>
<div class="mt-5 sm:mt-6 flex gap-3">
<button
type="button"
{{on "click" @closeDialog}}
class="inline-flex w-full justify-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
>
Finish
</button>
<button
type="button"
{{on "click" (fn @switchComponent ModalStepOne)}}
class="inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50"
>
Back
</button>
</div>
<template>
<div class="p-6">
<h3
id="dialog-title"
class="text-base font-semibold leading-6 text-gray-900"
>Step 2: Configuration</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">
This is the second step. You can go back or finish.
</p>
</div>
</template>
}
<div class="mt-5 sm:mt-6 flex gap-3">
<button
type="button"
{{on "click" @closeDialog}}
class="inline-flex w-full justify-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
>
Finish
</button>
<button
type="button"
{{on "click" (fn @switchComponent ModalStepOne)}}
class="inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50"
>
Back
</button>
</div>
</div>
</template>
@@ -1,78 +1,75 @@
import Component from '@glimmer/component';
import { on } from '@ember/modifier';
import { fn } from '@ember/helper';
import Discourse from './discourse.gjs';
export default class SettingsAddIntegrationList extends Component {
<template>
<div class="block max-h-96 p-4 transform-gpu scroll-py-3 overflow-y-auto">
<button
type="button"
{{on "click" (fn @switchComponent Discourse)}}
class="group flex w-full rounded-xl p-3 cursor-pointer select-none focus:outline-hidden hover:bg-gray-100 aria-selected:bg-gray-100"
<template>
<div class="block max-h-96 p-4 transform-gpu scroll-py-3 overflow-y-auto">
<button
type="button"
{{on "click" (fn @switchComponent Discourse)}}
class="group flex w-full rounded-xl p-3 cursor-pointer select-none focus:outline-hidden hover:bg-gray-100 aria-selected:bg-gray-100"
>
<div
class="flex size-10 flex-none items-center justify-center rounded-lg bg-indigo-500"
>
<div
class="flex size-10 flex-none items-center justify-center rounded-lg bg-indigo-500"
<svg
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.5"
data-slot="icon"
class="size-6 text-white"
>
<svg
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.5"
data-slot="icon"
class="size-6 text-white"
>
<path
d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
</div>
<div class="ml-4 flex-auto text-left">
<p
id="item-1-label"
class="text-sm font-medium text-gray-700 group-aria-selected:text-gray-900"
>
Discourse
</p>
<p class="text-sm text-gray-500 group-aria-selected:text-gray-700">
Notifications from your discussion forums
</p>
</div>
</button>
<button
type="button"
disabled
class="group flex w-full cursor-default rounded-xl p-3 select-none focus:outline-hidden"
<path
d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
</div>
<div class="ml-4 flex-auto text-left">
<p
id="item-discourse-label"
class="text-sm font-medium text-gray-700 group-aria-selected:text-gray-900"
>
Discourse
</p>
<p class="text-sm text-gray-500 group-aria-selected:text-gray-700">
Notifications from your discussion forums
</p>
</div>
</button>
<button
type="button"
disabled
class="group flex w-full cursor-default rounded-xl p-3 select-none focus:outline-hidden"
>
<div
class="flex size-10 flex-none items-center justify-center rounded-lg bg-gray-300"
>
<div
class="flex size-10 flex-none items-center justify-center rounded-lg bg-gray-300"
<svg
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.5"
data-slot="icon"
class="size-6 text-white"
>
<svg
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.5"
data-slot="icon"
class="size-6 text-white"
>
<path
d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
</div>
<div class="ml-4 flex-auto text-left">
<p id="item-1-label" class="text-sm font-medium text-gray-400">
Gitea
</p>
<p class="text-sm text-gray-400">
Notifications from your Git hosting servers
</p>
</div>
</button>
</div>
</template>
}
<path
d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
</div>
<div class="ml-4 flex-auto text-left">
<p id="item-gitea-label" class="text-sm font-medium text-gray-400">
Gitea
</p>
<p class="text-sm text-gray-400">
Notifications from your Git hosting servers
</p>
</div>
</button>
</div>
</template>
+2 -2
View File
@@ -6,7 +6,7 @@ export default class AuthDiscourseCallbackRoute extends Route {
@service storage;
@service router;
async model(params) {
async model() {
const urlParams = new URLSearchParams(window.location.search);
const payload = urlParams.get('payload');
@@ -113,7 +113,7 @@ export default class AuthDiscourseCallbackRoute extends Route {
}
}
afterModel(model) {
afterModel() {
// Don't auto-redirect anymore - let the user close the dialog
}
}
+1 -3
View File
@@ -1,7 +1,5 @@
@import url('tailwindcss');
@import 'tailwindcss';
/* @theme { */
/* --font-sans: Helvetica, "Liberation Sans", "Nimbus Sans", sans-serif; */
/* } */
+1 -1
View File
@@ -3,7 +3,7 @@ import ModalDialog from '../../../components/modal-dialog.gjs';
import IntegrationResult from '../../../components/settings/add-integration/result.gjs';
import { modifier } from 'ember-modifier';
const autoOpenDialog = modifier((element) => {
const autoOpenDialog = modifier(() => {
// Auto-open the dialog when the template is rendered
setTimeout(() => {
const dialog = document.getElementById('integration-result-dialog');
+64 -70
View File
@@ -1,4 +1,3 @@
import Component from '@glimmer/component';
import { pageTitle } from 'ember-page-title';
import { on } from '@ember/modifier';
import DefaultClock from '../components/default-clock.gjs';
@@ -6,78 +5,73 @@ import ModalDialog from '../components/modal-dialog.gjs';
import ModalStepOne from '../components/modal-step-one.gjs';
import { default as SettingsAddIntegrationList } from '../components/settings/add-integration/list.gjs';
export default class IndexRoute extends Component {
<template>
{{pageTitle "New Tab"}}
<template>
{{pageTitle "New Tab"}}
<div class="col-start-3 row-start-1 flex items-center justify-center gap-4">
<button
command="show-modal"
commandfor="modal-settings-add-integration"
class="rounded-md px-2.5 py-1.5 text-white border border-white hover:bg-gray-950/10"
type="button"
>
Add Integration
</button>
<div class="col-start-3 row-start-1 flex items-center justify-center gap-4">
<button
command="show-modal"
commandfor="modal-settings-add-integration"
class="rounded-md px-2.5 py-1.5 text-white border border-white hover:bg-gray-950/10"
type="button"
>
Add Integration
</button>
<ModalDialog
@initialComponent={{SettingsAddIntegrationList}}
@id="modal-settings-add-integration"
/>
</div>
<div class="col-start-2 row-start-2 flex items-center justify-center">
<DefaultClock />
</div>
<div class="col-start-2 row-start-3 flex items-center justify-center gap-4">
<button
command="show-modal"
commandfor="modal-dialog-workflow"
class="rounded-md px-2.5 py-1.5 text-white border border-white hover:bg-gray-950/10"
type="button"
>
Open workflow dialog
</button>
<button
command="show-modal"
commandfor="modal-dialog-yield"
class="rounded-md px-2.5 py-1.5 text-white border border-white hover:bg-gray-950/10"
type="button"
>
Open yielded dialog
</button>
</div>
{{! Workflow dialog with initial component }}
<ModalDialog
@initialComponent={{ModalStepOne}}
@id="modal-dialog-workflow"
@initialComponent={{SettingsAddIntegrationList}}
@id="modal-settings-add-integration"
/>
</div>
{{! Yielded content dialog }}
<ModalDialog @id="modal-dialog-yield" as |modal|>
<div class="p-6">
<h3
id="dialog-title"
class="text-base font-semibold leading-6 text-gray-900"
>Simple Dialog</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">
This dialog uses yielded content. You can put any content here.
</p>
</div>
<div class="mt-5 sm:mt-6">
<button
type="button"
{{on "click" modal.closeDialog}}
class="inline-flex w-full justify-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
>
Close
</button>
</div>
<div class="col-start-2 row-start-2 flex items-center justify-center">
<DefaultClock />
</div>
<div class="col-start-2 row-start-3 flex items-center justify-center gap-4">
<button
command="show-modal"
commandfor="modal-dialog-workflow"
class="rounded-md px-2.5 py-1.5 text-white border border-white hover:bg-gray-950/10"
type="button"
>
Open workflow dialog
</button>
<button
command="show-modal"
commandfor="modal-dialog-yield"
class="rounded-md px-2.5 py-1.5 text-white border border-white hover:bg-gray-950/10"
type="button"
>
Open yielded dialog
</button>
</div>
{{! Workflow dialog with initial component }}
<ModalDialog @initialComponent={{ModalStepOne}} @id="modal-dialog-workflow" />
{{! Yielded content dialog }}
<ModalDialog @id="modal-dialog-yield" as |modal|>
<div class="p-6">
<h3
id="dialog-title"
class="text-base font-semibold leading-6 text-gray-900"
>Simple Dialog</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">
This dialog uses yielded content. You can put any content here.
</p>
</div>
</ModalDialog>
</template>
}
<div class="mt-5 sm:mt-6">
<button
type="button"
{{on "click" modal.closeDialog}}
class="inline-flex w-full justify-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
>
Close
</button>
</div>
</div>
</ModalDialog>
</template>
+2 -12
View File
@@ -14,17 +14,7 @@ module('Integration | Component | greeting', function (hooks) {
await render(<template><Greeting /></template>);
assert.dom().hasText('');
// Template block usage:
await render(
<template>
<Greeting>
template block text
</Greeting>
</template>
);
assert.dom().hasText('template block text');
assert.dom().hasText(/Good (morning|afternoon|evening),/);
assert.dom('.name').exists();
});
});
@@ -14,20 +14,13 @@ module(
// and update using state.myProperty = 1; await rerender();
// Handle any actions with function myAction(val) { ... };
await render(<template><Discourse /></template>);
const noop = () => {};
assert.dom().hasText('');
await render(<template><Discourse @closeDialog={{noop}} /></template>);
// Template block usage:
await render(
<template>
<Discourse>
template block text
</Discourse>
</template>
);
assert.dom().hasText('template block text');
assert.dom().containsText('Add Discourse Integration');
assert.dom().containsText('Enter your Discourse forum URL');
assert.dom('form').exists();
});
}
);
@@ -14,20 +14,14 @@ module(
// and update using state.myProperty = 1; await rerender();
// Handle any actions with function myAction(val) { ... };
await render(<template><List /></template>);
const noop = () => {};
assert.dom().hasText('');
await render(<template><List @switchComponent={{noop}} /></template>);
// Template block usage:
await render(
<template>
<List>
template block text
</List>
</template>
);
assert.dom().hasText('template block text');
assert.dom().containsText('Discourse');
assert.dom().containsText('Notifications from your discussion forums');
assert.dom().containsText('Gitea');
assert.dom().containsText('Notifications from your Git hosting servers');
});
}
);