Skip to content

Commit

Permalink
Ember upgrade - 3.28 (#218)
Browse files Browse the repository at this point in the history
* Initial upgrade to 3.28

* Initial upgrade to 3.28

* Fix test command and run yarn install

* Codemods output - prior testing

* Update packages in yellow and green

* Update packages in yellow and green

* ember-cli-htmlbars-inline-precompile is no longer needed with ember-cli-htmlbars versions 4.0.0 and higher

* upgrade ember-bootstrap to 2.8.0

* WIP

* fix unknown rule for template lint

* fix depractation warnings with npx @ember/octanify

* Update ember-bootstrap to 5.x

* ember-cli-app-version

* Add webpack, ember-auto-import depends on it

* Revert changes to the eslintrc file

* Add a dependency helper explode assignable expressesion

* Remove jquery and update truth helper

* Remove flash package, seems to be unused

* remove an old package and write own implementation

* Remove depracated package

* Use new format for lint to

* Update string helper

* use this for property lookup in templates, fallback has been depracated

* upgrade sentry and sass

* upgrade ember-cli-sass

* upgrade uglifyer which was renamed to terser

* upgrade optional features

* upgrade dotenv

* Add this when accessing attributes

* Update node version for workflows

* Disable test - for now

* Rerun yarn with node 18

* Fix input tag

* Fix sidebar filter
  • Loading branch information
kaysiz authored Jul 17, 2024
1 parent 0593a38 commit 165d0bd
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 9 deletions.
4 changes: 3 additions & 1 deletion app/components/filter-sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ export default Component.extend({
filterValue: '',

actions: {
toggleStatus(e){
this.set(e.target.name, e.target.checked)
},
applyFilter() {
this.filterValue = ''
if (this.activeStatus == true){
Expand All @@ -22,7 +25,6 @@ export default Component.extend({
}
this.filterValue = this.filterValue.slice(0, -1)
this.set('model.query.filter', this.filterValue)
//this.get('globalSearch').doSearch(this.query, this.allStatus)
this.router.transitionTo('organizations.index', { queryParams: { query: this.model.query.query, page: this.model.query.page, all_status: this.model.query.allStatus, filter: this.model.query.filter}});
},
clearFilter() {
Expand Down
10 changes: 5 additions & 5 deletions app/templates/components/application-header.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</a>
<div id="search">
<form {{action "search" this.query on="submit"}} class="form-inline mw-25" role="search">
<Input name="query" value={{this.query}} id="query" class="form-control" placeholder="Search Registry..." escape-press={{action "clear"}} enter={{action "search"}} />
<input name="query" value={{this.query}} id="query" class="form-control" placeholder="Search Registry..." escape-press={{action "clear"}} enter={{action "search"}} />
</form>
</div>

Expand Down Expand Up @@ -54,13 +54,13 @@
<div class="callout small">
<h2>Show records with status:</h2>
<form {{action "applyFilter" query on="submit"}} class="form-inline mw-25" role="search">
<Input type="checkbox" id="active-status" name="activeStatus" />
<input type="checkbox" id="active-status" name="activeStatus" />
<label for="active-status">Active</label>
<Input type="checkbox" id="inactive-status" name="inactiveStatus" />
<input type="checkbox" id="inactive-status" name="inactiveStatus" />
<label for="inactive-status">Inactive</label>
<Input type="checkbox" id="withdrawn-status" name="withdrawnStatus" />
<input type="checkbox" id="withdrawn-status" name="withdrawnStatus" />
<label for="withdrawn-status">Withdrawn</label>
<Input type="checkbox" id="all-status" name="allStatus" change={{action "applyFilter"}} />
<input type="checkbox" id="all-status" name="allStatus" change={{action "applyFilter"}} />
<label for="all-status">All statuses</label>
</form>
</div>
Expand Down
27 changes: 24 additions & 3 deletions app/templates/components/filter-sidebar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,36 @@
<h3>Record status <i class="fa-solid fa-question-circle" aria-hidden="true"><BsPopover @triggerEvents="hover" class="popover">Each ROR record has a status of active, inactive or withdrawn. <b>Inactive</b> indicates that an organization has split, merged or otherwise ceased to operate. <b>Withdrawn</b> indicates that an organization was added to ROR in error.</BsPopover></i></h3>
<hr>
<div class="filters-list">
<Input class="filters-list-input" type="checkbox" id="active-status" name="activeStatus" checked={{this.activeStatus}} />
<input
class="filters-list-input"
type="checkbox"
id="active-status"
name="activeStatus"
checked={{this.activeStatus}}
onchange={{action "toggleStatus"}}
/>
<label class="filters-list-label" for="active-status">Active</label>
</div>
<div class="filters-list">
<Input class="filters-list-input" type="checkbox" id="inactive-status" name="inactiveStatus" checked={{this.inactiveStatus}} />
<input
class="filters-list-input"
type="checkbox"
id="inactive-status"
name="inactiveStatus"
checked={{this.inactiveStatus}}
onchange={{action "toggleStatus"}}
/>
<label class="filters-list-label" for="inactive-status">Inactive</label>
</div>
<div class="filters-list">
<Input class="filters-list-input" type="checkbox" id="withdrawn-status" name="withdrawnStatus" checked={{this.withdrawnStatus}} />
<input
class="filters-list-input"
type="checkbox"
id="withdrawn-status"
name="withdrawnStatus"
checked={{this.withdrawnStatus}}
onchange={{action "toggleStatus"}}
/>
<label class="filters-list-label" for="withdrawn-status">Withdrawn</label>
</div>
</div>
Expand Down

0 comments on commit 165d0bd

Please sign in to comment.