Skip to content

Commit

Permalink
Merge branch 'master' into GN-4985-lmb-queries
Browse files Browse the repository at this point in the history
  • Loading branch information
abeforgit authored Sep 28, 2024
2 parents c48ce9b + a942a9c commit 847a83e
Show file tree
Hide file tree
Showing 16 changed files with 31,337 additions and 12,935 deletions.
5 changes: 5 additions & 0 deletions .changeset/lazy-experts-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'frontend-gelinkt-notuleren': patch
---

bump plugins to [23.0.0](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/releases/tag/v23.0.0)
2 changes: 1 addition & 1 deletion app/components/agenda-manager/agenda-table/row.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import { PUBLISHED_STATUS_ID } from 'frontend-gelinkt-notuleren/utils/constants';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';

export default class AgendaManagerAgendaTableRowComponent extends Component {
apStatusData = trackedFunction(this, async () => {
Expand Down
2 changes: 1 addition & 1 deletion app/components/agendapoint-back-link.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import { service } from '@ember/service';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';

export default class ZittingLinkComponent extends Component {
@service store;
Expand Down
2 changes: 1 addition & 1 deletion app/components/agendapoint-menu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';
import { service } from '@ember/service';

export default class AgendapointMenuComponent extends Component {
Expand Down
2 changes: 1 addition & 1 deletion app/components/behandeling-van-agendapunt.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { action } from '@ember/object';
import { service } from '@ember/service';
import { use } from 'ember-could-get-used-to-this';
import RelationshipResource from '../helpers/relationship-resource';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';
import InstallatieVergaderingModel from '../models/installatievergadering';

/** @typedef {import("../models/mandataris").default} Mandataris */
Expand Down
2 changes: 1 addition & 1 deletion app/components/extracts/print-view.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';
import { inject as service } from '@ember/service';

export default class ExtractsPrintViewComponent extends Component {
Expand Down
2 changes: 1 addition & 1 deletion app/components/inauguration-meeting/synchronization.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { task } from 'ember-concurrency';
import { service } from '@ember/service';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';
import { executeQuery } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
import ENV from 'frontend-gelinkt-notuleren/config/environment';
import { headlessProsemirror } from '../../utils/meeting/headless-prosemirror';
Expand Down
4 changes: 2 additions & 2 deletions app/components/meeting-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { tracked } from 'tracked-built-ins';
import { task, all, restartableTask } from 'ember-concurrency';
import { service } from '@ember/service';
import { articlesBasedOnClassifcationMap } from '../utils/classification-utils';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedTask } from 'ember-resources/util/ember-concurrency';
import { trackedFunction } from 'reactiveweb/function';
import { trackedTask } from 'reactiveweb/ember-concurrency';
import InstallatieVergaderingModel from 'frontend-gelinkt-notuleren/models/installatievergadering';
import {
MANDATARIS_STATUS_EFFECTIEF,
Expand Down
2 changes: 1 addition & 1 deletion app/components/publishing-log-document-name.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';

export default class PublishingLogDocumentNameComponent extends Component {
@tracked documentName;
Expand Down
2 changes: 1 addition & 1 deletion app/components/publishing-log-hash.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';

export default class PublishingLogHashComponent extends Component {
hash = trackedFunction(this, async () => {
Expand Down
2 changes: 1 addition & 1 deletion app/components/signatures/signature-controls.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';
import { inject as service } from '@ember/service';
/** @typedef {import("../../models/signed-resource").default} SignedResource */

Expand Down
2 changes: 1 addition & 1 deletion app/components/signatures/signed-resource.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';

export default class SignedResource extends Component {
@tracked showDeleteSignatureCard = false;
Expand Down
2 changes: 1 addition & 1 deletion app/models/behandeling-van-agendapunt.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
import { DRAFT_FOLDER_ID, SCHEDULED_STATUS_ID } from '../utils/constants';
import { service } from '@ember/service';
import { trackedFunction } from 'ember-resources/util/function';
import { trackedFunction } from 'reactiveweb/function';

export default class BehandelingVanAgendapunt extends Model {
@service store;
Expand Down
11 changes: 5 additions & 6 deletions app/styles/project/_c-template.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,17 @@
@include au-font-size($au-h6);
display: table;
table-layout: fixed;

// Having `colgroup` means that column widths are defined
&:has(colgroup) {
table-layout: auto;
}

position: relative;
width: 100%;
border-collapse: collapse;
border: 0.1rem solid $au-gray-300;
white-space: normal;

// Having `colgroup` means that column widths are defined
&:has(colgroup) {
table-layout: auto;
}

& + & {
margin-top: $au-unit;
}
Expand Down
Loading

0 comments on commit 847a83e

Please sign in to comment.