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.

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

Create revision layout #297

Merged
merged 29 commits into from
Oct 14, 2022
Merged

Create revision layout #297

merged 29 commits into from
Oct 14, 2022

Conversation

Dietr
Copy link
Contributor

@Dietr Dietr commented Jul 5, 2022

Rework the revision page to fit into the design.

Needs dev work/help

  • "Bijlagen" button is not clickable from Versions tab
  • "Exporteer als html" in versions tab is a mockup > needs the actual functionality
  • Make the versions tab also available in the meeting agendapoint modal

Dietr added 2 commits July 5, 2022 14:40
* master:
  Release 2.28.1
  fixed according to review notes
  initial commit
  push latest based on development
  Release 2.28.0
  Release 2.27.1
  linting
  use paper view for intro and outro editor
  moved logic which determines whether delete button is shown or not
  removed publicatie-agendas freom include in query
  remove console log
  added validation which enables/disables the delete button of a meeting based on the number of attached published resources
  bump ember promise helpers to 2.0.0
  bump ay11-refocus to 3.0.0
  Release 2.27.0
  Release 2.26.0
  Release 2.25.1
  Release 2.25.0
  Release 2.24.0
@Dietr Dietr requested a review from nvdk July 5, 2022 12:43
@elpoelma
Copy link
Contributor

Works well overall, maybe the 'Bestand acties' dropdown could contain entries in order to export the html of the current version or remove a specific version. Additionally, it would be nice that the 'Herstel versie' button is disabled when the most recent version is selected.

Dietr and others added 3 commits August 2, 2022 17:11
* master:
  allow clearing the secretary
  Release 2.28.2
  bump editor to 0.60.3 (#305)
  bump citation-plugin to 0.17.4
  only include relevant plugins for intro and outro text (#302)
  bump ember-rdfa-editor-rdfa-date-plugin to 0.2.1 (#301)
  bump editor to 0.60.1, required for citation plugin
  bump @lblod/ember-rdfa-editor-citaten-plugin to 0.17.3
@abeforgit abeforgit force-pushed the feature/rework-revision branch from d6b7901 to 5a43bd7 Compare August 12, 2022 08:39
@abeforgit abeforgit added the enhancement New feature or request label Aug 12, 2022
@nvdk nvdk marked this pull request as ready for review October 12, 2022 13:29
@nvdk nvdk force-pushed the feature/rework-revision branch from 249a74d to d2eed91 Compare October 12, 2022 13:32
@nvdk
Copy link
Member

nvdk commented Oct 12, 2022

the custom edit view in meeting is now gone, I've discussed this with dieter.

two things I've noticed:

  • attachment / revision count is not updating after uploading / saving.
  • getting two warnings instead of one when leaving agendapoint without saving

nvdk added 2 commits October 12, 2022 15:37
emacs does this sometimes 🤷
…elinkt-notuleren into feature/rework-revision
@@ -89,6 +85,7 @@ export default class AgendapointsEditController extends Controller {
editorDocument.updatedOn = new Date();
editorDocument.title = this.editorDocument.title;
editorDocument.previousVersion = this.editorDocument;
editorDocument.documentContainer = this.documentContainer;
Copy link
Member

Choose a reason for hiding this comment

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

this might get lost in the big lump, but this is a bug that will need a migration to correct on all environments. There's supposed to be a direct link between any version and the container and that was no longer being set.

nvdk and others added 4 commits October 12, 2022 16:07
a parent route is not reloaded when switching between child routes, since we
loaded currentVersion there this could become outdated after a save. This in
turn caused unexpected behaviour when switching between subroutes (e.g.
revisions and edit), where either fewer revisions were shown than actually
existed or an older version of the document was shown when returning to the edit route
@nvdk nvdk force-pushed the feature/rework-revision branch from f13cdc6 to 0ea7256 Compare October 12, 2022 19:16
@elpoelma
Copy link
Contributor

the custom edit view in meeting is now gone, I've discussed this with dieter.

two things I've noticed:

* [ ]  attachment / revision count is not updating after uploading / saving.

* [ ]  getting two warnings instead of one when leaving agendapoint without saving

I created a solution in order to prevent the double warnings on #342 .

Fix: prevent the confirm dialog to show up twice when exiting without saving
@nvdk nvdk merged commit 911485d into master Oct 14, 2022
@nvdk nvdk deleted the feature/rework-revision branch October 14, 2022 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants