Merge branch 'main' into STRIPES-861-int

Author: JohnC-80

CHANGELOG.md

@@ -34,6 +34,10 @@
 * Load modules in parallel for greater efficiency. Refs STCOR-1021.
 * Increase default timeout to 60 seconds in useOkapiKy.js to match the value in Kong. Refs STCOR-1022.
 * Add `tr` Türkçe (Turkish) locale. Refs STCOR-1026.
+* Remove the `/users-keycloak/_self` (and `/bl-users/_self`) requests. They were included in `isAuthenticationRequest`, which caused them to bypass the RTR queue (`getPromise`). Fixes STCOR-1029.
+* Define a permission-set containing values necessary for session-init API requests. Refs STCOR-1031.
+* FOLIO Landing Page > Display text to link to FOLIO release notes. Refs STCOR-1017.
+* Settings > System Information > Add a link to Release Notes. Refs STCOR-1018.
 
 ## [11.0.0](https://github.com/folio-org/stripes-core/tree/v11.0.0) (2025-02-24)
 [Full Changelog](https://github.com/folio-org/stripes-core/compare/v10.2.0...v11.0.0)

package.json

@@ -31,6 +31,7 @@
     },
     "optionalOkapiInterfaces": {
       "consortia": "1.0",
+      "locale": "1.0",
       "login-saml": "2.0",
       "roles": "1.1",
       "users-keycloak": "1.0"
@@ -59,6 +60,17 @@
         "permissionName": "mod-settings.global.write.stripes-core.prefs.manage",
         "displayName": "UI: update the tenant's preferences",
         "visible": false
+      },
+      {
+        "permissionName": "stripes-core.settings.read",
+        "displayName": "UI: read global tenant and user settings",
+        "visible": false,
+        "subPermissions": [
+          "mod-settings.owner.read.stripes-core.prefs.manage",
+          "mod-settings.global.read.stripes-core.prefs.manage",
+          "mod-settings.entries.collection.get",
+          "locale.item.get"
+        ]
       }
     ]
   },

src/components/Front.css

@@ -9,6 +9,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  flex-direction: column;
 }
 
 h1.frontTitle {
@@ -23,3 +24,11 @@ h1.frontTitle {
     font-size: var(--font-size-large);
   }
 }
+
+.releaseNotesWrap {
+  font-size: var(--font-size-large);
+  font-weight: var(--text-weight-bold);
+  text-align: center;
+  color: var(--color-link);
+  margin-top: -10px;
+}

src/components/Front.js

@@ -5,6 +5,7 @@ import { Headline } from '@folio/stripes-components';
 import { FormattedMessage } from 'react-intl';
 
 import Pluggable from '../Pluggable';
+import ReleaseNotesLink from './ReleaseNotesLink';
 
 import css from './Front.css';
 
@@ -15,6 +16,10 @@ const Front = ({ stripes }) => {
     <Pluggable type="frontpage">
       <div className={css.frontWrap}>
         <Headline faded tag="h1" margin="none" className={css.frontTitle}><FormattedMessage id={tag} /></Headline>
+
+        <div className={css.releaseNotesWrap}>
+          <ReleaseNotesLink label={<FormattedMessage id="stripes-core.releaseNotes.front" />} />
+        </div>
       </div>
     </Pluggable>
   );

src/components/ReleaseNotesLink/ReleaseNotesLink.css

@@ -0,0 +1,14 @@
+@import "@folio/stripes-components/lib/variables.css";
+
+.ReleaseNotesLink {
+  color: inherit;
+
+  &:visited {
+    color: inherit;
+  }
+
+  & span {
+    color: var(--color-link);
+    margin-left: 5px;
+  };
+}

src/components/ReleaseNotesLink/ReleaseNotesLink.js

@@ -0,0 +1,29 @@
+import PropTypes from 'prop-types';
+
+import { Icon } from '@folio/stripes-components';
+
+import css from './ReleaseNotesLink.css';
+
+const ReleaseNotesLink = ({ label }) => {
+  return (
+    <a
+      href="https://folio-org.atlassian.net/wiki/spaces/REL/overview#Release-notes"
+      target="_blank"
+      rel="noopener noreferrer"
+      className={css.ReleaseNotesLink}
+    >
+      {label}
+
+      <Icon icon="external-link" />
+    </a>
+  );
+};
+
+ReleaseNotesLink.propTypes = {
+  label: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.node,
+  ]).isRequired,
+};
+
+export default ReleaseNotesLink;

src/components/ReleaseNotesLink/index.js

@@ -0,0 +1 @@
+export { default } from './ReleaseNotesLink';

src/components/Root/FFetch.js

@@ -55,6 +55,7 @@ import {
   isAuthenticationRequest,
   isFolioApiRequest,
   isLogoutRequest,
+  isValidSessionCheckRequest,
   rtr,
 } from './token-util';
 import {
@@ -88,6 +89,7 @@ export class FFetch {
     this.rtrConfig = rtrConfig;
     this.okapi = okapi;
     this.focusEventSet = false;
+    this.rtrScheduled = false; // Track if RTR has been scheduled in this tab
     this.bc = new BroadcastChannel(RTR_ACTIVE_WINDOW_MSG_CHANNEL);
     this.setWindowIdMessageEvent();
     this.setDocumentFocusHandler();
@@ -309,8 +311,11 @@ export class FFetch {
     if (isFolioApiRequest(resource, this.okapi.url)) {
       this.logger.log('rtrv', 'will fetch', resource);
 
-      // on authentication, grab the response to kick of the rotation cycle,
-      // then return the response
+      // on authentication (login), grab the response to kick off the rotation cycle,
+      // then return the response.
+      // Note: _self endpoints are NOT included here - they go through the normal
+      // RTR queue (getPromise) so they wait for any in-progress rotation to complete.
+      // This prevents 401 errors for _self requests in-flight during RTR.
       if (isAuthenticationRequest(resource, this.okapi.url)) {
         this.logger.log('rtr', 'authn request', resource);
         return this.nativeFetch.apply(global, [resource, options && { ...options, ...OKAPI_FETCH_OPTIONS }])
@@ -351,6 +356,29 @@ export class FFetch {
           });
       }
 
+      // This block is only used to start RTR (rotateCallback) for new browser tabs.
+      // New tabs inherit only AT from the login session and don't start RTR timer to get RT.
+      // The first successful response will trigger rotateCallback to schedule RTR,
+      // preventing 401 errors when AT expires.
+      if (isValidSessionCheckRequest(resource, this.okapi.url)) {
+        this.logger.log('rtr', 'session check request', resource);
+        return getPromise(this.logger)
+          .then(() => {
+            this.logger.log('rtrv', 'post-rtr session check fetch', resource);
+            return this.nativeFetch.apply(global, [resource, options && { ...options, ...OKAPI_FETCH_OPTIONS }]);
+          })
+          .then(res => {
+            // On first successful session check, trigger rotateCallback to ensure
+            // RTR is scheduled (only once per tab)
+            if (res.ok && !this.rtrScheduled) {
+              this.logger.log('rtr', 'session check success, scheduling RTR (first time)');
+              this.rotateCallback();
+              this.rtrScheduled = true;
+            }
+            return res;
+          });
+      }
+
       return getPromise(this.logger)
         .then(() => {
           this.logger.log('rtrv', 'post-rtr-fetch', resource);