delay linking attachments for wiki pages

app/controllers/wiki_controller.rb

@@ -185,8 +185,6 @@ class WikiController < ApplicationController
 
     @page.attach_files(permitted_params.attachments.to_h)
 
-    return if nothing_to_update?
-
     @page.title = permitted_params.wiki_page[:title]
     @page.parent_id = permitted_params.wiki_page[:parent_id].to_i
     @content.attributes = permitted_params.wiki_content
@@ -378,22 +376,6 @@ class WikiController < ApplicationController
 
   private
 
-  def nothing_to_update?
-    return false if @page.new_record?
-    if anything_to_update?
-      render_attachment_warning_if_needed(@page)
-      # don't save if text wasn't changed
-      redirect_to_show
-      true
-    end
-  end
-
-  def anything_to_update?
-    params[:content].present? &&
-      @content.text == permitted_params.wiki_content[:text] &&
-      @page.parent_id == permitted_params.wiki_page[:parent_id].to_i
-  end
-
   def locked?
     return false if editable?
 

frontend/src/app/components/attachments/attachment-list/attachment-list-item.component.ts

@@ -40,6 +40,7 @@ import {States} from 'core-components/states.service';
 export class AttachmentListItemComponent {
   @Input('resource') public resource:HalResource;
   @Input('attachment') public attachment:any;
+  @Input() public index:any;
 
   public text = {
     destroyConfirmation: this.I18n.t('js.text_attachment_destroy_confirmation'),

frontend/src/app/components/attachments/attachment-list/attachment-list-item.html

@@ -22,4 +22,6 @@
     <op-icon icon-classes="icon-delete"
              [icon-title]="text.removeFile({fileName: attachment.fileName})"></op-icon>
   </a>
+
+  <input type="hidden" name="attachments[{{index}}][id]" value="{{attachment.id}}" *ngIf="!attachment.container">
 </li>

frontend/src/app/components/attachments/attachment-list/attachment-list.html

@@ -1,6 +1,6 @@
 <div class="work-package--attachments--files" *ngIf="resource">
   <ul class="form--selected-value--list"
-      *ngFor="let attachment of resource.attachments.elements">
-    <attachment-list-item [attachment]="attachment" [resource]="resource"></attachment-list-item>
+      *ngFor="let attachment of resource.attachments.elements; let i = index;">
+    <attachment-list-item [attachment]="attachment" [resource]="resource" [index]="i"></attachment-list-item>
   </ul>
 </div>

frontend/src/app/components/attachments/attachments-upload/attachments-upload.component.ts

@@ -62,12 +62,6 @@ export class AttachmentsUploadComponent implements OnInit {
   ngOnInit() {
     this.$element = jQuery(this.elementRef.nativeElement);
 
-    if (!this.resource) {
-      // Parse the resource if any exists
-      const source = this.$element.data('resource');
-      this.resource = this.halResourceService.createHalResource(source, true);
-    }
-
     this.ConfigurationService.api().then((settings:any) => {
       this.maxFileSize = settings.maximumAttachmentFileSize;
     });

frontend/src/app/components/ckeditor/op-ckeditor-form.component.ts

@@ -145,7 +145,7 @@ export class OpCkeditorFormComponent implements OnInit, OnDestroy {
 
   private setupAttachmentAddedCallback() {
     this.ckeditor.model.on('op:attachment-added', () => {
-      this.states.wikiPages.get(this.resource!.id).putValue(this.resource);
+      this.states.wikiPages.get(this.resource!.id).putValue(this.resource!);
     });
   }
 

frontend/src/app/modules/hal/resources/mixins/attachable-mixin.ts

@@ -50,6 +50,8 @@ export function Attachable<TBase extends Constructor<HalResource>>(Base:TBase) {
     private opFileUpload:OpenProjectFileUploadService;
     private pathHelper:PathHelperService;
 
+    private attachmentsLinkImmediately:boolean;
+
     /**
      * Remove the given attachment either from the pending attachments or from
      * the attachment collection, if it is a resource.
@@ -103,7 +105,7 @@ export function Attachable<TBase extends Constructor<HalResource>>(Base:TBase) {
     private performUpload(files:UploadFile[]) {
       let href = '';
 
-      if (!this.id) {
+      if (!this.id || !this.attachmentsLinkImmediately) {
         href = this.pathHelper.api.v3.attachments.path;
       } else {
         href = this.addAttachment.$link.href;

frontend/src/app/modules/hal/resources/wiki-page-resource.ts

@@ -35,9 +35,11 @@ export interface WikiPageResourceLinks {
 
 class WikiPageBaseResource extends HalResource {
   public $links:WikiPageResourceLinks;
+
+  private attachmentsLinkImmediately = false;
 }
 
 export const WikiPageResource = Attachable(WikiPageBaseResource);
 
-export interface WikiPageResource extends WikiPageBaseResource {
+export interface WikiPageResource extends HalResource {
 }