ui-soxo-bootstrap-core 2.4.25-dev.48 → 2.4.25-dev.49

package/.github/workflows/npm-publish.yml

@@ -1,52 +1,63 @@
 # This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
 # For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
 
-name: Node.js Package
+name: Publish Node Package (OIDC)
 
 on:
   release:
     types: [created]
 
+permissions:
+  contents: read
+  id-token: write # REQUIRED for OIDC
+
 jobs:
-  build:
+  publish:
     runs-on: ubuntu-latest
+
     steps:
-      # 1. Checkout the repository
-      - name: Checkout Code
-        uses: actions/checkout@v3
+      # 1. Checkout the exact commit the release was created from
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-      # 2. Setup Node.js and npm registry
+      # 2. Setup Node.js
+      # Node 22 = current LTS
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 22
           registry-url: https://registry.npmjs.org/
+          cache: npm
 
-      # 3. Install dependencies using ci for reproducibility
-      - name: Install Dependencies
+      # 3. Install dependencies deterministically
+      - name: Install dependencies
         run: npm ci
 
-      # 4. Verify tag matches package.json version
-      - name: Verify Tag Matches Version
+      # 4. Verify git tag matches package.json version
+      # This prevents publishing the wrong version
+      - name: Verify tag matches package.json version
         run: |
-          TAG=${GITHUB_REF#refs/tags/}
-          PACKAGE_VERSION=$(node -p "require('./package.json').version")
-          echo "Release Tag: $TAG"
-          echo "Package Version: $PACKAGE_VERSION"
-          if [[ "$TAG" != "v$PACKAGE_VERSION"* ]]; then
-            echo "Error: Tag does not match package.json version"
+          TAG="${{ github.event.release.tag_name }}"
+          VERSION=$(node -p "require('./package.json').version")
+
+          echo "Release tag: $TAG"
+          echo "Package version: $VERSION"
+
+          if [[ "$TAG" != "v$VERSION"* ]]; then
+            echo "::error::Release tag does not match package.json version"
             exit 1
           fi
-      # 5. Publish the package
-      - name: Publish Package
+
+      # 5. Publish using OIDC (NO TOKEN)
+      # --provenance triggers GitHub → npm identity verification
+      - name: Publish to npm (OIDC)
         run: |
-          TAG_NAME=${GITHUB_REF#refs/tags/}
-          if [[ "$TAG_NAME" == *"dev"* ]]; then
-            echo "Publishing development package with 'dev' tag"
-            npm publish --tag dev
+          TAG="${{ github.event.release.tag_name }}"
+
+          if [[ "$TAG" == *"dev"* ]]; then
+            echo "Publishing dev release"
+            npm publish --tag dev --provenance
           else
-            echo "Publishing stable package"
-            npm publish
+            echo "Publishing stable release"
+            npm publish --provenance
           fi
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/core/models/staff/components/staff-add/staff-add.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
-import './staff-add.scss';
+
 import { Modal, Tabs, Input, Form, Row, Col, message, Checkbox, Select } from 'antd';
 import { useTranslation, Button } from './../../../../lib/';
 import { UsersAPI } from '../../..';
@@ -163,20 +163,20 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
     return Promise.resolve();
   };
 
- const validateSerial = (_, value) => {
-   if (!value) {
-     return Promise.resolve();
-   }
+  const validateSerial = (_, value) => {
+    if (!value) {
+      return Promise.resolve();
+    }
 
-   // Allow same serial number for the same staff in edit mode
-   if (editMode && String(value) === String(staffData?.slNo)) {
-     return Promise.resolve();
-   }
+    // Allow same serial number for the same staff in edit mode
+    if (editMode && String(value) === String(staffData?.slNo)) {
+      return Promise.resolve();
+    }
 
-   const exists = staffList.some((staff) => String(staff.slNo) === String(value));
+    const exists = staffList.some((staff) => String(staff.slNo) === String(value));
 
-   return exists ? Promise.reject('Serial Number already exists') : Promise.resolve();
- };
+    return exists ? Promise.reject('Serial Number already exists') : Promise.resolve();
+  };
 
   /** -------------------------------
    *  UTIL – Enter Key Navigation
@@ -215,6 +215,8 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
     });
   };
 
+  const existing = staffData || {};
+
   /** -------------------------------
    *  SUBMIT HANDLER
    * ------------------------------- */
@@ -225,19 +227,19 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
       id: values.id,
       shortName: values.shortName,
       description: values.description,
-      designationPtr: values.designation || null,
-      phone: values.phone1 || null,
-      mobile: values.phone1 || null,
-      alternateMobile: values.phone2 || null,
-      email: values.email1 || null,
-      alternateEmail: values.email2 || null,
-      remarks: values.remarks || null,
-      slNo: values.slno ? Number(values.slno) : null,
+      designationPtr: values.designation ?? existing.designationPtr ?? null,
+      phone: values.phone1 ?? existing.phone ?? null,
+      mobile: values.phone1 ?? existing.mobile ?? null,
+      alternateMobile: values.phone2 ?? existing.alternateMobile ?? null,
+      email: values.email1 ?? existing.email ?? null,
+      alternateEmail: values.email2 ?? existing.alternateEmail ?? null,
+      remarks: values.remarks ?? existing.remarks ?? null,
+      slNo: values.slno ?? existing.slNo ?? null,
       active: values.active === 'Y' ? 'Y' : 'N',
-      address1: values.address1 || null,
-      address2: values.address2 || null,
-      place: values.place || null,
-      zip: values.zip || null,
+      address1: values.address1 ?? existing.address1 ?? null,
+      address2: values.address2 ?? existing.address2 ?? null,
+      place: values.place ?? existing.place ?? null,
+      zip: values.zip ?? existing.zip ?? null,
     };
 
     try {
@@ -279,10 +281,7 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
               name="id"
               validateTrigger="onChange"
               hasFeedback={!editMode}
-              rules={[
-                { required: true, message: 'Code is required' },
-                { validator: validateInput },
-              ]}
+              rules={[{ required: true, message: 'Code is required' }, { validator: validateInput }]}
             >
               <Input placeholder="Enter Code" autoComplete="off" maxLength={10} ref={nameInputRef} onKeyDown={handleEnterKey} disabled={editMode} />
             </Form.Item>
@@ -383,7 +382,7 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
                   name="slno"
                   rules={[{ message: 'only numbers are allowed', pattern: /^\d*$/ }, { validator: validateSerial }]}
                 >
-                  <Input autoComplete="off" maxLength={5} placeholder="Enter Serial Number" onKeyDown={handleEnterKey}  />
+                  <Input autoComplete="off" maxLength={5} placeholder="Enter Serial Number" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
 

package/core/models/user-roles/user-roles.js

@@ -73,6 +73,7 @@ class UserRole extends Base {
         return false;
     }
 
+
     /**
      * 
      * @param {*} formBody 
@@ -86,6 +87,19 @@ class UserRole extends Base {
         })
     }
 
+    /**
+     * 
+     * @param {*} formBody 
+     * @returns 
+     */
+    addUserRoleSave = (values) => {
+
+        return this.post({ 
+            url: 'core-user-roles/save-core-user-roles', 
+            formBody: values
+        })
+    }
+
     /**
      * 
      * 

package/core/models/users/components/assign-role/assign-role.js

@@ -51,6 +51,9 @@ export default function AssignRole() {
   const [selectedMenus, setSelectedMenus] = useState([]);
   const [search, setSearch] = useState('');
 
+  // for initial roles
+  const [initialRoles, setInitialRoles] = useState([]);
+
   /**
    * Load user details and assigned roles when user ID changes
    */
@@ -89,13 +92,14 @@ export default function AssignRole() {
       /* ---------- USER ROLES ---------- */
       const roleList = Array.isArray(roleRes?.result) ? roleRes.result : [];
 
-      // Extract valid & unique role IDs
-      const roleIds = [...new Set(roleList.filter((item) => item.role_id).map((item) => Number(item.role_id)))];
+      //  Extract VALID role IDs (ignore nulls & duplicates)
+      const roleIds = [...new Set(list.filter((item) => item.role_id && item.active === 'Y').map((item) => Number(item.role_id)))];
 
       setSelectedRoles(roleIds);
-    } catch (error) {
-      setUser(null);
-      setSelectedRoles([]);
+      setInitialRoles(roleIds); 
+    } catch (e) {
+      console.error(e);
+      message.error('Unable to load user details');
     } finally {
       setLoadingUser(false);
     }
@@ -202,25 +206,39 @@ export default function AssignRole() {
    * @returns {Promise<void>}
    */
   const handleSaveUserRole = async () => {
-    if (!id || !selectedRoles.length) {
-      message.warning('No roles selected to save');
-      return;
-    }
+   if (!id) {
+    message.error('Invalid user');
+    return;
+  }
     // start button spinner
     setSaving(true);
 
     try {
-      // Save all roles in parallel
-      await Promise.all(
-        selectedRoles.map((roleId) =>
-          UserRolesAPI.addUserRole({
-            values: { user_id: id, role_id: roleId },
-          })
-        )
-      );
+      // roles to ADD
+      const role_ids = selectedRoles.filter((rid) => !initialRoles.includes(rid));
+
+      // roles to REMOVE
+      const update_ids = initialRoles.filter((rid) => !selectedRoles.includes(rid));
+
+      if (!role_ids.length && !update_ids.length) {
+        message.info('No changes to save');
+        return;
+      }
+
+      const payload = {
+        user_id: id,
+        role_ids,
+        update_ids,
+      };
+
+      await UserRolesAPI.addUserRoleSave(payload);
 
       // Only show success AFTER all saves
-      message.success('User roles saved successfully');
+
+      message.success('User roles updated successfully');
+      
+      await loadUser();
+
     } catch (err) {
       console.error(err);
       message.error('Failed to save user roles');
@@ -290,7 +308,7 @@ export default function AssignRole() {
         </div>
 
         <div className="footer-actions">
-          <Button type="primary" onClick={handleSaveUserRole} loading={saving}>
+          <Button type="primary" onClick={handleSaveUserRole} loading={saving} disabled={!selectedRoles.length}>
             Save
           </Button>
         </div>

package/core/models/users/users.js

@@ -288,7 +288,7 @@ class Users extends Base {
   roles associated with a specific user from the API. */
   
   getUserRole = ({ id }) => {
-    return ApiUtils.get({ url: `core-user-roles?user_id=${id}` });
+    return ApiUtils.get({ url: `core-user-roles?user_id=${id}&active=Y` });
 
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.4.25-dev.48",
+  "version": "2.4.25-dev.49",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"