umich initial release 7.6.0.0 - blancoj

.gitignore

@@ -1,3 +1,8 @@
+# Ignore Greg's Agent Framework local settings and agents.
+#   This is a symbolic link to the actual directory,
+#   which is located outside of the repository.
+.agents
+
 /.angular/cache
 /__build__
 /__server_build__
@@ -18,6 +23,7 @@ npm-debug.log
 *.ngfactory.ts
 *.css.shim.ts
 *.scss.shim.ts
+*.backup
 
 .DS_Store
 
@@ -29,7 +35,7 @@ morgan.log
 
 yarn-error.log
 
-*.css
+#*.css
 
 package-lock.json
 
@@ -41,3 +47,6 @@ package-lock.json
 junit.xml
 
 /src/mirador-viewer/config.local.js
+
+config/config.development.yaml
+

angular.json

@@ -41,7 +41,8 @@
             "aot": true,
             "assets": [
               "src/assets",
-              "src/robots.txt"
+              "src/robots.txt",
+              "src/clockss.txt"
             ],
             "styles": [
               "src/styles/startup.scss",

config/config.example.yml

@@ -75,7 +75,7 @@ cache:
     anonymousCache:
       # Maximum number of pages to cache. Default is zero (0) which means anonymous user cache is disabled.
       # As all pages are cached in server memory, increasing this value will increase memory needs.
-      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory. 
+      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory.
       max: 0
       # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
       # copy is automatically refreshed on the next request.
@@ -100,6 +100,11 @@ auth:
     # If the rest token expires in less than this amount of time, it will be refreshed automatically.
     # This is independent from the idle warning.
     timeLeftBeforeTokenRefresh: 120000 # 2 minutes
+  # When true, show only the username/password login form and hide all non-password authentication methods.
+  # Set to true only in environments where password login should be the only login option (e.g. demo).
+  # Default: false (non-password authentication methods such as OIDC/LDAP/X509 remain available, password form hidden).
+  # Can also be set via environment variable: DSPACE_AUTH_SHOWPASSWORDLOGIN=true
+  # showPasswordLogin: false
 
 # Form settings
 form:
@@ -246,12 +251,15 @@ browseBy:
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
   # If true, thumbnail images for items will be added to BOTH search and browse result lists.
-  showThumbnails: true
+  showThumbnails: false
   # The number of entries in a paginated browse results list.
   # Rounded to the nearest size in the list of selectable sizes on the
   # settings menu.
   pageSize: 20
 
+  # Show the Altmetric badge in the simple item page.
+  showAltmetricBadge: true
+
 communityList:
   # No. of communities to list per expansion (show more)
   pageSize: 20
@@ -376,7 +384,7 @@ vocabularies:
     vocabulary: 'srsc'
     enabled: true
 
-# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. 
+# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query.
 comcolSelectionSort:
   sortField: 'dc.title'
-  sortDirection: 'ASC'
+  sortDirection: 'ASC'

config/config.yml

@@ -1,5 +1,9 @@
+ui:
+  host: 0.0.0.0
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: backend.production.deepblue-documents.lib.umich.edu
   port: 443
   nameSpace: /server
+item:
+  showAltmetricBadge: true

docker/docker-compose-rest.yml

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

server.ts

@@ -69,6 +69,16 @@ const cookieParser = require('cookie-parser');
 
 const appConfig: AppConfig = buildAppConfig(join(DIST_FOLDER, 'assets/config.json'));
 
+// List of paths for SSR; you can use regex for more flexibility if needed
+const ssrPaths = [
+  '/documents',
+  '/items/',
+  '/collections/',
+  '/communities/',
+  '/bitstream/',
+  '/bitstreams/'
+];
+
 // cache of SSR pages for known bots, only enabled in production mode
 let botCache: LRU<string, any>;
 
@@ -78,6 +88,15 @@ let anonymousCache: LRU<string, any>;
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
+
+// Helper function to extract client IP
+function getClientIp(req) {
+  // Extracting IP from X-Forwarded-For if available
+  const xForwardedFor = req.headers['x-forwarded-for'];
+  return xForwardedFor ? xForwardedFor.split(',')[0] : req.connection.remoteAddress;
+}
+
+
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
 
@@ -90,7 +109,9 @@ export function app() {
 
   // Tell Express to trust X-FORWARDED-* headers from proxies
   // See https://expressjs.com/en/guide/behind-proxies.html
-  server.set('trust proxy', environment.ui.useProxies);
+  // server.set('trust proxy', environment.ui.useProxies);
+server.set('trust proxy', true);
+
 
   /*
    * If production mode is enabled in the environment file:
@@ -130,6 +151,7 @@ export function app() {
   server.engine('html', (_, options, callback) =>
     ngExpressEngine({
       bootstrap: ServerAppModule,
+      inlineCriticalCss: false,
       providers: [
         {
           provide: REQUEST,
@@ -159,12 +181,26 @@ export function app() {
    * Serve the robots.txt ejs template, filling in the origin variable
    */
   server.get('/robots.txt', (req, res) => {
+    const clientIp = getClientIp(req);
+    console.log(`Client IP: ${clientIp}`);    
+
     res.setHeader('content-type', 'text/plain');
     res.render('assets/robots.txt.ejs', {
       'origin': req.protocol + '://' + req.headers.host
     });
   });
 
+  server.get('/clockss.txt', (req, res) => {
+    const clientIp = getClientIp(req);
+    console.log(`Client IP: ${clientIp}`);    
+
+    res.setHeader('content-type', 'text/plain');
+    res.render('assets/clockss.txt.ejs', {
+      'origin': req.protocol + '://' + req.headers.host
+    });
+  });
+
+
   /*
    * Set views folder path to directory where template files are stored
    */
@@ -227,25 +263,84 @@ export function app() {
    */
   router.get('*', cacheCheck, ngApp);
 
+
   server.use(environment.ui.nameSpace, router);
 
+server.set('trust proxy', true);
+
   return server;
 }
 
+// Check if the request URL starts with any of the SSR paths
+function shouldUseSSR(url) {
+  // First, check for the browse exclusion patterns
+  const browseBlacklistRegexes = [
+    /^\/communities\/[a-f0-9-]{36}\/browse(\/.*)?$/i,
+    /^\/collections\/[a-f0-9-]{36}\/browse(\/.*)?$/i,
+  ];
+
+  // If the URL contains 'handle' anywhere, return false
+  if (/\/handle(\/|$)/i.test(url)) {
+    return false;
+  }
+
+  // If the URL contains '/2027.42' anywhere, return false
+  if (/\/2027\.42(\/|$)/i.test(url)) {
+    return false;
+  }
+
+  // If the url matches any exclusion, do NOT use SSR
+  if (browseBlacklistRegexes.some(regex => regex.test(url))) {
+    return false;
+  }
+
+  // Otherwise
+  return ssrPaths.some(path => url.startsWith(path));
+}
+
+
 /*
  * The callback function to serve server side angular
  */
 function ngApp(req, res) {
-  if (environment.universal.preboot) {
-    // Render the page to user via SSR (server side rendering)
+
+  console.log('SSR: Original Request= ' + req.url);
+
+  // If URL contains '/assets/', redirect to Deep Blue Repositories
+  if (req.url.includes('/assets/')) {
+    res.writeHead(404, {
+      'Location': 'https://www.lib.umich.edu/collections/deep-blue-repositories'
+    });
+    res.end();
+    return; // Exit after redirecting
+
+  }
+
+  if (
+    req.url.includes('/discover') ||
+    req.url.includes('/Mirage2') ||
+    req.url.includes('/feed/') ||
+    req.url.includes('/search-filter')
+  ) {
+    res.writeHead(404, {
+      'Location': 'https://www.lib.umich.edu/collections/deep-blue-repositories'
+    });
+    res.end();
+    return; // Exit after redirecting
+  } 
+
+  if (environment.universal.preboot && req.method === 'GET' && shouldUseSSR(req.url)) {
+    // Only run SSR for matching paths
+    console.log('SSR: Using SSR= ' + req.url);
     serverSideRender(req, res);
   } else {
-    // If preboot is disabled, just serve the client
-    console.log('Universal off, serving for direct client-side rendering (CSR)');
+    // For all other paths, serve CSR
+    console.log('SSR:Universal off or path excluded. Serving direct client-side rendering (CSR)' + req.url);
     clientSideRender(req, res);
   }
 }
 
+
 /**
  * Render page content on server side using Angular SSR. By default this page content is
  * returned to the user.
@@ -255,6 +350,22 @@ function ngApp(req, res) {
  * If false, then only save this rendered content to the in-memory cache (to refresh cache).
  */
 function serverSideRender(req, res, sendToUser: boolean = true) {
+
+
+  // Check if 'X-Forwarded-For' is set; if not, set it to the request's IP address.
+const xForwardedForHeader = req.headers['x-forwarded-for'];
+
+console.log("xForwardedForHeader=" + xForwardedForHeader);
+
+if (!xForwardedForHeader) {
+  // Consider appending instead if chaining proxies
+  console.log("req.ip=" + req.ip);
+
+  // Example of appending to support proxy chains:
+  req.headers['x-forwarded-for'] = req.ip;
+}
+
+
   // Render the page via SSR (server side rendering)
   res.render(indexHtml, {
     req,
@@ -535,7 +646,7 @@ function createHttpsServer(keys) {
 
 function run() {
   const port = environment.ui.port || 4000;
-  const host = environment.ui.host || '/';
+  const host = '0.0.0.0';
 
   // Start up the Node server
   const server = app();

src/app/access-control/epeople-registry/epeople-registry.component.html

@@ -5,7 +5,7 @@
         <h2 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h2>
 
         <div *ngIf="!isEPersonFormShown">
-          <button class="mr-auto btn btn-success addEPerson-button"
+          <button class="mr-auto btn btn-info addEPerson-button"
                   (click)="isEPersonFormShown = true">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ml-1">{{labelPrefix + 'button.add' | translate}}</span>

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html

@@ -38,7 +38,6 @@ <h4>{{messagePrefix + '.edit' | translate}}</h4>
 </ds-form>
 
 <ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
-
 <div *ngIf="epersonService.getActiveEPerson() | async">
   <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
 
@@ -71,7 +70,7 @@ <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
             {{ dsoNameService.getName(group) }}
           </a>
           </td>
-          <td class="align-middle">{{ dsoNameService.getName(undefined) }}</td>
+          <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload) }}</td>
         </tr>
         </tbody>
       </table>

src/app/access-control/group-registry/groups-registry.component.html

@@ -4,7 +4,7 @@
       <div class="d-flex justify-content-between border-bottom mb-3">
         <h2 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h2>
         <div>
-          <button class="mr-auto btn btn-success"
+          <button class="mr-auto btn btn-info"
                   [routerLink]="['newGroup']">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ml-1">{{messagePrefix + 'button.add' | translate}}</span>

src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts

@@ -25,7 +25,7 @@ describe('AddBitstreamFormatComponent', () => {
   bitstreamFormat.shortDescription = 'Unknown';
   bitstreamFormat.description = 'Unknown data format';
   bitstreamFormat.mimetype = 'application/octet-stream';
-  bitstreamFormat.supportLevel = BitstreamFormatSupportLevel.Unknown;
+  bitstreamFormat.supportLevel = BitstreamFormatSupportLevel.AS_IS_UNKNOWN;
   bitstreamFormat.internal = false;
   bitstreamFormat.extensions = null;
 

src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html

@@ -5,7 +5,7 @@
       <h2 id="header" class="border-bottom pb-2 ">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
 
       <p id="description">{{'admin.registries.bitstream-formats.description' | translate}}</p>
-      <p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
+      <p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-info">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
 
 
       <ds-pagination

src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts

@@ -41,7 +41,7 @@ describe('BitstreamFormatsComponent', () => {
   bitstreamFormat1.shortDescription = 'Unknown';
   bitstreamFormat1.description = 'Unknown data format';
   bitstreamFormat1.mimetype = 'application/octet-stream';
-  bitstreamFormat1.supportLevel = BitstreamFormatSupportLevel.Unknown;
+  bitstreamFormat1.supportLevel = BitstreamFormatSupportLevel.AS_IS_UNKNOWN;
   bitstreamFormat1.internal = false;
   bitstreamFormat1.extensions = null;
 
@@ -51,7 +51,7 @@ describe('BitstreamFormatsComponent', () => {
   bitstreamFormat2.shortDescription = 'License';
   bitstreamFormat2.description = 'Item-specific license agreed upon to submission';
   bitstreamFormat2.mimetype = 'text/plain; charset=utf-8';
-  bitstreamFormat2.supportLevel = BitstreamFormatSupportLevel.Known;
+  bitstreamFormat2.supportLevel = BitstreamFormatSupportLevel.AS_IS_KNOWN;
   bitstreamFormat2.internal = true;
   bitstreamFormat2.extensions = null;
 
@@ -61,7 +61,7 @@ describe('BitstreamFormatsComponent', () => {
   bitstreamFormat3.shortDescription = 'CC License';
   bitstreamFormat3.description = 'Item-specific Creative Commons license agreed upon to submission';
   bitstreamFormat3.mimetype = 'text/html; charset=utf-8';
-  bitstreamFormat3.supportLevel = BitstreamFormatSupportLevel.Supported;
+  bitstreamFormat3.supportLevel = BitstreamFormatSupportLevel.HIGHEST_LEVEL;
   bitstreamFormat3.internal = true;
   bitstreamFormat3.extensions = null;
 
@@ -71,7 +71,7 @@ describe('BitstreamFormatsComponent', () => {
   bitstreamFormat4.shortDescription = 'Adobe PDF';
   bitstreamFormat4.description = 'Adobe Portable Document Format';
   bitstreamFormat4.mimetype = 'application/pdf';
-  bitstreamFormat4.supportLevel = BitstreamFormatSupportLevel.Unknown;
+  bitstreamFormat4.supportLevel = BitstreamFormatSupportLevel.AS_IS_UNKNOWN;
   bitstreamFormat4.internal = false;
   bitstreamFormat4.extensions = null;