WIP

4rthem · 4rthem · commit 164f65497955 · 2025-09-23T13:16:25.000+02:00
diff --git a/databox/api/migrations/Version20250923095101.php b/databox/api/migrations/Version20250923095101.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250923095101 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE asset_title_attribute ADD "target" SMALLINT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            UPDATE asset_title_attribute SET "target" = 1
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE asset_title_attribute ALTER COLUMN "target" SET NOT NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE asset_title_attribute DROP "target"
+        SQL);
+    }
+}
diff --git a/databox/api/src/Asset/Attribute/AssetTitleResolver.php b/databox/api/src/Asset/Attribute/AssetTitleResolver.php
@@ -8,6 +8,7 @@
 use App\Entity\Core\Asset;
 use App\Entity\Core\AssetTitleAttribute;
 use App\Entity\Core\Attribute;
+use App\Model\AssetTypeEnum;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -24,9 +25,14 @@ public function __construct(
 
     public function resolveTitle(Asset $asset, AttributeIndex $attributesIndex, array $preferredLocales): Attribute|string|null
     {
+        $target = $asset->isStory() ? AssetTypeEnum::Story : AssetTypeEnum::Asset;
         if (empty($asset->getTitle()) || $this->hasTitleOverride($asset->getWorkspaceId())) {
             $titleAttrs = $this->getTitleAttributes($asset->getWorkspaceId());
             foreach ($titleAttrs as $attrTitle) {
+                if (!$attrTitle->isForTarget($target)) {
+                    continue;
+                }
+
                 $attributeDefinition = $attrTitle->getDefinition();
                 if ($attributeDefinition->isMultiple()) {
                     $this->logger->warning(sprintf('Cannot use multiple attribute definition "%s" as title', $attributeDefinition->getId()));
diff --git a/databox/api/src/Controller/Admin/AssetTitleAttributeCrudController.php b/databox/api/src/Controller/Admin/AssetTitleAttributeCrudController.php
@@ -9,6 +9,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Config\Filters;
 use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\BooleanField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\IntegerField;
 use EasyCorp\Bundle\EasyAdminBundle\Filter\BooleanFilter;
 use EasyCorp\Bundle\EasyAdminBundle\Filter\EntityFilter;
@@ -46,6 +47,7 @@ public function configureFields(string $pageName): iterable
         yield AssociationField::new('definition');
         yield IntegerField::new('priority');
         yield BooleanField::new('overrides');
+        yield ChoiceField::new('target');
 
     }
 }
diff --git a/databox/api/src/Entity/Core/AssetTitleAttribute.php b/databox/api/src/Entity/Core/AssetTitleAttribute.php
@@ -5,6 +5,7 @@
 namespace App\Entity\Core;
 
 use Alchemy\CoreBundle\Entity\AbstractUuidEntity;
+use App\Model\AssetTypeEnum;
 use App\Validator\SameWorkspaceConstraint;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
@@ -26,6 +27,9 @@ class AssetTitleAttribute extends AbstractUuidEntity
     #[ORM\Column(type: Types::SMALLINT, nullable: false)]
     private int $priority = 0;
 
+    #[ORM\Column(type: Types::SMALLINT, nullable: false, enumType: AssetTypeEnum::class)]
+    private AssetTypeEnum $target = AssetTypeEnum::Asset;
+
     /**
      * Whether to override "title" attribute set on asset.
      */
@@ -71,4 +75,19 @@ public function setOverrides(bool $overrides): void
     {
         $this->overrides = $overrides;
     }
+
+    public function getTarget(): AssetTypeEnum
+    {
+        return $this->target;
+    }
+
+    public function isForTarget(AssetTypeEnum $target): bool
+    {
+        return ($this->target->value & $target->value) === $target->value;
+    }
+
+    public function setTarget(AssetTypeEnum $target): void
+    {
+        $this->target = $target;
+    }
 }
diff --git a/databox/api/src/Model/AssetTypeEnum.php b/databox/api/src/Model/AssetTypeEnum.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Model;
+
+enum AssetTypeEnum: int
+{
+    case Asset = 1;
+    case Story = 2;
+    case Both = 3;
+}
diff --git a/databox/client/src/components/AssetList/Layouts/Grid/AssetItem.tsx b/databox/client/src/components/AssetList/Layouts/Grid/AssetItem.tsx
@@ -133,6 +133,7 @@ export default function AssetItem<Item extends AssetOrAssetContainer>({
                 )}
                 {asset.collections && asset.collections.length > 0 && (
                     <AssetCollectionList
+                        asset={asset}
                         onOpenAsset={onOpen}
                         collections={asset.collections!}
                     />
diff --git a/databox/client/src/components/AssetList/types.ts b/databox/client/src/components/AssetList/types.ts
@@ -9,7 +9,11 @@ export type OnAddToBasket = (asset: Asset, e?: MouseEvent) => void;
 export type OnSelectionChange<Item extends AssetOrAssetContainer> = (
     items: Item[]
 ) => void;
-export type OnOpen = (asset: Asset, renditionId?: string) => void;
+export type OnOpen = (
+    asset: Asset,
+    renditionId?: string,
+    storyAssetId?: string
+) => void;
 export type OnToggle<Item extends AssetOrAssetContainer> = (
     item: Item,
     e?: MouseEvent
diff --git a/databox/client/src/components/AssetSearch/AssetSearch.tsx b/databox/client/src/components/AssetSearch/AssetSearch.tsx
@@ -7,17 +7,13 @@ import {Fab} from '@mui/material';
 import AddIcon from '@mui/icons-material/Add';
 import {useAuth} from '@alchemy/react-auth';
 import UploadModal from '../Upload/UploadModal';
-import {modalRoutes, Routing} from '../../routes';
-import {useNavigateToModal} from '../Routing/ModalLink';
-import {OnOpen} from '../AssetList/types';
-import {AssetContextState} from '../Media/Asset/assetTypes.ts';
+import {useOpenAsset} from './useOpenAsset.ts';
 
 type Props = {};
 
 export default function AssetSearch({}: Props) {
     const resultContext = React.useContext(ResultContext);
     const {openModal} = useModals();
-    const navigateToModal = useNavigateToModal();
     const authContext = useAuth();
 
     const openDebug = resultContext.debug
@@ -36,33 +32,9 @@ export default function AssetSearch({}: Props) {
         });
     }, []);
 
-    const onOpen = useCallback<OnOpen>(
-        (asset, renditionId): void => {
-            if (!renditionId) {
-                renditionId = asset.original?.id;
-            }
-
-            navigateToModal(
-                modalRoutes.assets.routes.view,
-                {
-                    id: asset.id,
-                    renditionId: renditionId || Routing.UnknownRendition,
-                },
-                {
-                    state: {
-                        assetsContext: resultContext.pages
-                            .flat()
-                            .map(a => [
-                                a.id,
-                                a.original?.id,
-                            ]) as AssetContextState,
-                    },
-                }
-            );
-            // eslint-disable-next-line
-        },
-        [navigateToModal, resultContext]
-    );
+    const onOpen = useOpenAsset({
+        resultContext,
+    });
 
     return (
         <>
diff --git a/databox/client/src/components/AssetSearch/useOpenAsset.ts b/databox/client/src/components/AssetSearch/useOpenAsset.ts
@@ -0,0 +1,43 @@
+import {useCallback} from 'react';
+import {OnOpen} from '../AssetList/types.ts';
+import {modalRoutes, Routing} from '../../routes.ts';
+import {AssetContextState} from '../Media/Asset/assetTypes.ts';
+import {useNavigateToModal} from '../Routing/ModalLink.tsx';
+import {TResultContext} from '../Media/Search/ResultContext.tsx';
+
+type Props = {
+    resultContext?: TResultContext;
+};
+
+export function useOpenAsset({resultContext}: Props) {
+    const navigateToModal = useNavigateToModal();
+
+    return useCallback<OnOpen>(
+        (asset, renditionId, storyAssetId): void => {
+            if (!renditionId) {
+                renditionId = asset.original?.id;
+            }
+
+            navigateToModal(
+                modalRoutes.assets.routes.view,
+                {
+                    id: asset.id,
+                    renditionId: renditionId || Routing.UnknownRendition,
+                },
+                {
+                    state: {
+                        storyAssetId,
+                        assetsContext: resultContext?.pages
+                            .flat()
+                            .map(a => [
+                                a.id,
+                                a.original?.id,
+                            ]) as AssetContextState,
+                    },
+                }
+            );
+            // eslint-disable-next-line
+        },
+        [navigateToModal, resultContext]
+    );
+}
diff --git a/databox/client/src/components/Basket/BasketViewDialog.tsx b/databox/client/src/components/Basket/BasketViewDialog.tsx
@@ -2,9 +2,9 @@ import {StackedModalProps, useParams} from '@alchemy/navigation';
 import {AppDialog} from '@alchemy/phrasea-ui';
 import {Basket, BasketAsset} from '../../types';
 import {Trans, useTranslation} from 'react-i18next';
-import React, {useCallback} from 'react';
+import React from 'react';
 import {getBasket, getBasketAssets} from '../../api/basket';
-import {useCloseModal, useNavigateToModal} from '../Routing/ModalLink';
+import {useCloseModal} from '../Routing/ModalLink';
 import AssetList from '../AssetList/AssetList';
 import {BasketSelectionContext} from '../../context/BasketSelectionContext';
 import DisplayProvider from '../Media/DisplayProvider';
@@ -21,18 +21,17 @@ import BasketsPanel from './BasketsPanel';
 import {leftPanelWidth} from '../../themes/base';
 import {ZIndex} from '../../themes/zIndex';
 import Box from '@mui/material/Box';
-import {ActionsContext, OnOpen} from '../AssetList/types';
-import {modalRoutes, Routing} from '../../routes';
+import {ActionsContext} from '../AssetList/types';
 import BasketItem from './BasketItem';
 import {createDefaultActionsContext} from '../AssetList/actionContext.ts';
+import {useOpenAsset} from '../AssetSearch/useOpenAsset.ts';
 
 type Props = {} & StackedModalProps;
 
 export default function BasketViewDialog({modalIndex, open}: Props) {
     const {t} = useTranslation();
     const {id} = useParams();
     const closeModal = useCloseModal();
-    const navigateToModal = useNavigateToModal();
 
     const [data, setData] = React.useState<Basket>();
     const [pagination, setPagination] = React.useState<Pagination<BasketAsset>>(
@@ -53,16 +52,7 @@ export default function BasketViewDialog({modalIndex, open}: Props) {
         [loadItems, pagination]
     );
 
-    const onOpen = useCallback<OnOpen>(
-        (asset, renditionId): void => {
-            navigateToModal(modalRoutes.assets.routes.view, {
-                id: asset.id,
-                renditionId: renditionId || Routing.UnknownRendition,
-            });
-            // eslint-disable-next-line
-        },
-        [navigateToModal]
-    );
+    const onOpen = useOpenAsset({});
 
     React.useEffect(() => {
         getBasket(id!).then(setData);
diff --git a/databox/client/src/components/Media/Asset/View/AssetView.tsx b/databox/client/src/components/Media/Asset/View/AssetView.tsx
@@ -3,7 +3,7 @@ import {Asset, AssetRendition} from '../../../../types.ts';
 import {AppDialog} from '@alchemy/phrasea-ui';
 import {MemoizedFilePlayer} from '../FilePlayer.tsx';
 import {useWindowSize} from '@alchemy/react-hooks/src/useWindowSize.ts';
-import {StackedModalProps, useParams} from '@alchemy/navigation';
+import {StackedModalProps, useParams, useLocation} from '@alchemy/navigation';
 import {Dimensions, filePlayerRelativeWrapperClassName} from '../Players';
 import {Box, Typography} from '@mui/material';
 import FileIntegrations from '../FileIntegrations.tsx';
@@ -57,6 +57,7 @@ export default function AssetView({modalIndex, open}: Props) {
     const headerHeight = 60;
     let heightRest = headerHeight;
     const {id: assetId, renditionId} = useParams();
+    const {state} = useLocation();
     const assetAnnotationsRef: AssetAnnotationRef = useRef(null);
     const messageFormRef: MessageFormRef = useRef(null);
     const previousData = useRef<DataTuple | undefined>();
@@ -67,18 +68,14 @@ export default function AssetView({modalIndex, open}: Props) {
     const queryKey = ['assets', assetId];
     const [storyAssets, setStoryAssets] =
         React.useState<ApiCollectionResponse<Asset>>();
-    const [currentStoryAsset, setCurrentStoryAsset] = React.useState<
-        Asset | undefined
-    >();
+    const [currentStoryAssetId, setCurrentStoryAssetId] = React.useState<
+        string | undefined
+    >(state?.storyAssetId);
 
     useChannelRegistration(`asset-${assetId}`, `asset_ingested`, () => {
         queryClient.invalidateQueries({queryKey});
     });
 
-    React.useEffect(() => {
-        setCurrentStoryAsset(undefined);
-    }, [assetId]);
-
     const {data, isSuccess, isError} = useModalFetch({
         queryKey,
         staleTime: 2000,
@@ -176,6 +173,10 @@ export default function AssetView({modalIndex, open}: Props) {
     }
 
     const panelHeight = winSize.innerHeight - headerHeight;
+
+    const currentStoryAsset = currentStoryAssetId
+        ? storyAssets?.result.find(a => a.id === currentStoryAssetId)
+        : undefined;
     const displayedAsset = currentStoryAsset || asset;
 
     const displayedRenditionFile = currentStoryAsset
@@ -300,7 +301,7 @@ export default function AssetView({modalIndex, open}: Props) {
                                             selectedAsset={displayedAsset}
                                             story={asset}
                                             onAssetClick={a => {
-                                                setCurrentStoryAsset(a);
+                                                setCurrentStoryAssetId(a.id);
                                             }}
                                         />
                                     ) : null}
diff --git a/databox/client/src/components/Media/Asset/Widgets/AssetCollectionList.tsx b/databox/client/src/components/Media/Asset/Widgets/AssetCollectionList.tsx
@@ -6,14 +6,17 @@ import {useTranslation} from 'react-i18next';
 import {WorkspaceChip} from '../../../Ui/WorkspaceChip.tsx';
 import {CollectionChip} from '../../../Ui/CollectionChip.tsx';
 import CollectionStoryChip from '../../../Ui/CollectionStoryChip.tsx';
+import {OnOpen} from '../../../AssetList/types.ts';
 
 type Props = {
+    asset: Asset;
     workspace?: Workspace;
     collections: Collection[];
-    onOpenAsset?: (asset: Asset) => void;
+    onOpenAsset?: OnOpen;
 };
 
 export default function AssetCollectionList({
+    asset,
     workspace,
     collections,
     onOpenAsset,
@@ -32,6 +35,7 @@ export default function AssetCollectionList({
             return (
                 <CollectionStoryChip
                     key={c.id}
+                    asset={asset}
                     onOpen={onOpenAsset}
                     storyAsset={c.storyAsset}
                 />
diff --git a/databox/client/src/components/Ui/CollectionStoryChip.tsx b/databox/client/src/components/Ui/CollectionStoryChip.tsx

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`use EasyCorp\Bundle\EasyAdminBundle\Config\Filters;`
`10`	`10`	`use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField;`
`11`	`11`	`use EasyCorp\Bundle\EasyAdminBundle\Field\BooleanField;`
	`12`	`+use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;`
`12`	`13`	`use EasyCorp\Bundle\EasyAdminBundle\Field\IntegerField;`
`13`	`14`	`use EasyCorp\Bundle\EasyAdminBundle\Filter\BooleanFilter;`
`14`	`15`	`use EasyCorp\Bundle\EasyAdminBundle\Filter\EntityFilter;`
`@@ -46,6 +47,7 @@ public function configureFields(string $pageName): iterable`
`46`	`47`	`yield AssociationField::new('definition');`
`47`	`48`	`yield IntegerField::new('priority');`
`48`	`49`	`yield BooleanField::new('overrides');`
	`50`	`+ yield ChoiceField::new('target');`
`49`	`51`
`50`	`52`	`}`
`51`	`53`	`}`