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

Jump to bottom

Feature/kas 2430 gebruik vergaderactiviteit codelist uit backend om keuzelijst op te stellen in frontend #1269

Merged
merged 45 commits into from Apr 1, 2022
Merged

Feature/kas 2430 gebruik vergaderactiviteit codelist uit backend om keuzelijst op te stellen in frontend #1269

merged 45 commits into from Apr 1, 2022

Conversation

sergiofenoll
Copy link
Member

@sergiofenoll sergiofenoll commented Mar 28, 2022 •
edited

Adds a code list for vergaderactiviteiten.

The data stored here is now pulled in from the backend. Wherever kind URIs were used, now Ember Data records are used (meeting now has a has-one relationship to meeting-kind, Utils::KindSelector uses records instead of URIs now)

A custom adapter for meeting-kind models was added to prevent multiple requests to the backend being sent.

@sergiofenoll
Copy link
Member Author

Custom jenkins build: http://kal-kastaar.s.redpencil.io:8080/job/kaleidos/job/custom_frontend_backend_combination/171/

@sergiofenoll
Use .get() in case the object being accessed is a proxy
64d51a3
@sergiofenoll
Merge branch 'development' of https://github.com/kanselarij-vlaandere…
a8caee0 
…n/frontend-kaleidos into feature/KAS-2430-gebruik-vergaderactiviteit-codelist-uit-backend-om-keuzelijst-op-te-stellen-in-frontend
@ValenberghsSven ValenberghsSven marked this pull request as ready for review March 29, 2022 12:32
@ValenberghsSven ValenberghsSven marked this pull request as draft March 29, 2022 12:32
@sergiofenoll sergiofenoll marked this pull request as ready for review March 30, 2022 11:09
@sergiofenoll
Copy link
Member Author

Custom jenkins build: http://kal-kastaar.s.redpencil.io:8080/job/kaleidos/job/custom_frontend_backend_combination/177/

ValenberghsSven
ValenberghsSven requested changes Mar 30, 2022
View reviewed changes
app/components/agenda/printable-agenda.hbs Outdated Show resolved Hide resolved
app/components/utils/kind-selector.hbs Outdated Show resolved Hide resolved
app/components/utils/kind-selector.js Outdated Show resolved Hide resolved
app/config/constants.js Outdated Show resolved Hide resolved
app/config/constants.js Outdated Show resolved Hide resolved
app/models/meeting.js Outdated Show resolved Hide resolved
app/components/meeting/new-meeting-modal.js Outdated Show resolved Hide resolved
app/models/meeting.js Outdated Show resolved Hide resolved
app/pods/application/route.js Outdated Show resolved Hide resolved
@ValenberghsSven
Copy link
Contributor

ik heb op deze branch ook een error tegengekomen (nu bij elke refresh op agendas overzicht)
nog niet zeker of deze bug ook op dev is.
image

@sergiofenoll
Copy link
Member Author

ik heb op deze branch ook een error tegengekomen (nu bij elke refresh op agendas overzicht) nog niet zeker of deze bug ook op dev is. image

Damn, zie het ook gebeuren.
Na wat google zag ik gelijkaardige errors voorkomen in een open issue, maar wat ze daar doen is niet hetzelfde als wat we hier aant doen zijn met de transitions. Ben dan maar toch gaan kijken naar transition stuff en mijn originele change was op bepaalde routes this.transitionTo vervangen door this.router.transitionTo (want dat eerste is deprecated), maar na die change te undo'en gaan de errors weg. Ben nog wat verward over waarom dat het geval is, maar het zou nu tenminste moeten werken...

erikap
erikap requested changes Mar 31, 2022
View reviewed changes
app/adapters/meeting-kind.js Outdated Show resolved Hide resolved
app/components/utils/kind-selector.js Outdated Show resolved Hide resolved
app/components/utils/kind-selector.js Outdated Show resolved Hide resolved
app/components/utils/kind-selector.js Outdated Show resolved Hide resolved
app/components/meeting/edit-meeting-modal.js Outdated Show resolved Hide resolved
app/components/agenda/agenda-header.hbs Outdated Show resolved Hide resolved
app/pods/application/route.js Outdated Show resolved Hide resolved
app/config/config.js Outdated Show resolved Hide resolved
app/config/constants.js Outdated Show resolved Hide resolved
app/pods/print-overviews/decisions/controller.js Outdated Show resolved Hide resolved
@sergiofenoll
Remove meeting-kinds adapter
d44e18f
@sergiofenoll
Add kindPrintLabel helper
a11461c
@sergiofenoll
Remove unneeded await
bc8ceb8
@sergiofenoll
Await meeting.kind relation in EditMeetingModal
2e57a58
@sergiofenoll
Add extra properties to concept model
11fc162
@sergiofenoll
Add kindPrintLabel modal
0961b91
@sergiofenoll
Simplify KindSelector
cbbe969
@sergiofenoll
Update constants
733a9b9
@sergiofenoll
Remove meeting-kind, use concept instead
ff0bb67
@sergiofenoll
Merge branch 'development' into feature/KAS-2430-gebruik-vergaderacti…
caed543 
…viteit-codelist-uit-backend-om-keuzelijst-op-te-stellen-in-frontend
@sergiofenoll
Try updating Jenkinsfile so it automatically checks out backend branch
5bb148f
@sergiofenoll
Fix Jenkinsfile syntax
91baefa
@sergiofenoll
Use correct environment variable for branch name in Jenkinsfile
7761c09
@sergiofenoll
One more try for variable name
a7f6ad6
@sergiofenoll
Try other Jenkinsfile env variables
c2f3d05
@sergiofenoll
Try using built-in Groovy-script branching in Jenkinsfile
e66624f
@sergiofenoll
Use double quotes instead of single quotes!
db2e0f2
@erikap
Copy link
Member

erikap commented Apr 1, 2022

I only realize now that the edit-meeting-modal can break the meeting data 😕 (not caused by this PR). There is no consideration for annex-meetings like in the new-meeting-modal. If the type of the meeting changes to 'Plan VV' the user does not get an option to select a main meeting. Going to create a new story to cover this.

@sergiofenoll
Update KindSelector loading mechanism
d2a646e 
Otherwise, if it's still loading the tests will complain because they
try to click the loading text instead of waiting
@sergiofenoll
Refactor isAnnexMeetingKind async function with @Tracked property
5518a19
@sergiofenoll
Revert changes to Jenkinsfile
8bb5502 
Will try to get the Jenkins setup to automatically pull the correct
backend branch some other time.
@sergiofenoll
Copy link
Member Author

Behold, working tests :) http://kal-kastaar.s.redpencil.io:8080/job/kaleidos/job/custom_frontend_backend_combination/183/

ValenberghsSven
ValenberghsSven approved these changes Apr 1, 2022
View reviewed changes
Copy link
Contributor

@ValenberghsSven ValenberghsSven left a comment

Choose a reason for hiding this comment

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

properkes opgelost met concepts

@ValenberghsSven ValenberghsSven merged commit 4c6c12d into development Apr 1, 2022
@ValenberghsSven ValenberghsSven deleted the feature/KAS-2430-gebruik-vergaderactiviteit-codelist-uit-backend-om-keuzelijst-op-te-stellen-in-frontend branch April 1, 2022 15:55
@ValenberghsSven
Copy link
Contributor

Ik had na approven nog even twijfel of er niets ging stuk gaan bij legacy (gewoon de verschillende views, geen edits) maar dat werkt precies nog goed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erikap erikap erikap approved these changes

@ValenberghsSven ValenberghsSven ValenberghsSven approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sergiofenoll @ValenberghsSven @erikap