raucao/marco
1
0
Fork 0
Code Issues 15 Pull Requests 1 Actions Releases 2 Activity

Fix lint errors
Some checks failed
CI / Lint (pull_request) Failing after 13m1s
Details
CI / Test (pull_request) Failing after 15m32s
Details

Browse Source
This commit is contained in:
Râu Cao
2026-03-23 18:32:18 +04:00
parent 0ac6db65cb
commit 582ab4f8b3
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/components/category-chips.gjs
View File

@@ -42,7 +42,10 @@ export default class CategoryChipsComponent extends Component {
class="category-chip" class="category-chip"
{{on "click" (fn this.searchCategory category)}} {{on "click" (fn this.searchCategory category)}}
aria-label={{category.label}} aria-label={{category.label}}
disabled={{and (eq this.mapUi.loadingState.type "category") (eq this.mapUi.loadingState.value category.id)}} disabled={{and
(eq this.mapUi.loadingState.type "category")
(eq this.mapUi.loadingState.value category.id)
}}
> >
<Icon @name={{category.icon}} @size={{16}} /> <Icon @name={{category.icon}} @size={{16}} />
<span>{{category.label}}</span> <span>{{category.label}}</span>

7
app/components/search-box.gjs
View File

@@ -217,7 +217,12 @@ export default class SearchBoxComponent extends Component {
/> />
<button type="submit" class="search-submit-btn" aria-label="Search"> <button type="submit" class="search-submit-btn" aria-label="Search">
{{#if (or (eq this.mapUi.loadingState.type "text") (eq this.mapUi.loadingState.type "category"))}} {{#if
(or
(eq this.mapUi.loadingState.type "text")
(eq this.mapUi.loadingState.type "category")
)
}}
<Icon @name="loading-ring" @size={{20}} /> <Icon @name="loading-ring" @size={{20}} />
{{else}} {{else}}
<Icon @name="search" @size={{20}} @color="#5f6368" /> <Icon @name="search" @size={{20}} @color="#5f6368" />

4
app/templates/place.gjs
View File

@@ -79,8 +79,8 @@ export default class PlaceTemplate extends Component {
if (place === null) { if (place === null) {
// If we have an active search context, return to it (UP navigation) // If we have an active search context, return to it (UP navigation)
if (this.mapUi.returnToSearch && this.mapUi.currentSearch) { if (this.mapUi.returnToSearch && this.mapUi.currentSearch) {
this.router.transitionTo('search', { this.router.transitionTo('search', {
queryParams: this.mapUi.currentSearch queryParams: this.mapUi.currentSearch,
}); });
} else { } else {
// Otherwise just close the sidebar (return to map index) // Otherwise just close the sidebar (return to map index)

8
tests/acceptance/search-loading-test.js
View File

@@ -1,11 +1,5 @@
import { module, test } from 'qunit'; import { module, test } from 'qunit';
import { import { visit, click, fillIn, currentURL } from '@ember/test-helpers';
visit,
click,
fillIn,
triggerEvent,
currentURL,
} from '@ember/test-helpers';
import { setupApplicationTest } from 'marco/tests/helpers'; import { setupApplicationTest } from 'marco/tests/helpers';
import Service from '@ember/service'; import Service from '@ember/service';
import { Promise } from 'rsvp'; import { Promise } from 'rsvp';