Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KAS-2689 (DES-802): Elementen/structuur omzetten naar Octane componenten - toolbars #987

Merged
merged 17 commits into from
Jul 7, 2021
Merged

KAS-2689 (DES-802): Elementen/structuur omzetten naar Octane componenten - toolbars #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f8a469c
Refactor toolbar occurrences (part 1)
brenner-company Jul 2, 2021
e4255a8
Merge branch 'development' into DES/enhancement/802-html-element-to-o…
brenner-company Jul 2, 2021
9ba49fb
Fix linting errors
brenner-company Jul 2, 2021
b5e8f77
Refactor toolbar occurrences (part 2)
brenner-company Jul 2, 2021
10de999
Refactor toolbar occurrences (part 3)
brenner-company Jul 2, 2021
1a538d8
Refactor toolbar occurrences (part 4)
brenner-company Jul 2, 2021
1f90c80
Fix duplicate toolbar structure
brenner-company Jul 2, 2021
4466b8a
Remove debugging styling
brenner-company Jul 2, 2021
981ee33
Fix replacement error
brenner-company Jul 2, 2021
9c84ef9
Merge branch 'development' into DES/enhancement/802-html-element-to-o…
brenner-company Jul 5, 2021
3bcb6ce
Merge branch 'development' into DES/enhancement/802-html-element-to-o…
MikiDi Jul 5, 2021
92b42dd
Fix test
brenner-company Jul 6, 2021
8387558
Merge branch 'DES/enhancement/802-html-element-to-octane-component-re…
ValenberghsSven Jul 7, 2021
2a716b6
KAS-2689 remove div with non-existing css, use existing selectors to …
ValenberghsSven Jul 7, 2021
2660197
KAS-2689 removed css class that does not seem to exist
ValenberghsSven Jul 7, 2021
014d3fc
KAS-2689 move modals to outside the navbar
ValenberghsSven Jul 7, 2021
d4b00a0
Merge branch 'development' of github.com:kanselarij-vlaanderen/kaleid…
ValenberghsSven Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions app/components/access-level-pill.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,21 @@
/>
{{/if}}
{{/if}}
<div class="auk-toolbar-complex__item">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Het wegvallen van de auk-toolbar-complex__item-klasse breekt een test ... na te kijken http://kal-kastaar.s.redpencil.io:8080/job/kaleidos/job/FeatureBranches/view/change-requests/job/PR-987/2/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zal daar eens naar kijken

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dit lag blijkbaar aan een .vlc-document-card-toolbar__right die er door mij uitgehaald was. Ik heb die nu vervangen door een meer gebruiksvriendelijke data-attribute.

@ValenberghsSven Kan je zelf nog eens vlug kijken of dit ok is?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ik heb de fix iets anders gedaan, gewoon document.documentCard.card gebruikt.
In cypress fix deel 4 gaan we deze test toch herwerken en dan kunnen we document.accessLevelPill.pill gebruiken etc

<div class="auk-u-position-relative auk-u-inline-block">
<Auk::Button
@skin={{if @confidential "danger-borderless" "muted-borderless"}}
@layout="icon-only"
@icon={{if @confidential "lock-closed" "lock-open"}}
@disabled={{not this.session.isEditor}}
{{on "click" (perform this.changeConfidentiality)}}
/>
{{#if @confidential}}
<EmberTooltip @side="top" @tooltipClass="tooltip-custom">
<p>
{{t "document-is-confidential"}}
</p>
</EmberTooltip>
{{/if}}
</div>
<div class="auk-u-position-relative auk-u-inline-block">
<Auk::Button
@skin={{if @confidential "danger-borderless" "muted-borderless"}}
@layout="icon-only"
@icon={{if @confidential "lock-closed" "lock-open"}}
@disabled={{not this.session.isEditor}}
{{on "click" (perform this.changeConfidentiality)}}
/>
{{#if @confidential}}
<EmberTooltip @side="top" @tooltipClass="tooltip-custom">
<p>
{{t "document-is-confidential"}}
</p>
</EmberTooltip>
{{/if}}
</div>
{{/if}}
</div>
20 changes: 10 additions & 10 deletions app/components/agenda/agenda-detail/sidebar.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<div class="auk-toolbar-complex vlc-agenda-detail-sidebar-section-header vlc-agenda-detail-sidebar-section-header--border-bottom">
<div class="auk-toolbar-complex__left">
<div class="auk-toolbar-complex__item">
<Auk::Toolbar class="vlc-agenda-detail-sidebar-section-header vlc-agenda-detail-sidebar-section-header--border-bottom">
<Auk::Toolbar::Group @position="left">
<Auk::Toolbar::Item>
<h3 class="auk-h3 auk-u-m-0 vlc-agenda-detail-sidebar-section-header__title">
{{t "agendaitems-subtitle"}}
</h3>
</div>
</div>
<div class="auk-toolbar-complex__right">
<div class="auk-toolbar-complex__item">
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
<Auk::Toolbar::Group @position="right">
<Auk::Toolbar::Item>
<Auk::ButtonLink
class="vlc-agenda-items-section-header__link"
{{on "click" @toggleShowModifiedOnly}}
>
{{if @showModifiedOnly (t "show-all") (t "show-changes")}}
</Auk::ButtonLink>
</div>
</div>
</div>
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
</Auk::Toolbar>
<div>
{{#if (not @isLoadingNotaGroups)}}
{{#each @notaGroups as |agendaitemGroup index|}}
Expand Down
24 changes: 12 additions & 12 deletions app/components/agenda/agenda-header.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Auk::Navbar @skin="gray-100" @auto={{true}}>
<div class="auk-toolbar-complex">
<div class="auk-toolbar-complex__left">
<div class="auk-toolbar-complex__item">
<Auk::Toolbar>
<Auk::Toolbar::Group @position="left">
<Auk::Toolbar::Item>
<div class="auk-o-flex auk-o-flex--vertical auk-u-mt-2">
<div class="auk-o-flex auk-o-flex--vertical-center">
<h4 class="auk-toolbar-complex__title" data-test-agenda-header-title>
Expand All @@ -15,12 +15,12 @@
<Sessions::SessionAgendaNav
@currentAgenda={{currentAgenda}} />
</div>
</div>
</div>
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
{{#if currentSessionService.isViewer}}
<div class="auk-toolbar-complex__right">
<Auk::Toolbar::Group @position="right">
{{#if currentSessionService.isEditor}}
<div class="auk-toolbar-complex__item">
<Auk::Toolbar::Item>
<div class="auk-u-position-relative auk-u-inline-block">
<Auk::Button
@skin="primary"
Expand Down Expand Up @@ -132,9 +132,9 @@
</ul>
{{/attach-popover}}
</div>
</div>
</Auk::Toolbar::Item>
{{/if}}
<div class="auk-toolbar-complex__item">
<Auk::Toolbar::Item>
<div class="auk-u-position-relative auk-u-inline-block">
<Auk::Button
@skin="secondary"
Expand Down Expand Up @@ -346,10 +346,10 @@
</ul>
{{/attach-popover}}
</div>
</div>
</div>
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
{{/if}}
</div>
</Auk::Toolbar>

{{#if isAddingAgendaitems}}
<Agenda::Agendaitem::CreateAgendaitem
Expand Down
24 changes: 12 additions & 12 deletions app/components/agenda/agenda-overview.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
@clearAction={{this.toggleIsEditingOverview}}
/>
{{/if}}
<div class="auk-toolbar-complex vlc-agenda-items-section-header">
<div class="auk-toolbar-complex__left">
<div class="auk-toolbar-complex__item">
<Auk::Toolbar class="vlc-agenda-items-section-header">
<Auk::Toolbar::Group @position="left">
<Auk::Toolbar::Item>
<h3 class="auk-h3 auk-u-m-0 vlc-agenda-items-section-header__title">
{{t "agendaitems-subtitle"}}
</h3>
</div>
</div>
<div class="auk-toolbar-complex__right">
<div class="auk-toolbar-complex__item">
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
<Auk::Toolbar::Group @position="right">
<Auk::Toolbar::Item>
<Auk::ButtonLink
data-test-agenda-overview-show-changes={{true}}
class="vlc-agenda-items-section-header__link"
{{on "click" @toggleShowModifiedOnly}}
>
{{if @showModifiedOnly (t "show-all") (t "show-changes")}}
</Auk::ButtonLink>
</div>
<div class="auk-toolbar-complex__item">
</Auk::Toolbar::Item>
<Auk::Toolbar::Item>
{{#if
(and
this.currentSessionService.isEditor
Expand All @@ -43,9 +43,9 @@
</div>
{{/unless}}
{{/if}}
</div>
</div>
</div>
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
</Auk::Toolbar>
{{#if (not @isLoadingNotaGroups)}}
{{#if @notaGroups.length}}
<div>
Expand Down
12 changes: 6 additions & 6 deletions app/components/agenda/agendaitem-search.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Auk::Navbar @skin="gray-100" class="vlc-hide-on-print">
<div class="auk-toolbar-complex auk-toolbar-complex--auto">
<div class="auk-toolbar-complex__left">
<div class="auk-toolbar-complex__item vlc-u-box-model-maximize-width">
<Auk::Toolbar @auto={{true}}>
<Auk::Toolbar::Group @position="left">
<Auk::Toolbar::Item class="vlc-u-box-model-maximize-width">
<div class="auk-form-group">
<Auk::Input
@icon="search"
Expand All @@ -14,10 +14,10 @@
{{on "input" this.debouncedSearch}}
/>
</div>
</div>
</Auk::Toolbar::Item>
{{#if this.debouncedSearchTask.isRunning}}
<div class="auk-loader" role="alert" aria-busy="true"></div>
{{/if}}
</div>
</div>
</Auk::Toolbar::Group>
</Auk::Toolbar>
</Auk::Navbar>
12 changes: 6 additions & 6 deletions app/components/agenda/agendaitem/create-agendaitem.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<div class="auk-u-p-4">
<div class="auk-o-grid auk-o-flex--align-end auk-u-mb-2">
<div class="auk-o-grid-col-8">
<div class="auk-toolbar-complex auk-toolbar-complex--auto">
<div class="auk-toolbar-complex__left custom-table-search">
<div class="auk-toolbar-complex__item" style="width:100%;">
<Auk::Toolbar @auto={{true}}>
<Auk::Toolbar::Group @position="left">
<Auk::Toolbar::Item class="auk-u-maximize-width">
<div class="vl-input-field--inline" data-test-vl-create-agendaitem-search>
{{input
value=filterParam
Expand All @@ -43,9 +43,9 @@
onclick={{perform searchTask}}
/>
</div>
</div>
</div>
</div>
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
</Auk::Toolbar>
</div>
<div class="auk-o-grid-col-4">
<div class="auk-form-group">
Expand Down
16 changes: 8 additions & 8 deletions app/components/agenda/side-nav.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Auk::Navbar @skin="gray-200">
<div class="auk-toolbar-complex">
<div class="auk-toolbar-complex__left" data-sidebar-expanded-only="">
<Auk::Toolbar>
<Auk::Toolbar::Group @position="left" data-sidebar-expanded-only="">
<h2 class="auk-toolbar-complex__title--small">{{t "nav-title"}}</h2>
</div>
<div class="auk-toolbar-complex__{{if agendaMenuCollapsed "center" "right"}}">
<div class="auk-toolbar-complex__item {{if agendaMenuCollapsed "auk-o-flex auk-o-flex--horizontal-center"}}">
</Auk::Toolbar::Group>
<Auk::Toolbar::Group @position={{if agendaMenuCollapsed "center" "right"}}>
<Auk::Toolbar::Item class={{if agendaMenuCollapsed "auk-o-flex auk-o-flex--horizontal-center"}}>
<Auk::Button
@skin="borderless"
@layout="icon-only"
Expand All @@ -13,9 +13,9 @@
>
{{t "toggle"}}
</Auk::Button>
</div>
</div>
</div>
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
</Auk::Toolbar>
</Auk::Navbar>
<ul class="auk-scroll-wrapper__body auk-scroll-wrapper__body--vertical">
{{#each (await agendas) as |agenda|}}
Expand Down
4 changes: 2 additions & 2 deletions app/components/auk/accordion-panel/header/actions.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="auk-toolbar-complex__right">
<Auk::Toolbar::Group @position="right">
{{yield
(hash Item=(component 'auk/accordion-panel/header/actions/item'))
}}
</div>
</Auk::Toolbar::Group>
4 changes: 2 additions & 2 deletions app/components/auk/accordion-panel/header/actions/item.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="auk-toolbar-complex__item">
<Auk::Toolbar::Item>
{{yield}}
</div>
</Auk::Toolbar::Item>
49 changes: 25 additions & 24 deletions app/components/cases/cases-header.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
<Auk::Navbar @skin="gray-100">
<div class="auk-toolbar-complex auk-toolbar-complex--auto">
<div class="auk-toolbar-complex__left">
<div class="auk-toolbar-complex__item">
<h1 class="auk-toolbar__title" data-test-cases-header-title>
{{t "cases"}}
</h1>
</div>
</div>
<div class="auk-toolbar-complex__right">
<div class="auk-toolbar-complex__item">
{{#if currentSession.isEditor}}
<Auk::Button
data-test-cases-header-add-case
@skin="primary"
@icon="add"
{{on "click" this.toggleAddingCase}}
>
{{t "add-case"}}
</Auk::Button>
{{/if}}
</div>
</div>
</div>
{{#if isAddingCase}}
{{#if (not isAddingCase)}}
<Auk::Toolbar @auto={{true}}>
<Auk::Toolbar::Group @position="left">
<Auk::Toolbar::Item>
<h1 data-test-cases-header-title class="auk-toolbar__title">
{{t "cases"}}
</h1>
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
<Auk::Toolbar::Group @position="right">
<Auk::Toolbar::Item>
{{#if currentSession.isEditor}}
<Auk::Button
data-test-cases-header-add-case
@skin="primary"
@icon="add"
{{on "click" this.toggleAddingCase}}
>
{{t "add-case"}}
</Auk::Button>
{{/if}}
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
</Auk::Toolbar>
{{else}}
<WebComponents::VlModal
@isOverlay={{true}}
@closeModal={{this.toggleAddingCase}}
Expand Down
20 changes: 10 additions & 10 deletions app/components/cases/new-case.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@
</div>
</div>
<div class="auk-modal__footer auk-modal__footer--bordered">
<div class="auk-toolbar-complex">
<div class="auk-toolbar-complex__left">
<div class="auk-toolbar-complex__item">
<Auk::Toolbar>
<Auk::Toolbar::Group @position="left">
<Auk::Toolbar::Item>
<Auk::Button
@skin="borderless"
{{action "closeAction"}}
data-test-new-case-cancel
>
{{t "cancel"}}
</Auk::Button>
</div>
</div>
<div class="auk-toolbar-complex__right">
<div class="auk-toolbar-complex__item">
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
<Auk::Toolbar::Group @position="right">
<Auk::Toolbar::Item>
{{web-components/vl-save-button
text=(t "create-case")
type="submit"
isLoading=isLoading
}}
</div>
</div>
</div>
</Auk::Toolbar::Item>
</Auk::Toolbar::Group>
</Auk::Toolbar>
</div>
</form>
Loading