This commit is contained in:
Maxime Lalo 2024-04-17 15:15:26 +02:00
parent f607c15bfa
commit 396268088c
4 changed files with 20 additions and 10 deletions

16
package-lock.json generated
View File

@ -23,7 +23,7 @@
"eslint-config-next": "13.2.4", "eslint-config-next": "13.2.4",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"jwt-decode": "^3.1.2", "jwt-decode": "^3.1.2",
"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.126", "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.130",
"next": "13.2.4", "next": "13.2.4",
"prettier": "^2.8.7", "prettier": "^2.8.7",
"react": "18.2.0", "react": "18.2.0",
@ -1526,9 +1526,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001609", "version": "1.0.30001610",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001609.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz",
"integrity": "sha512-JFPQs34lHKx1B5t1EpQpWH4c+29zIyn/haGsbpfq3suuV9v56enjFt23zqijxGTMwy1p/4H2tjnQMY+p1WoAyA==", "integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==",
"funding": [ "funding": [
{ {
"type": "opencollective", "type": "opencollective",
@ -3504,7 +3504,7 @@
} }
}, },
"node_modules/le-coffre-resources": { "node_modules/le-coffre-resources": {
"resolved": "git+ssh://git@github.com/smart-chain-fr/leCoffre-resources.git#bb3e87116ea3e2682f61ff322b99bae895cc4308", "resolved": "git+ssh://git@github.com/smart-chain-fr/leCoffre-resources.git#1ecb4711cfdf1c6efc59e06642ba4dbbeb746e74",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"class-transformer": "^0.5.1", "class-transformer": "^0.5.1",
@ -3742,9 +3742,9 @@
} }
}, },
"node_modules/node-abi": { "node_modules/node-abi": {
"version": "3.57.0", "version": "3.58.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.57.0.tgz", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.58.0.tgz",
"integrity": "sha512-Dp+A9JWxRaKuHP35H77I4kCKesDy5HUDEmScia2FyncMTOXASMyg251F5PhFoDA5uqBrDDffiLpbqnrZmNXW+g==", "integrity": "sha512-pXY1jnGf5T7b8UNzWzIqf0EkX4bx/w8N2AvwlGnk2SYYA/kzDVPaH0Dh0UG4EwxBB5eKOIZKPr8VAHSHL1DPGg==",
"dependencies": { "dependencies": {
"semver": "^7.3.5" "semver": "^7.3.5"
}, },

View File

@ -25,7 +25,7 @@
"eslint-config-next": "13.2.4", "eslint-config-next": "13.2.4",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"jwt-decode": "^3.1.2", "jwt-decode": "^3.1.2",
"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.126", "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.130",
"next": "13.2.4", "next": "13.2.4",
"prettier": "^2.8.7", "prettier": "^2.8.7",
"react": "18.2.0", "react": "18.2.0",

View File

@ -9,6 +9,7 @@ export type IBlock = {
name: string; name: string;
id: string; id: string;
selected: boolean; selected: boolean;
rightIcon?: JSX.Element;
hasFlag?: boolean; hasFlag?: boolean;
}; };
@ -35,6 +36,7 @@ export default function BlockList({ blocks, onSelectedBlock }: IProps) {
<div className={classes["right-side"]}> <div className={classes["right-side"]}>
{folder.hasFlag && <WarningBadge />} {folder.hasFlag && <WarningBadge />}
<Image alt="chevron" src={ChevronIcon} /> <Image alt="chevron" src={ChevronIcon} />
{folder.rightIcon && folder.rightIcon}
</div> </div>
</div> </div>
</div> </div>

View File

@ -92,10 +92,18 @@ export default class DefaultCollaboratorDashboard extends React.Component<IProps
if (!jwt) return; if (!jwt) return;
const query: IGetUsersparams = { const query: IGetUsersparams = {
where: { office_uid: jwt.office_Id }, where: { office_uid: jwt.office_Id },
include: { contact: true }, include: {
contact: true,
seats: {
include: {
subscription: true,
},
},
},
}; };
const collaborators = await Users.getInstance().get(query); const collaborators = await Users.getInstance().get(query);
console.log(collaborators);
this.setState({ collaborators }); this.setState({ collaborators });
} }
public override componentWillUnmount() { public override componentWillUnmount() {