@sankhyalabs/core 4.0.2 → 4.1.0

package/src/dataunit/state/slice/SelectionSlice.ts

@@ -22,7 +22,7 @@ class SelectionReducerImpl implements ActionReducer {
 
                 if (currentState && removed) {
                     const currentSelection = currentState.currentSelection;
-                    const record = currentSelection.filter(recordId => !removed.includes(recordId));
+                    const record = currentSelection.filter((selectedRecord: Record) => !removed.includes(selectedRecord.__record__id__));
 
                     if(record.length === 0) {
                         const currentRecords = getCurrentRecords(stateManager);
@@ -35,9 +35,9 @@ class SelectionReducerImpl implements ActionReducer {
                             removedIndex++
                         }
 
-                        currentRecords.forEach((value, key) => {
+                        currentRecords.forEach((value) => {
                             if(currentIndex === removedIndex) {
-                                record.push(key);
+                                record.push(value);
                             }
                             currentIndex++;
                         })
@@ -57,10 +57,10 @@ class SelectionReducerImpl implements ActionReducer {
                     if (!currentState || currentSelection.length === 0) {
                         index = action.type === Action.PREVIOUS_SELECTED ? 0 : Math.min(1, currentRecords.size);
                     } else {
-                        index = getItemIndex(currentSelection[0], currentRecords) + (action.type === Action.PREVIOUS_SELECTED ? -1 : 1);
+                        index = getItemIndex(currentSelection[0].__record__id__, currentRecords) + (action.type === Action.PREVIOUS_SELECTED ? -1 : 1);
                     }
                     if (index < currentRecords.size && index >= 0) {
-                        return { currentSelection: [Array.from(currentRecords.values())[index].__record__id__] };
+                        return { currentSelection: [Array.from(currentRecords.values())[index]] };
                     }
                 }
 
@@ -73,17 +73,34 @@ class SelectionReducerImpl implements ActionReducer {
                     const currentRecords = getCurrentRecords(stateManager);
                     if (currentRecords) {
                         const records = Array.from(currentRecords.values());
-                        const selectionById: Array<string> = [];
+                        const selectionRecord: Array<Record> = [];
                         selectionSource.forEach((i: number) => {
                             if (i >= 0 && i < currentRecords.size) {
-                                selectionById.push(records[i].__record__id__);
+                                selectionRecord.push(records[i]);
                             }
                         });
-                        return {currentSelection: selectionById};
+                        return {currentSelection: selectionRecord};
                     }
                 }
 
-                return {currentSelection: getFilteredSelection(selectionSource, stateManager) };
+                return {currentSelection: selectionSource};
+
+            case Action.SELECTION_REMOVED:
+                if (currentState != undefined) {
+                    const { unselection } = action.payload;
+                    const currentSelection = currentState.currentSelection;
+                    const selectionFiltered = currentSelection?.filter((selectedRecord: Record) => {
+                        return !((unselection || []) as Array<Record>)
+                            .some((unselectedRecord: Record) => {
+                                return unselectedRecord.__record__id__ === selectedRecord.__record__id__;
+                            });
+                    });
+
+                    return {currentSelection: selectionFiltered};
+                }
+
+                return undefined;
+
             case Action.EDITION_CANCELED:
                 if(currentState?.lastSelection){
                     return { currentSelection: currentState.lastSelection };
@@ -96,8 +113,8 @@ class SelectionReducerImpl implements ActionReducer {
 
 export const SelectionReducer = new SelectionReducerImpl();
 
-export const getSelection = (stateManager: StateManager): Array<string> => {
-    let selection: Array<string> = getCurrentSelection(stateManager);
+export const getAllSelection = (stateManager: StateManager): Array<Record> => {
+    const selection: Array<Record> = getCurrentSelection(stateManager);
 
     if (!selection || selection.length === 0) {
         return [];
@@ -113,7 +130,7 @@ export const hasNext = (stateManager: StateManager): boolean => {
         if (!selection || selection.length === 0) {
             return records.size > 0;
         }
-        return records.size > (getItemIndex(selection[0], records) + 1);
+        return records.size > (getItemIndex(selection[0].__record__id__, records) + 1);
     }
     return false;
 };
@@ -125,35 +142,25 @@ export const hasPrevious = (stateManager: StateManager): boolean => {
         if (!selection || selection.length === 0) {
             return false;
         }
-        return getItemIndex(selection[0], records) > 0;
+        return getItemIndex(selection[0].__record__id__, records) > 0;
     }
     return false;
 };
 
-function getFilteredSelection(selection: Array<string>, stateManager: StateManager): Array<string>{
-    
-    if(selection){
-        const records = getCurrentRecords(stateManager);
-        return selection.filter(id => records.has(id));
-    }
-
-    return selection;
-}
-
 function getItemIndex(key: string, map: Map<string, any>): number {
     return Array.from(map.keys()).indexOf(key);
 }
 
-function updateSavedIds(stateManager:StateManager, savedRecords:Array<SavedRecord>): Array<string>{
-    const currentSelection: Array<string> = getSelection(stateManager);
+function updateSavedIds(stateManager:StateManager, savedRecords:Array<SavedRecord>): Array<Record>{
+    const currentSelection: Array<Record> = getAllSelection(stateManager);
     if(currentSelection){
-        const newSelection: Array<string> = [];
-        currentSelection.forEach( id => {
-            const record = savedRecords.find(r => r.__old__id__ === id);
+        const newSelection: Array<Record> = [];
+        currentSelection.forEach(recordSelection => {
+            const record = savedRecords.find(r => r.__old__id__ === recordSelection.__record__id__);
             if(record){
-                newSelection.push(record.__record__id__);
+                newSelection.push(record);
             } else {
-                newSelection.push(id);
+                newSelection.push(recordSelection);
             }
         });
         return newSelection;
@@ -161,10 +168,10 @@ function updateSavedIds(stateManager:StateManager, savedRecords:Array<SavedRecor
     return currentSelection;
 }
 
-function getCurrentSelection(stateManager: StateManager):Array<string>{
+function getCurrentSelection(stateManager: StateManager):Array<Record>{
     return stateManager.select(SelectionReducer.sliceName, (state: SelectionState) => state)?.currentSelection;
 }
 interface SelectionState{
-    currentSelection: Array<string>;
-    lastSelection?: Array<string>;
+    currentSelection: Array<Record>;
+    lastSelection?: Array<Record>;
 }

package/src/index.ts

@@ -9,7 +9,7 @@ import { HttpProvider } from "./http/HttpProvider.js";
 import { SkwHttpProvider } from "./http/SkwHttpProvider.js";
 import { RequestMetadata } from "./http/RequestMetadata.js";
 import { AuthorizedServiceCaller } from "./http/AuthorizedServiceCaller.js";
-import DataUnit, {SavedRecord, Record, Change, ChangeOperation, DUActionInterceptor, WaitingChange, PageRequest, QuickFilter} from "./dataunit/DataUnit.js";
+import DataUnit, {SavedRecord, Record, Change, ChangeOperation, DUActionInterceptor, WaitingChange, PageRequest, QuickFilter, AllRecord} from "./dataunit/DataUnit.js";
 import { DataType } from "./dataunit/metadata/DataType.js";
 import { UnitMetadata, FieldDescriptor, UserInterface, Sort, SortMode, SortingProvider, Filter, DependencyType, ChildDescriptor, ChildLink } from "./dataunit/metadata/UnitMetadata.js";
 import { DataUnitAction, Action, ExecutionContext } from "./dataunit/state/action/DataUnitAction.js";
@@ -79,5 +79,6 @@ export {
     ElementIDUtils,
     IElementIDInfo,
     UserAgentUtils,
-    JSUtils
+    JSUtils,
+    AllRecord
 };

package/src/utils/JSUtils.ts

@@ -46,11 +46,11 @@ export class JSUtils{
    * 
    * @returns - Retorna um valor booleando informando se a string está encodada com base64.
    */
-  public static isBase64(str:string): boolean {
-    str = str.replaceAll("\n", "");
-    if (str ==='' || str.trim() ===''){ return false; }
+  public static isBase64(str: string): boolean {
+    str = (str || '').replaceAll("\n", "");
+    if (str === '' || str.trim() === ''){ return false; }
     try {
-        return btoa(atob(str)) == str;
+        return window.btoa(window.atob(str)) == str;
     } catch (err) {
         return false;
     }