[bugfix] Исправить отображение карточек атрибутов

Author: StellaLupus

.gitignore

@@ -7,3 +7,4 @@
 /gradle-bin/
 /shared/build/
 /desktop/build/
+/desktop/generated.conveyor.conf

shared/src/commonMain/composeResources/values-ru/strings.xml

@@ -139,7 +139,7 @@
     <string name="Task-SelectedFiles">Выбрано файлов</string>
     <string name="Task-FoundFiles">Найдено файлов</string>
     <string name="Task-FolderSize">Размер папки</string>
-    <string name="Task-FoundAttributes">Найденные атрибуты:</string>
+    <string name="Task-FoundAttributes">Что найдено:</string>
     <string name="Task-ScanTime">Время сканирования</string>
 
     <string name="TaskStateChipFilter-Active">Активные</string>
@@ -148,7 +148,7 @@
     <string name="TaskStateChipFilter-Completed">Завершенные</string>
 
     <string name="Result-ColumnFile">Файл</string>
-    <string name="Result-ColumnAttributes">Аттрибуты</string>
+    <string name="Result-ColumnAttributes">Что найдено</string>
     <string name="Result-ColumnCount">Кол-во</string>
     <string name="Result-ColumnSize">Размер</string>
     <string name="Result-ColumnScore">Оценка</string>

shared/src/commonMain/kotlin/ru/packetdima/datascanner/scan/common/files/FileType.kt

@@ -8,9 +8,6 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.withContext
 import org.apache.pdfbox.pdmodel.PDDocument
 import org.apache.pdfbox.text.PDFTextStripper
-import org.apache.poi.hslf.usermodel.HSLFSlideShow
-import org.apache.poi.hslf.usermodel.HSLFTable
-import org.apache.poi.hslf.usermodel.HSLFTextBox
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.odftoolkit.odfdom.doc.OdfSpreadsheetDocument

shared/src/commonMain/kotlin/ru/packetdima/datascanner/scan/common/files/types/IFileType.kt

@@ -2,7 +2,6 @@ package ru.packetdima.datascanner.scan.common.files.types
 
 import info.downdetector.bigdatascanner.common.Cleaner
 import info.downdetector.bigdatascanner.common.IDetectFunction
-import kotlinx.coroutines.CoroutineScope
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import ru.packetdima.datascanner.common.ScanSettings

shared/src/desktopMain/kotlin/ru/packetdima/datascanner/ui/windows/screens/scans/components/AttributeCard.kt

@@ -40,7 +40,7 @@ fun AttributeCard(attribute: IDetectFunction) {
 }
 
 @Composable
-fun AttributeCard(attribute: IDetectFunction, onClick: () -> Unit) {
+fun AttributeCard(attribute: IDetectFunction, onClick: () -> Unit, enabled: Boolean) {
     DetectFunctionTooltip(
         detectFunction = attribute
     ) {
@@ -49,8 +49,16 @@ fun AttributeCard(attribute: IDetectFunction, onClick: () -> Unit) {
                 .clip(
                     MaterialTheme.shapes.small
                 )
-                .background(color = MaterialTheme.colorScheme.secondary)
-                .clickable(onClick = onClick)
+                .background(
+                    color = if (enabled)
+                        MaterialTheme.colorScheme.secondary
+                    else
+                        MaterialTheme.colorScheme.outlineVariant
+                )
+                .clickable(
+                    onClick = onClick,
+                    enabled = enabled
+                )
                 .padding(4.dp)
         ) {
             Text(

shared/src/desktopMain/kotlin/ru/packetdima/datascanner/ui/windows/screens/scans/components/ResultTable.kt

@@ -25,6 +25,7 @@ import ru.packetdima.datascanner.resources.*
 import ru.packetdima.datascanner.scan.TaskEntityViewModel
 import ru.packetdima.datascanner.scan.TaskFileResult
 import ru.packetdima.datascanner.scan.TaskFilesViewModel
+import ru.packetdima.datascanner.scan.common.connectors.ConnectorFileShare
 import ru.packetdima.datascanner.scan.common.files.FileType
 import ru.packetdima.datascanner.scan.common.files.LocationFinder
 import ru.packetdima.datascanner.ui.windows.components.MessageBox
@@ -396,7 +397,7 @@ fun ResultTable(
                         }
                     ) { file ->
                         val fileType = FileType.getFileType(file.path)
-                        val locationSupported = fileType != null && LocationFinder.isSupported(fileType)
+                        val locationSupported = fileType != null && LocationFinder.isSupported(fileType) && task.dbTask.connector is ConnectorFileShare
                         val exist = filesExists.contains(file.id)
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
@@ -455,19 +456,15 @@ fun ResultTable(
                                     .weight(0.5f)
                             ) {
                                 file.foundAttributes.forEach { attr ->
-                                    if (locationSupported && exist)
-                                        AttributeCard(
-                                            attribute = attr,
-                                            onClick = {
-                                                attributeSelected = attr
-                                                filePathSelected = file.path
-                                                longScanMessageBoxVisible = true
-                                            }
-                                        )
-                                    else
-                                        AttributeCard(
-                                            attribute = attr
-                                        )
+                                    AttributeCard(
+                                        attribute = attr,
+                                        onClick = {
+                                            attributeSelected = attr
+                                            filePathSelected = file.path
+                                            longScanMessageBoxVisible = true
+                                        },
+                                        enabled = locationSupported && exist
+                                    )
                                 }
                             }
                             Text(