Added UI KIT changes for Identity server version 11.4.0

.github/workflows/lwa-github-ci-workflow.yml

@@ -4,10 +4,12 @@ on:
   push:
     paths:
       - 'src/haapi-react-app/**'
+      - 'src/haapi-react-sdk/**'
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - 'src/haapi-react-app/**'
+      - 'src/haapi-react-sdk/**'
   workflow_dispatch:
 
 jobs:
@@ -30,16 +32,28 @@ jobs:
       - name: Install Dependencies
         run: npm ci
 
-      - name: Check Formatting
+      - name: SDK — Check Formatting
+        run: npm run prettier-check -w src/haapi-react-sdk
+
+      - name: SDK — Lint
+        run: npm run lint -w src/haapi-react-sdk
+
+      - name: SDK — Typecheck
+        run: npm run typecheck -w src/haapi-react-sdk
+
+      - name: SDK — Run Tests
+        run: npm run test -w src/haapi-react-sdk -- run
+
+      - name: App — Check Formatting
         run: npm run prettier-check -w src/haapi-react-app
 
-      - name: Lint Code
+      - name: App — Lint
         run: npm run lint -w src/haapi-react-app
 
-      - name: Build Project
+      - name: App — Build Project
         run: npm run build:haapi-react-app
 
-      - name: Run Tests
+      - name: App — Run Tests
         run: npm run test -w src/haapi-react-app -- run
 
   notify-slack:

README.md

@@ -103,6 +103,12 @@ To deploy build artifacts (assets, templates, and messages) to a production envi
    ```shell
    npm run build
    ```
+
+   Or build specific projects with `npm run build:<project>` to deploy only those, e.g.:
+   ```shell
+   npm run build:ssp
+   npm run build:haapi-react-app
+   ```
 
 ### Deployment Options
 
@@ -113,6 +119,7 @@ To deploy build artifacts (assets, templates, and messages) to a production envi
 This deploys:
 - Identity Server assets, templates, and messages
 - Self Service Portal to `templates/overrides` and `messages/overrides`
+- HAAPI React App assets to the global `webroot/assets`, with its loader fragment in `templates/overrides`
 
 **Deploy to a specific template area:**
 ```shell
@@ -121,6 +128,7 @@ This deploys:
 This deploys:
 - Identity Server assets, templates, and messages
 - Self Service Portal only to the specified template area (not to overrides)
+- HAAPI React App assets to the global `webroot/assets`, with its loader fragment in the specified template area
 
 ### What Gets Deployed
 
@@ -133,5 +141,9 @@ This deploys:
 - Templates → `${IDSVR_HOME}/usr/share/templates/overrides/apps/self-service-portal` or `template-areas/{area}/apps/self-service-portal`
 - Messages → `${IDSVR_HOME}/usr/share/messages/overrides/{language}/apps/self-service-portal` or `template-areas/{area}/{language}/apps/self-service-portal`
 
+**HAAPI React App:**
+- Assets → `${IDSVR_HOME}/usr/share/webroot/assets/{js,css}`, preserving content-hashed filenames so different builds can coexist
+- Assets fragment → `${IDSVR_HOME}/usr/share/templates/overrides/fragments/api-driven-ui/assets.vm` or `template-areas/{area}/fragments/api-driven-ui/assets.vm`, rewritten to point at the deployed assets
+
 ## License
 Licensed under the Apache License, Version 2.0. See [LICENSE](LICENSE).

deploy.sh

@@ -7,7 +7,7 @@
 #
 # Prerequisites:
 # - Set IDSVR_HOME environment variable to your Identity Server installation directory
-# - Run the build process before deploying: npm run build
+# - Run the build process before deploying
 #
 # Usage:
 #   ./deploy.sh [template-area-name]
@@ -63,6 +63,16 @@ copy_with_feedback() {
     fi
 }
 
+# Exit with an error if the given template area does not exist
+assert_template_area_exists() {
+    local area=$1
+
+    if [ ! -d "$IDSVR_HOME/usr/share/templates/template-areas/$area" ]; then
+        echo -e "${RED}Error: Template area '$area' does not exist in $IDSVR_HOME/usr/share/templates/template-areas/${NC}"
+        exit 1
+    fi
+}
+
 echo "================================================"
 echo "Identity Server Deployment"
 echo "================================================"
@@ -98,16 +108,11 @@ else
     if [ -n "$TEMPLATE_AREA" ]; then
         # Deploy to specific template area only
         echo -e "${YELLOW}Deploying Self Service Portal to template area: $TEMPLATE_AREA${NC}"
+        assert_template_area_exists "$TEMPLATE_AREA"
 
         USSP_TEMPLATE_PATH="$IDSVR_HOME/usr/share/templates/template-areas/$TEMPLATE_AREA/apps/self-service-portal"
         USSP_MESSAGES_BASE="$IDSVR_HOME/usr/share/messages/template-areas/$TEMPLATE_AREA"
 
-        # Check if template area exists
-        if [ ! -d "$IDSVR_HOME/usr/share/templates/template-areas/$TEMPLATE_AREA" ]; then
-            echo -e "${RED}Error: Template area '$TEMPLATE_AREA' does not exist in $IDSVR_HOME/usr/share/templates/template-areas/${NC}"
-            exit 1
-        fi
-
         mkdir -p "$USSP_TEMPLATE_PATH"
         cp src/self-service-portal/app/dist/index.html "$USSP_TEMPLATE_PATH/index.vm"
         cp -r src/self-service-portal/app/dist/assets "$USSP_TEMPLATE_PATH/" 2>/dev/null || true
@@ -151,6 +156,56 @@ else
     fi
 fi
 
+echo ""
+echo "================================================"
+echo "HAAPI React App Deployment"
+echo "================================================"
+
+# HAAPI React App - Check if dist exists
+if [ ! -d "src/haapi-react-app/dist/assets" ]; then
+    echo -e "${YELLOW}⚠ HAAPI React App build not found. Skipping HAAPI React App deployment.${NC}"
+    echo -e "${YELLOW}  Run 'npm run build:haapi-react-app' first if you want to deploy the HAAPI React App.${NC}"
+else
+    # Locate the content-hashed entry bundles produced by Vite
+    HAAPI_REACT_APP_JS_FILE=$(ls src/haapi-react-app/dist/assets/index-*.js 2>/dev/null | head -n1)
+    HAAPI_REACT_APP_CSS_FILE=$(ls src/haapi-react-app/dist/assets/index-*.css 2>/dev/null | head -n1)
+
+    if [ -z "$HAAPI_REACT_APP_JS_FILE" ] || [ -z "$HAAPI_REACT_APP_CSS_FILE" ]; then
+        echo -e "${YELLOW}⚠ HAAPI React App build output is incomplete (missing JS or CSS bundle). Skipping HAAPI React App deployment.${NC}"
+    else
+
+        # Assets always go to the global webroot.
+        # Rename the "index-" prefix to "api-driven-ui-" while keeping Vite's content hash,
+        # so the deployed assets are recognisable and different builds still coexist.
+        HAAPI_REACT_APP_JS_NAME="api-driven-ui-$(basename "$HAAPI_REACT_APP_JS_FILE" | sed 's/^index-//')"
+        HAAPI_REACT_APP_CSS_NAME="api-driven-ui-$(basename "$HAAPI_REACT_APP_CSS_FILE" | sed 's/^index-//')"
+
+        HAAPI_WEBROOT_ASSETS="$IDSVR_HOME/usr/share/webroot/assets"
+        mkdir -p "$HAAPI_WEBROOT_ASSETS/js" "$HAAPI_WEBROOT_ASSETS/css"
+        cp "$HAAPI_REACT_APP_JS_FILE" "$HAAPI_WEBROOT_ASSETS/js/$HAAPI_REACT_APP_JS_NAME"
+        cp "$HAAPI_REACT_APP_CSS_FILE" "$HAAPI_WEBROOT_ASSETS/css/$HAAPI_REACT_APP_CSS_NAME"
+        echo -e "${GREEN}✓ HAAPI React App assets deployed to webroot/assets ($HAAPI_REACT_APP_JS_NAME, $HAAPI_REACT_APP_CSS_NAME)${NC}"
+
+        # The asset-include fragment is overridable per template location. Always (re)write it to
+        # point at the hashed filenames just deployed (overrides by default, template area when given).
+        if [ -n "$TEMPLATE_AREA" ]; then
+            echo -e "${YELLOW}Deploying HAAPI React App asset fragment to template area: $TEMPLATE_AREA${NC}"
+            assert_template_area_exists "$TEMPLATE_AREA"
+            HAAPI_FRAGMENT_DIR="$IDSVR_HOME/usr/share/templates/template-areas/$TEMPLATE_AREA/fragments/api-driven-ui"
+        else
+            echo -e "${YELLOW}Deploying HAAPI React App asset fragment to overrides...${NC}"
+            HAAPI_FRAGMENT_DIR="$IDSVR_HOME/usr/share/templates/overrides/fragments/api-driven-ui"
+        fi
+
+        mkdir -p "$HAAPI_FRAGMENT_DIR"
+        cat > "$HAAPI_FRAGMENT_DIR/assets.vm" <<EOF
+<script type="module" crossorigin src="\$!_staticResourceRootPath/assets/js/$HAAPI_REACT_APP_JS_NAME\$!_cacheBustingQuery"></script>
+<link rel="stylesheet" crossorigin href="\$!_staticResourceRootPath/assets/css/$HAAPI_REACT_APP_CSS_NAME\$!_cacheBustingQuery">
+EOF
+        echo -e "${GREEN}✓ HAAPI React App asset fragment written to $HAAPI_FRAGMENT_DIR/assets.vm${NC}"
+    fi
+fi
+
 echo ""
 echo "================================================"
 echo -e "${GREEN}Deployment completed successfully!${NC}"