Compare commits
2 Commits
ae64b057a6
...
68f6b31a6c
Author | SHA1 | Date | |
---|---|---|---|
![]() |
68f6b31a6c | ||
![]() |
4740f4a67c |
@ -26,6 +26,81 @@ interface ProcessesViewerProps {
|
|||||||
onProcessesUpdate?: (processes: Processes) => void;
|
onProcessesUpdate?: (processes: Processes) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const compareStates = (
|
||||||
|
currentState: BlockState,
|
||||||
|
index: number,
|
||||||
|
previousState?: BlockState,
|
||||||
|
currentPrivateData?: Record<string, any>,
|
||||||
|
previousPrivateData?: Record<string, any>
|
||||||
|
) => {
|
||||||
|
const result: Record<string, {
|
||||||
|
value: any,
|
||||||
|
status: 'unchanged' | 'modified',
|
||||||
|
hash?: string,
|
||||||
|
isPrivate: boolean,
|
||||||
|
stateId: string
|
||||||
|
}> = {};
|
||||||
|
|
||||||
|
// Ajouter toutes les données publiques de l'état actuel
|
||||||
|
Object.keys(currentState.public_data).forEach(key => {
|
||||||
|
const currentValue = currentState.public_data[key];
|
||||||
|
const previousValue = previousState?.public_data[key];
|
||||||
|
const isModified = index > 0 &&
|
||||||
|
previousValue !== undefined &&
|
||||||
|
JSON.stringify(currentValue) !== JSON.stringify(previousValue);
|
||||||
|
|
||||||
|
result[key] = {
|
||||||
|
value: currentValue,
|
||||||
|
status: isModified ? 'modified' : 'unchanged',
|
||||||
|
hash: currentState.pcd_commitment[key],
|
||||||
|
isPrivate: false,
|
||||||
|
stateId: currentState.state_id
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// Gérer les données privées
|
||||||
|
if (index === 0) {
|
||||||
|
// Pour le premier état, on ajoute simplement les données privées actuelles
|
||||||
|
if (currentPrivateData) {
|
||||||
|
Object.entries(currentPrivateData).forEach(([key, value]) => {
|
||||||
|
result[key] = {
|
||||||
|
value,
|
||||||
|
status: 'unchanged',
|
||||||
|
hash: currentState.pcd_commitment[key],
|
||||||
|
isPrivate: true,
|
||||||
|
stateId: currentState.state_id
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if (previousPrivateData) {
|
||||||
|
// Pour les états suivants, on commence par les données privées de l'état précédent
|
||||||
|
Object.entries(previousPrivateData).forEach(([key, value]) => {
|
||||||
|
result[key] = {
|
||||||
|
value,
|
||||||
|
status: 'unchanged',
|
||||||
|
hash: previousState?.pcd_commitment[key],
|
||||||
|
isPrivate: true,
|
||||||
|
stateId: previousState!.state_id
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// Puis on met à jour les données privées qui ont changé
|
||||||
|
if (currentPrivateData) {
|
||||||
|
Object.entries(currentPrivateData).forEach(([key, value]) => {
|
||||||
|
result[key] = {
|
||||||
|
value,
|
||||||
|
status: 'modified',
|
||||||
|
hash: currentState.pcd_commitment[key],
|
||||||
|
isPrivate: true,
|
||||||
|
stateId: currentState.state_id
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
};
|
||||||
|
|
||||||
function ProcessesViewer({ processes, myProcesses, onProcessesUpdate }: ProcessesViewerProps) {
|
function ProcessesViewer({ processes, myProcesses, onProcessesUpdate }: ProcessesViewerProps) {
|
||||||
const [expandedBlocks, setExpandedBlocks] = useState<string[]>([]);
|
const [expandedBlocks, setExpandedBlocks] = useState<string[]>([]);
|
||||||
const [isFiltered, setIsFiltered] = useState<boolean>(false);
|
const [isFiltered, setIsFiltered] = useState<boolean>(false);
|
||||||
@ -310,16 +385,26 @@ function ProcessesViewer({ processes, myProcesses, onProcessesUpdate }: Processe
|
|||||||
hash: string | undefined,
|
hash: string | undefined,
|
||||||
isPrivate: boolean,
|
isPrivate: boolean,
|
||||||
processId: string,
|
processId: string,
|
||||||
stateId: string
|
stateId: string,
|
||||||
|
status: 'unchanged' | 'modified' = 'unchanged',
|
||||||
|
originStateId?: string
|
||||||
) => {
|
) => {
|
||||||
const isEditing = editingField?.key === key &&
|
const isEditing = editingField?.key === key &&
|
||||||
editingField?.processId === processId &&
|
editingField?.processId === processId &&
|
||||||
editingField?.stateId === stateId;
|
editingField?.stateId === stateId;
|
||||||
|
|
||||||
|
const getStatusColor = (status: string) => {
|
||||||
|
return status === 'modified' ? '#32a852' : 'transparent';
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="data-field"
|
className="data-field"
|
||||||
key={key}
|
key={key}
|
||||||
|
style={{
|
||||||
|
backgroundColor: getStatusColor(status),
|
||||||
|
transition: 'background-color 0.3s'
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<div className="data-field-header">
|
<div className="data-field-header">
|
||||||
<span className="data-type-icon" title={isPrivate ? 'Donnée privée' : 'Donnée publique'}>
|
<span className="data-type-icon" title={isPrivate ? 'Donnée privée' : 'Donnée publique'}>
|
||||||
@ -327,6 +412,11 @@ function ProcessesViewer({ processes, myProcesses, onProcessesUpdate }: Processe
|
|||||||
</span>
|
</span>
|
||||||
<span className="data-value-icon">{getDataIcon(value)}</span>
|
<span className="data-value-icon">{getDataIcon(value)}</span>
|
||||||
<span className="data-label">{key}</span>
|
<span className="data-label">{key}</span>
|
||||||
|
{originStateId && originStateId !== stateId && (
|
||||||
|
<span className="data-origin" title={`Propagé depuis l'état ${originStateId}`}>
|
||||||
|
↺
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
<button
|
<button
|
||||||
className="field-update-button"
|
className="field-update-button"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
@ -423,7 +513,15 @@ function ProcessesViewer({ processes, myProcesses, onProcessesUpdate }: Processe
|
|||||||
}
|
}
|
||||||
|
|
||||||
const statePrivateData = privateData[state.state_id] || {};
|
const statePrivateData = privateData[state.state_id] || {};
|
||||||
console.log(statePrivateData);
|
|
||||||
|
// On utilise compareStates avec l'état précédent et les données privées
|
||||||
|
const stateData = compareStates(
|
||||||
|
state,
|
||||||
|
index,
|
||||||
|
index > 0 ? process.states[index - 1] : undefined,
|
||||||
|
statePrivateData,
|
||||||
|
index > 0 ? privateData[process.states[index - 1].state_id] : undefined
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div key={`${processId}-state-${index}`} className="state-item">
|
<div key={`${processId}-state-${index}`} className="state-item">
|
||||||
@ -436,21 +534,18 @@ function ProcessesViewer({ processes, myProcesses, onProcessesUpdate }: Processe
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="data-fields-container">
|
<div className="data-fields-container">
|
||||||
{/* Public Data */}
|
{/* Toutes les données (publiques et privées) */}
|
||||||
{Object.entries(state.public_data).map(([key, value]) =>
|
{Object.entries(stateData).map(([key, { value, status, hash, isPrivate, stateId }]) =>
|
||||||
renderDataField(key, value, state.pcd_commitment[key], false, processId, state.state_id)
|
renderDataField(key, value, hash, isPrivate, processId, stateId, status, state.state_id)
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Private Data */}
|
{/* Message de chargement pour les données privées si nécessaire */}
|
||||||
{myProcesses.includes(processId) ? (
|
{myProcesses.includes(processId) && Object.keys(statePrivateData).length === 0 && (
|
||||||
Object.keys(statePrivateData).length > 0 ? (
|
<div className="loading-message">Chargement des données privées...</div>
|
||||||
Object.entries(statePrivateData).map(([key, value]) =>
|
)}
|
||||||
renderDataField(key, value, state.pcd_commitment[key], true, processId, state.state_id)
|
|
||||||
)
|
{/* Message si pas d'accès aux données privées */}
|
||||||
) : (
|
{!myProcesses.includes(processId) && (
|
||||||
<div className="loading-message">Chargement des données privées...</div>
|
|
||||||
)
|
|
||||||
) : (
|
|
||||||
<div className="no-access-message">
|
<div className="no-access-message">
|
||||||
🔒 Vous n'avez pas accès aux données privées de ce processus
|
🔒 Vous n'avez pas accès aux données privées de ce processus
|
||||||
</div>
|
</div>
|
||||||
|
@ -301,6 +301,42 @@ export default class MessageBus {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public getPublicData(encodedData: number[]): Promise<any> {
|
||||||
|
return new Promise<any>((resolve: (data: any) => void, reject: (error: string) => void) => {
|
||||||
|
this.checkToken().then(() => {
|
||||||
|
const userStore = UserStore.getInstance();
|
||||||
|
const accessToken = userStore.getAccessToken()!;
|
||||||
|
|
||||||
|
const correlationId = uuidv4();
|
||||||
|
this.initMessageListener(correlationId);
|
||||||
|
|
||||||
|
const unsubscribe = EventBus.getInstance().on('PUBLIC_DATA_DECODED', (responseId: string, data: any) => {
|
||||||
|
if (responseId !== correlationId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
unsubscribe();
|
||||||
|
this.destroyMessageListener();
|
||||||
|
resolve(data);
|
||||||
|
});
|
||||||
|
|
||||||
|
const unsubscribeError = EventBus.getInstance().on('ERROR_PUBLIC_DATA_DECODED', (responseId: string, error: string) => {
|
||||||
|
if (responseId !== correlationId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
unsubscribeError();
|
||||||
|
this.destroyMessageListener();
|
||||||
|
reject(error);
|
||||||
|
});
|
||||||
|
|
||||||
|
this.sendMessage({
|
||||||
|
type: 'DECODE_PUBLIC_DATA',
|
||||||
|
encodedData,
|
||||||
|
accessToken
|
||||||
|
});
|
||||||
|
}).catch(console.error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
public createProfile(profileData: ProfileData, profilePrivateData: string[], roles: Record<string, RoleDefinition>): Promise<ProfileCreated> {
|
public createProfile(profileData: ProfileData, profilePrivateData: string[], roles: Record<string, RoleDefinition>): Promise<ProfileCreated> {
|
||||||
return new Promise<ProfileCreated>((resolve: (profileCreated: ProfileCreated) => void, reject: (error: string) => void) => {
|
return new Promise<ProfileCreated>((resolve: (profileCreated: ProfileCreated) => void, reject: (error: string) => void) => {
|
||||||
this.checkToken().then(() => {
|
this.checkToken().then(() => {
|
||||||
@ -692,6 +728,17 @@ export default class MessageBus {
|
|||||||
EventBus.getInstance().emit('MESSAGE_RECEIVED', message);
|
EventBus.getInstance().emit('MESSAGE_RECEIVED', message);
|
||||||
EventBus.getInstance().emit('PROCESS_UPDATED', correlationId, message.updatedProcess);
|
EventBus.getInstance().emit('PROCESS_UPDATED', correlationId, message.updatedProcess);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'PUBLIC_DATA_DECODED':
|
||||||
|
if (this.errors[correlationId]) {
|
||||||
|
const error = this.errors[correlationId];
|
||||||
|
delete this.errors[correlationId];
|
||||||
|
EventBus.getInstance().emit('ERROR_PUBLIC_DATA_DECODED', correlationId, error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
EventBus.getInstance().emit('MESSAGE_RECEIVED', message);
|
||||||
|
EventBus.getInstance().emit('PUBLIC_DATA_DECODED', correlationId, message.decodedData);
|
||||||
|
break;
|
||||||
|
|
||||||
case 'ERROR':
|
case 'ERROR':
|
||||||
console.error('Error:', message);
|
console.error('Error:', message);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user