Skip to content

Repository navigation

Works with file #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Deatheh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Works with file #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
108 changes: 92 additions & 16 deletions src/main/java/com/DesktopApplicationClientJava/controllers/ResourceDetailsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import javafx.scene.control.TableView;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.stage.DirectoryChooser;
import javafx.stage.FileChooser;
import javafx.stage.Window;

public class ResourceDetailsController extends Controller {
Expand All @@ -44,21 +45,20 @@ public class ResourceDetailsController extends Controller {
@FXML TableColumn<FileInfo, String> sizeColumn;
@FXML TableColumn<FileInfo, String> contentTypeColumn;
@FXML TableColumn<FileInfo, Void> downloadColumn;
@FXML TableColumn<FileInfo, Void> deleteFileColumn;
@FXML Button backButton;
@FXML Button editButton;
@FXML Button deleteButton;
@FXML Button addFileButton;

private UUID resourceId;
private boolean canModifyFiles;

@Override
protected Label getErrorLabel() {
return errorLabel;
}

private UUID resourceId;

/**
* Navigator sets the id <i>after</i> FXML load (see {@code Navigator.goTo}), so the setter itself
* must load the resource when the view is already initialized.
*/
public void setResourceId(UUID resourceId) {
this.resourceId = resourceId;
if (titleLabel != null && resourceId != null && services != null) {
Expand Down Expand Up @@ -94,10 +94,19 @@ protected void updateItem(String item, boolean empty) {
// NB: services/getAuthService may be a partial mock in tests — stay null-safe.
var authService = services == null ? null : services.getAuthService();
boolean canEdit = authService != null && (authService.isAdmin() || authService.isModerator());
canModifyFiles = canEdit;

editButton.setVisible(canEdit);
editButton.setManaged(canEdit);
deleteButton.setVisible(canEdit);
deleteButton.setManaged(canEdit);

addFileButton.setVisible(canEdit);
addFileButton.setManaged(canEdit);

deleteFileColumn.setCellFactory(col -> new DeleteFileCell(this::onDeleteFile));
deleteFileColumn.setVisible(canEdit);

autoSelectFirstInMockMode();
}

Expand All @@ -115,6 +124,8 @@ void onBack(ActionEvent event) {
navigator.goTo("/fxml/ResourceList.fxml");
}

// ===== Скачивание =====

@FXML
void onDownload(FileInfo file) {
File dir = chooseDirectory(backButton.getScene().getWindow());
Expand All @@ -129,15 +140,65 @@ void onDownload(FileInfo file) {
}
}

// ===== Добавление файла =====

@FXML
void onAddFile(ActionEvent event) {
if (resourceId == null) {
return;
}
File file = chooseFile(backButton.getScene().getWindow());
if (file == null) {
return;
}
try {
services.getFileService().uploadFile(resourceId, file.toPath());
statusLabel.setText("Файл добавлен: " + file.getName());
load(); // перезагружаем resource, чтобы таблица файлов обновилась
} catch (ServiceException e) {
showError(e);
}
}

// ===== Удаление файла =====

@FXML
void onDeleteFile(FileInfo file) {
if (resourceId == null || file == null) {
return;
}
if (!confirmDeleteFile(file)) {
return;
}
try {
services.getFileService().deleteFile(resourceId, file.getUuid());
statusLabel.setText("Файл удалён: " + file.getName());
load();
} catch (ServiceException e) {
showError(e);
}
}

// ===== Диалоги, выделены ради тестов =====

protected File chooseDirectory(Window owner) {
return new DirectoryChooser().showDialog(owner);
}

/**
* Dev-only fallback: when the page is opened without an id (e.g. straight via INITIAL_PAGE_PATH)
* against a mock service, show the first seeded resource so the UI is clickable without the
* resource list. Never triggers against the real backend.
*/
protected File chooseFile(Window owner) {
return new FileChooser().showOpenDialog(owner);
}

protected boolean confirmDeleteFile(FileInfo file) {
var alert = new Alert(Alert.AlertType.CONFIRMATION);
alert.setTitle("Удаление файла");
alert.setHeaderText("Удалить файл?");
alert.setContentText("«" + file.getName() + "» будет удалён без возможности восстановления.");
return alert.showAndWait().map(b -> b == ButtonType.OK).orElse(false);
}

// ===== Мок-режим =====

private void autoSelectFirstInMockMode() {
if (resourceId != null
|| services == null
Expand All @@ -149,7 +210,7 @@ private void autoSelectFirstInMockMode() {
services.getResourceService().search(ResourceFilter.empty(), 0, 1).stream()
.map(Resource::getUuid)
.findFirst()
.ifPresent(this::setResourceId); // the setter loads the resource
.ifPresent(this::setResourceId);
}

private void showResource(Resource resource) {
Expand All @@ -174,6 +235,8 @@ private static String formatSize(Long bytes) {
return String.format("%.1f GB", bytes / (1024.0 * 1024 * 1024));
}

// ===== Ячейки таблицы =====

private static final class DownloadCell extends TableCell<FileInfo, Void> {
private final Button button = new Button("Скачать");

Expand All @@ -189,6 +252,23 @@ protected void updateItem(Void item, boolean empty) {
}
}

private static final class DeleteFileCell extends TableCell<FileInfo, Void> {
private final Button button = new Button("Удалить");

DeleteFileCell(Consumer<FileInfo> onDelete) {
button.getStyleClass().setAll("btn-danger");
button.setOnAction(event -> onDelete.accept(getTableView().getItems().get(getIndex())));
}

@Override
protected void updateItem(Void item, boolean empty) {
super.updateItem(item, empty);
setGraphic(empty ? null : button);
}
}

// ===== Ресурс: edit/delete (без изменений) =====

@FXML
private void onEdit(ActionEvent event) {
if (resourceId == null) return;
Expand All @@ -209,10 +289,6 @@ void onDelete(ActionEvent event) {
navigator.goTo("/fxml/ResourceList.fxml");
}

/**
* Диалог подтверждения удаления. Выделен в метод ради тестов: headless {@code Alert} блокирует
* поток, поэтому тесты переопределяют его без UI.
*/
protected boolean confirmDelete() {
var alert = new Alert(Alert.AlertType.CONFIRMATION);
alert.setTitle("Удаление ресурса");
Expand Down
18 changes: 13 additions & 5 deletions src/main/resources/fxml/ResourceDetails.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,24 @@
maxWidth="Infinity"/>

<VBox spacing="6">
<Label text="Файлы" styleClass="field-label"/>
<HBox alignment="CENTER_LEFT" spacing="12">
<Label text="Файлы" styleClass="field-label"/>
<Region HBox.hgrow="ALWAYS"/>
<Button fx:id="addFileButton"
text="+ Добавить файл"
onAction="#onAddFile"
styleClass="btn-primary"/>
</HBox>
<TableView fx:id="filesTable"
styleClass="modern-table"
prefHeight="220"
maxWidth="Infinity">
<columns>
<TableColumn fx:id="nameColumn" text="Имя" prefWidth="280"/>
<TableColumn fx:id="sizeColumn" text="Размер" prefWidth="100"/>
<TableColumn fx:id="contentTypeColumn" text="Тип" prefWidth="180"/>
<TableColumn fx:id="downloadColumn" text="" prefWidth="120" sortable="false"/>
<TableColumn fx:id="nameColumn" text="Имя" prefWidth="240"/>
<TableColumn fx:id="sizeColumn" text="Размер" prefWidth="90"/>
<TableColumn fx:id="contentTypeColumn" text="Тип" prefWidth="150"/>
<TableColumn fx:id="downloadColumn" text="" prefWidth="110" sortable="false"/>
<TableColumn fx:id="deleteFileColumn" text="" prefWidth="110" sortable="false"/>
</columns>
</TableView>
</VBox>
Expand Down
Loading