Removed check for permission in the project selection dialog as we mu…

…st read all projects to check the permissions
ioBroker · Apr 9, 2024 · eed2688 · eed2688
1 parent ef8cb1c
commit eed2688
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/packages/vis-2/gulpfile.js b/packages/vis-2/gulpfile.js
@@ -475,6 +475,7 @@ function copyFolder(source, target, ignore) {
 
 gulp.task('7-patch', done => {
     patchFile(`${__dirname}/www/edit.html`);
+    patchFile(`${__dirname}/www/index.html`);
     patchFile(`${__dirname}/src/build/index.html`);
     patchFile(`${__dirname}/src/build/edit.html`);
     fs.existsSync(`${__dirname}/www/marketplaceConfig.sample.js`) && fs.unlinkSync(`${__dirname}/www/marketplaceConfig.sample.js`);
@@ -487,6 +488,6 @@ gulp.task('7-patch', done => {
 
 gulp.task('7-patch-dep',  gulp.series('6-copy-dep', '7-patch'));
 
-gulp.task('buildReact', gulp.series('7-patch-dep', 'runtime-7-patch-dep'));
+gulp.task('buildReact', gulp.series('runtime-7-patch-dep', '7-patch-dep'));
 
 gulp.task('default', gulp.series('buildReact'));
diff --git a/packages/vis-2/src/src/Runtime.jsx b/packages/vis-2/src/src/Runtime.jsx
@@ -907,7 +907,9 @@ class Runtime extends GenericApp {
         return <Dialog
             open={!0}
             maxWidth="sm"
-            onClose={() => {}} // do nothing
+            onClose={() => {
+                /* do nothing */
+            }}
         >
             <DialogTitle>
                 <img
@@ -924,7 +926,10 @@ class Runtime extends GenericApp {
                     </div> : null}
                     <MenuList>
                         {this.state.projects.map(project =>
-                            <ListItemButton key={project} onClick={() => window.location.href = `?${project}`} disabled={!hasProjectAccess({ editMode: this.state.editMode, project: visProject, user: activeUser })}>
+                            <ListItemButton
+                                key={project}
+                                onClick={() => window.location.href = `?${project}`}
+                            >
                                 <ListItemIcon>
                                     <IconDocument />
                                 </ListItemIcon>
@@ -986,9 +991,19 @@ class Runtime extends GenericApp {
 
         const { visProject, activeUser } = store.getState();
 
-        if (!hasProjectAccess({ editMode: this.state.editMode, project: visProject, user: activeUser }) || !hasViewAccess({
-            editMode: this.state.editMode, project: visProject, user: activeUser, view: this.state.selectedView,
-        })) {
+        if (
+            !hasProjectAccess({
+                editMode: this.state.editMode,
+                project: visProject,
+                user: activeUser,
+            }) ||
+            !hasViewAccess({
+                editMode: this.state.editMode,
+                project: visProject,
+                user: activeUser,
+                view: this.state.selectedView,
+            })
+        ) {
             console.warn(`User "${activeUser}" has no permissions for ${this.state.editMode ? 'edit mode' : 'runtime'} of project "${this.state.projectName}" with view "${this.state.selectedView}"`);
             if (this.state.projects) {
                 return this.showSmallProjectsDialog();

diff --git a/packages/vis-2/src/src/Utils/utils.tsx b/packages/vis-2/src/src/Utils/utils.tsx
@@ -221,9 +221,9 @@ export const DEFAULT_PERMISSIONS: Permissions = { read: true, write: true };
 export function hasProjectAccess(options: CheckAccessOptions): boolean {
     const { project, user, editMode } = options;
 
-    const permissions = project.___settings.permissions?.[user] ?? DEFAULT_PERMISSIONS;
+    const permissions = project?.___settings?.permissions?.[user] ?? DEFAULT_PERMISSIONS;
 
-    if (editMode && permissions.write) {
+    if (editMode && permissions?.write) {
         return true;
     }