um modifications.

docker/docker-compose-rest.yml

@@ -70,6 +70,7 @@ services:
     environment:
       PGDATA: /pgdata
     image: dspace/dspace-postgres-pgcrypto
+    platform: linux/amd64    
     networks:
       dspacenet:
     ports:

src/app/app-routing.module.ts

@@ -31,6 +31,8 @@ import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-
 import { SiteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard';
 import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
 import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
+//import { StaticPageComponent } from './static-page/static-page.component';
+
 import {
   GroupAdministratorGuard
 } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
@@ -72,6 +74,10 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
               .then((m) => m.CommunityListPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
+
+
+//{path:"static", component: StaticPageComponent},
+
           {
             path: 'id',
             loadChildren: () => import('./lookup-by-id/lookup-by-id.module')

src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html

@@ -40,6 +40,11 @@ <h2>{{'collection.edit.item-mapper.head' | translate}}</h2>
             </div>
 
             <div *ngIf="performedSearch">
+              {{'collection.edit.item-mapper.checkall-desc' | translate}}
+              <div class="checkbox">
+                 <input name="checkall" type="checkbox" value="onclick=checkUncheckAll(this);" (click)="checkUncheckAll(this)">
+              </div>
+
               <ds-item-select class="mt-2"
                 [key]="'map'"
                 [dsoRD$]="mappedItemsRD$"

src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts

@@ -283,4 +283,31 @@ export class CollectionItemMapperComponent implements OnInit {
     });
   }
 
+  /**
+   * This was a javascript function I brought over from 6.3
+   */
+  checkUncheckAll (form) {
+
+   var defaultedElements = document.getElementsByTagName("input");
+   var mapButton = document.getElementsByClassName("item-confirm");
+   var theElement;   
+   var event = new Event('change');
+
+   for (var i=0; i != defaultedElements.length; i++){
+    if ( defaultedElements[i].name == 'checkall'){
+        theElement = defaultedElements[i];
+    }
+   }
+
+   for (var i=0; i != defaultedElements.length; i++){
+    if (defaultedElements[i].type == 'checkbox'){
+        defaultedElements[i].checked=theElement.checked;
+        defaultedElements[i].setAttribute("ng-reflect-model", theElement.checked);
+        (mapButton[0] as HTMLButtonElement).disabled= !theElement.checked;
+
+        defaultedElements[i].dispatchEvent(event);
+    }
+   }
+ }
+
 }

src/app/collection-page/edit-collection-page/edit-collection-page.component.ts

@@ -4,6 +4,8 @@ import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-c
 import { Collection } from '../../core/shared/collection.model';
 import { getCollectionPageRoute } from '../collection-page-routing-paths';
 
+import { HttpClient} from '@angular/common/http';
+
 /**
  * Component that represents the page where a user can edit an existing Collection
  */
@@ -15,10 +17,11 @@ export class EditCollectionPageComponent extends EditComColPageComponent<Collect
   type = 'collection';
 
   public constructor(
+    protected http: HttpClient,
     protected router: Router,
     protected route: ActivatedRoute
   ) {
-    super(router, route);
+    super(http, router, route);
   }
 
   /**

src/app/community-page/edit-community-page/edit-community-page.component.ts

@@ -4,6 +4,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { getCommunityPageRoute } from '../community-page-routing-paths';
 
+import { HttpClient} from '@angular/common/http';
+
 /**
  * Component that represents the page where a user can edit an existing Community
  */
@@ -15,10 +17,11 @@ export class EditCommunityPageComponent extends EditComColPageComponent<Communit
   type = 'community';
 
   public constructor(
+    protected http: HttpClient,    
     protected router: Router,
     protected route: ActivatedRoute
   ) {
-    super(router, route);
+    super(http, router, route);
   }
 
   /**

src/app/core/core.module.ts

@@ -86,6 +86,7 @@ import { ItemType } from './shared/item-relationships/item-type.model';
 import { RelationshipType } from './shared/item-relationships/relationship-type.model';
 import { Relationship } from './shared/item-relationships/relationship.model';
 import { Item } from './shared/item.model';
+
 import { License } from './shared/license.model';
 import { ResourcePolicy } from './resource-policy/models/resource-policy.model';
 import { SearchConfigurationService } from './shared/search/search-configuration.service';
@@ -318,6 +319,7 @@ export const models =
     Bitstream,
     BitstreamFormat,
     Item,
+    ItemRequest,    
     Site,
     Collection,
     Community,

src/app/core/data/item-data.service.ts

@@ -149,10 +149,12 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    * @param item
    * @param withdrawn
    */
-  public setWithDrawn(item: Item, withdrawn: boolean): Observable<RemoteData<Item>> {
+
+//////  
+  public setWithDrawn(item: Item, withdrawn: boolean, reason: string): Observable<RemoteData<Item>> {
 
     const patchOperation = {
-      op: 'replace', path: '/withdrawn', value: withdrawn
+      op: 'replace', path: '/withdrawn', value: withdrawn, reason: reason      
     } as Operation;
     this.requestService.removeByHrefSubstring('/discover');
 

src/app/core/metadata/metadata.service.ts

@@ -167,6 +167,8 @@ export class MetadataService {
       this.setCitationDissertationNameTag();
     }
 
+    this.setRightsTag();
+
     // this.setCitationJournalTitleTag();
     // this.setCitationVolumeTag();
     // this.setCitationIssueTag();
@@ -210,6 +212,28 @@ export class MetadataService {
     this.addMetaTag('citation_title', value);
   }
 
+  private setRightsTag(): void {
+    const value = this.getMetaTagValue('dc.rights.robot');
+
+    let rights: string
+    if ( value === undefined )
+    {
+      rights = "index,nofollow";
+    }
+    else
+    {
+      if ( value === "IndexNoFollow" )
+      {
+        rights = "index,nofollow";
+      }
+      if ( value === "NoIndexNoFollow" )
+      {   
+        rights = "noindex,nofollow";
+      }   
+    }
+    this.addMetaTag('rights', rights);
+  }
+
   /**
    * Add <meta name="citation_author" ... >  to the <head>
    */

src/app/footer/footer.component.html

@@ -82,5 +82,59 @@ <h5 class="text-uppercase">Footer Content</h5>
       </ul>
     </div>
   </div>
+
+
+
+
+          <div class="text-white">
+            <div class="text-white">
+              <section>
+                <h2>University of Michigan Library</h2>
+                <ul>
+                  <li>
+                    <a  href="https://www.lib.umich.edu/">U-M Library</a>
+                  </li>
+                  <li>
+                    <a href="https://publishing.umich.edu/">Michigan Publishing</a>
+                  </li>
+                  <li>
+                    <a href="https://www.lib.umich.edu/about-us/about-library/diversity-equity-inclusion-and-accessibility/accessibility">Accessibility</a>
+                  </li>
+                </ul>
+              </section>
+
+              <section>
+                <h2>About Deep Blue Documents</h2>
+                <ul>
+                    <li>
+                        <a href="https://www.lib.umich.edu/collections/deep-blue-repositories">Deep Blue Repositories</a>
+                    </li>
+                    <li>
+                        <a href="info/feedback">Contact Us</a>
+                    </li>
+                    <li>
+                        <a href="assets/static/about/deepbluefaq.html">Frequently Asked Questions</a>
+                    </li>
+                </ul>
+              </section>
+
+              <section>
+                <h2>Privacy and copyright</h2>
+
+                <p><a href="https://lib.umich.edu/about-us/policies/library-privacy-statement">Library Privacy Statement</a></p>
+
+                <p>Works found in Deep Blue Documents are protected by copyright unless otherwise indicated.</p>
+              </section>
+            </div>
+          </div>
+          <div class="text-white">
+            <div class="text-white">
+               <p>©XXXXX Regents of the University of Michigan. Built with <a href="http://www.dspace.org/">DSpace</a></p>
+            </div>
+          </div>
+
+
+
+
   <!-- Copyright -->
 </footer>

src/app/info/feedback/feedback-form/feedback-form.component.html

@@ -17,6 +17,19 @@ <h2>{{ 'info.feedback.head' | translate }}</h2>
           <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
           <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
         </ng-container>
+
+        <div class="row">
+          <div class="control-group col-sm-12">
+            <label class="control-label" for="subject">{{ 'info.feedback.subject' | translate }}:&nbsp;</label>
+            <textarea id="subject" formControlName="subject" class="form-control" name="subject" cols="20" rows="1"> </textarea>
+          </div>
+        </div>
+        <ng-container *ngIf="feedbackForm.controls.subject.invalid && (feedbackForm.controls.subject.dirty || feedbackForm.controls.subject.touched)"
+          class="alert">
+          <ds-error *ngIf="feedbackForm.controls.subject.errors?.required" message="{{'info.feedback.error.subject.required' | translate}}"></ds-error>
+        </ng-container>
+
+
         <div class="row">
           <div class="control-group col-sm-12">
             <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>

src/app/info/feedback/feedback-form/feedback-form.component.ts

@@ -31,6 +31,7 @@ export class FeedbackFormComponent implements OnInit {
   feedbackForm = this.fb.group({
     email: ['', [Validators.required, Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$')]],
     message: ['', Validators.required],
+    subject: ['', Validators.required],    
     page: [''],
   });
 

src/app/item-page/alerts/item-alerts.component.html

@@ -5,8 +5,13 @@
     <div *ngIf="item && item.isWithdrawn" class="withdrawn-warning">
         <ds-alert [type]="AlertTypeEnum.Warning">
             <div class="d-flex justify-content-between flex-wrap">
-                <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
-                <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
+              <span *ngIf="!item.hasMetadata(['dc.description.withdrawalreason'])" class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
+              <span
+                *ngFor="let reason of item.allMetadataValues(['dc.description.withdrawalreason']); let last=last;">
+                <span [innerHTML]="reason"><span [innerHTML]="reason"></span></span>
+                <span *ngIf="!last">; </span>
+              </span>
+              <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
             </div>
         </ds-alert>
     </div>

src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html

@@ -62,9 +62,16 @@ <h3 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h3>
                 <div class="col-12">
                     <label
                             for="message">{{'bitstream-request-a-copy.message.label' | translate}}</label>
-                    <textarea rows="5"
-                              [className]="'form-control'"
-                              id="message" formControlName="message"></textarea>
+
+                    <textarea rows="5" [className]="(message.invalid) && (message.dirty || message.touched) ? 'form-control is-invalid' :'form-control'"
+                           id="message" formControlName="message"></textarea>
+                    <div *ngIf="message.invalid && (message.dirty || message.touched)"
+                         class="invalid-feedback show-feedback">
+                      <span *ngIf="message.errors && message.errors.required">
+                          {{ 'bitstream-request-a-copy.name.error' | translate }}
+                      </span>
+                    </div>
+
                 </div>
             </div>
         </div>

src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts

@@ -67,7 +67,9 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
         Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')]
       }),
       allfiles: new UntypedFormControl(''),
-      message: new UntypedFormControl(''),
+      message: new UntypedFormControl('', {
+        validators: [Validators.required],
+      }),
     });
 
 

src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts

@@ -33,7 +33,7 @@ export class ItemReinstateComponent extends AbstractSimpleItemActionComponent {
    * Perform the reinstate action to the item
    */
   performAction() {
-    this.itemDataService.setWithDrawn(this.item, false).pipe(getFirstCompletedRemoteData()).subscribe(
+    this.itemDataService.setWithDrawn(this.item, false, "").pipe(getFirstCompletedRemoteData()).subscribe(      
       (response: RemoteData<Item>) => {
         this.processRestResponse(response);
       }

src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts

@@ -19,6 +19,8 @@ import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
  */
 export class ItemWithdrawComponent extends AbstractSimpleItemActionComponent {
 
+  protected withdrawReason = "nothing"
+
   protected messageKey = 'withdraw';
   protected predicate = (rd: RemoteData<Item>) => rd.payload.isWithdrawn;
 
@@ -34,7 +36,9 @@ export class ItemWithdrawComponent extends AbstractSimpleItemActionComponent {
    * Perform the withdraw action to the item
    */
   performAction() {
-    this.itemDataService.setWithDrawn(this.item, true).pipe(getFirstCompletedRemoteData()).subscribe(
+    var reason:string = (document.getElementById("withdrawReason") as HTMLInputElement).value
+    console.log("The reason = " + reason)
+    this.itemDataService.setWithDrawn(this.item, true, reason).pipe(getFirstCompletedRemoteData()).subscribe(
       (response: RemoteData<Item>) => {
         this.processRestResponse(response);
       }

src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html

@@ -5,6 +5,19 @@ <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
             <p>{{descriptionMessage | translate}}</p>
             <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
           <div class="space-children-mr">
+
+            <div *ngIf="!item.isWithdrawn ">
+                <div>
+                  <label>Withdrawal Reason:&nbsp;</label>
+                  <select id="withdrawReason">
+                    <option value="Removed from view by legal order.">Removed from view by legal order.</option>
+                    <option value="Removed from view by the University.">Removed from view by the University.</option>
+                    <option value="Removed from view at request of the author.">Removed from view at request of the author.</option>
+                  </select>
+                </div>
+                <p></p>
+            </div>
+
             <button (click)="performAction()" class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
             </button>
             <button [routerLink]="[itemPageRoute, 'edit']" class="btn btn-outline-secondary cancel">