Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/ProjectEntryController.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@ class ProjectEntryController @Inject() (@Named("project-creation-actor") project
})
}}

def restoreBackup(requestedId: Int, requestedVersion: Int) = IsAdminAsync {uid=>{request=>
def restoreBackup(requestedId: Int, requestedVersion: Int) = IsAuthenticatedAsync {uid=>{request=>
implicit val db = dbConfig.db

selectid(requestedId).flatMap({
Expand Down
83 changes: 40 additions & 43 deletions frontend/app/ProjectEntryList/BackupEntry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ interface BackupEntryProps {
filepath: string;
version: number;
premiereVersion?: number;
isAdmin: boolean;
projectId?: number;
}

Expand Down Expand Up @@ -124,48 +123,46 @@ const BackupEntry: React.FC<BackupEntryProps> = (props) => {
)}
</>
</ListItemText>
{props.isAdmin ? (
<div>
<Button
color="secondary"
variant="contained"
onClick={handleClickOpenDialog}
>
Restore
</Button>
{/* Confirmation Dialog */}
<Dialog
open={openDialog}
onClose={handleCloseDialog}
aria-labelledby="update-file-dialog-title"
aria-describedby="update-file-dialog-description"
>
<DialogTitle id="update-file-dialog-title">
Confirm Project File Restore
</DialogTitle>
<DialogContent>
<DialogContentText id="update-file-dialog-description">
<strong>
Are you sure you want to restore the project file?
</strong>
<br />
You are about to restore a backed up project file. This action
will overwrite the current file.
<br />
<br />
</DialogContentText>
</DialogContent>
<DialogActions>
<Button onClick={handleCloseDialog} color="primary">
Cancel
</Button>
<Button onClick={handleConfirmUpload} color="primary" autoFocus>
Proceed
</Button>
</DialogActions>
</Dialog>
</div>
) : null}
<div>
<Button
color="secondary"
variant="contained"
onClick={handleClickOpenDialog}
>
Restore
</Button>
{/* Confirmation Dialog */}
<Dialog
open={openDialog}
onClose={handleCloseDialog}
aria-labelledby="update-file-dialog-title"
aria-describedby="update-file-dialog-description"
>
<DialogTitle id="update-file-dialog-title">
Confirm Project File Restore
</DialogTitle>
<DialogContent>
<DialogContentText id="update-file-dialog-description">
<strong>
Are you sure you want to restore the project file?
</strong>
<br />
You are about to restore a backed up project file. This action
will overwrite the current file.
<br />
<br />
</DialogContentText>
</DialogContent>
<DialogActions>
<Button onClick={handleCloseDialog} color="primary">
Cancel
</Button>
<Button onClick={handleConfirmUpload} color="primary" autoFocus>
Proceed
</Button>
</DialogActions>
</Dialog>
</div>
</ListItem>
);
};
Expand Down
15 changes: 0 additions & 15 deletions frontend/app/ProjectEntryList/ProjectBackups.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ const ProjectBackups: React.FC<RouteComponentProps<{ itemid: string }>> = (
const [dialogErrString, setDialogErrString] = useState<string | undefined>(
undefined
);
const [isAdmin, setIsAdmin] = useState<boolean>(false);
const [primaryFiles, setPrimaryFiles] = useState<FileEntry[]>([]);
const [backupFiles, setBackupFiles] = useState<FileEntry[]>([]);
const [primaryFileMetadata, setPrimaryFileMetadata] = useState<
Expand Down Expand Up @@ -169,19 +168,6 @@ const ProjectBackups: React.FC<RouteComponentProps<{ itemid: string }>> = (
}
}, [project]);

const fetchWhoIsLoggedIn = async () => {
try {
const loggedIn = await isLoggedIn();
setIsAdmin(loggedIn.isAdmin);
} catch {
setIsAdmin(false);
}
};

useEffect(() => {
fetchWhoIsLoggedIn();
}, []);

return (
<>
{project ? (
Expand Down Expand Up @@ -243,7 +229,6 @@ const ProjectBackups: React.FC<RouteComponentProps<{ itemid: string }>> = (
filepath={f.filepath}
version={f.version}
premiereVersion={f.premiereVersion}
isAdmin={isAdmin}
projectId={project?.id}
/>
))}
Expand Down
Loading