diff --git a/public/main/inc/lib/PortfolioController.php b/public/main/inc/lib/PortfolioController.php
index 7d893904160..9a019e13af3 100644
--- a/public/main/inc/lib/PortfolioController.php
+++ b/public/main/inc/lib/PortfolioController.php
@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceLink;
 use Chamilo\CoreBundle\Enums\ActionIcon;
 use Chamilo\CoreBundle\Enums\ObjectIcon;
 use Chamilo\CoreBundle\Enums\StateIcon;
@@ -29,6 +31,8 @@
 use Chamilo\CoreBundle\Event\PortfolioItemViewedEvent;
 use Chamilo\CoreBundle\Event\PortfolioItemVisibilityChangedEvent;
 use Chamilo\CoreBundle\Framework\Container;
+use Chamilo\CoreBundle\Repository\Node\PortfolioCommentRepository;
+use Chamilo\CoreBundle\Repository\ResourceLinkRepository;
 use Chamilo\CourseBundle\Entity\CItemProperty;
 use Doctrine\ORM\Query\Expr\Join;
 use Mpdf\MpdfException;
@@ -1072,7 +1076,6 @@ public function index(HttpRequest $httpRequest): void
             'found_comments' => $foundComments,
             '_p' => Template::getLegacyP(),
             '_c' => Template::getLegacyC(),
-            'is_allowed_to_edit' => api_is_allowed_to_edit(false),
         ];
 
         $js = '<script>
@@ -1112,21 +1115,23 @@ public function view(Portfolio $item, $urlUser)
     {
         global $interbreadcrumb;
 
+        /** @var ResourceLinkRepository $resourceLinkRepo */
+        $resourceLinkRepo = Database::getManager()->getRepository(ResourceLink::class);
+
+        $firstResourceLink = $item->getFirstResourceLink();
+
         if (!$this->itemBelongToOwner($item)) {
             if ($this->advancedSharingEnabled) {
-                $courseInfo = api_get_course_info_by_id($this->course->getId());
-                $sessionId = $this->session ? $this->session->getId() : 0;
-
-                $itemPropertyVisiblity = api_get_item_visibility(
-                    $courseInfo,
-                    TOOL_PORTFOLIO,
-                    $item->getId(),
-                    $sessionId,
-                    $this->owner->getId(),
-                    'visible'
+                $userLink = $resourceLinkRepo->findLinkForResourceInContext(
+                    $item,
+                    $this->course,
+                    $this->session,
+                    null,
+                    null,
+                    $this->owner
                 );
 
-                if ($item->getVisibility() === Portfolio::VISIBILITY_PER_USER && 1 !== $itemPropertyVisiblity) {
+                if ($item->getVisibility() === Portfolio::VISIBILITY_PER_USER && !$userLink) {
                     api_not_allowed(true);
                 }
             } elseif ($item->getVisibility() === Portfolio::VISIBILITY_HIDDEN
@@ -1141,52 +1146,48 @@ public function view(Portfolio $item, $urlUser)
             Events::PORTFOLIO_ITEM_VIEWED
         );
 
-        $itemCourse = $item->getCourse();
-        $itemSession = $item->getSession();
+        $itemCourse = $firstResourceLink?->getCourse();
+        $itemSession = $firstResourceLink?->getSession();
 
         $form = $this->createCommentForm($item);
 
-        $commentsRepo = $this->em->getRepository(PortfolioComment::class);
+        $commentsRepo = Container::getPortfolioCommentRepository();
 
-        $commentsQueryBuilder = $commentsRepo->createQueryBuilder('comment');
-        $commentsQueryBuilder->where('comment.item = :item');
+        $commentsQueryBuilder = $commentsRepo->getResources();
+        $commentsQueryBuilder->andWhere('resource.item = :item');
 
         if ($this->advancedSharingEnabled) {
+            // @todo change to left join with resource_link to get resources with advanced sharing
+            if ($itemCourse) {
+                $commentsQueryBuilder
+                    ->andWhere($commentsQueryBuilder->expr()->eq('links.course', ':course'))
+                    ->setParameter('course', $itemCourse->getId());
+                ;
+            }
+
             $commentsQueryBuilder
-                ->leftJoin(
-                    CItemProperty::class,
-                    'cip',
-                    Join::WITH,
-                    "cip.ref = comment.id
-                        AND cip.tool = :cip_tool
-                        AND cip.course = :course
-                        AND cip.lasteditType = 'visible'
-                        AND cip.toUser = :current_user"
-                )
+                ->andWhere($commentsQueryBuilder->expr()->eq('links.user', ':current_user'))
                 ->andWhere(
-                    sprintf(
-                        'comment.visibility = %d
-                            OR (
-                                comment.visibility = %d AND cip IS NOT NULL OR comment.author = :current_user
-                            )',
-                        PortfolioComment::VISIBILITY_VISIBLE,
-                        PortfolioComment::VISIBILITY_PER_USER
+                    $commentsQueryBuilder->expr()->orX(
+                        $commentsQueryBuilder->expr()->eq('resource.visibility', PortfolioComment::VISIBILITY_PER_USER),
+                        $commentsQueryBuilder->expr()->andX(
+                            $commentsQueryBuilder->expr()->eq('resource.visibility', PortfolioComment::VISIBILITY_VISIBLE),
+                            $commentsQueryBuilder->expr()->eq('node.creator', ':current_user')
+                        )
                     )
                 )
-                ->setParameter('cip_tool', TOOL_PORTFOLIO_COMMENT)
                 ->setParameter('current_user', $this->owner->getId())
-                ->setParameter('course', $item->getCourse())
             ;
         }
 
-        if (true === api_get_configuration_value('portfolio_show_base_course_post_in_sessions')
-            && $this->session && !$item->getSession() && !$item->isDuplicatedInSession($this->session)
+        if ('true' === api_get_setting('platform.portfolio_show_base_course_post_in_sessions')
+            && $this->session && !$itemSession && !$item->isDuplicatedInSession($this->session)
         ) {
             $comments = [];
         } else {
             $comments = $commentsQueryBuilder
-                ->orderBy('comment.root, comment.lft', 'ASC')
-                ->setParameter('item', $item)
+                ->orderBy('node.level', 'ASC')
+                ->setParameter('item', $item->getId())
                 ->getQuery()
                 ->getArrayResult()
             ;
@@ -1194,178 +1195,187 @@ public function view(Portfolio $item, $urlUser)
 
         $clockIcon = Display::returnFontAwesomeIcon('clock-o', '', true);
 
-        $commentsHtml = $commentsRepo->buildTree(
-            $comments,
-            [
-                'decorate' => true,
-                'rootOpen' => '<div class="media-list">',
-                'rootClose' => '</div>',
-                'childOpen' => function ($node) use ($commentsRepo) {
-                    /** @var PortfolioComment $comment */
-                    $comment = $commentsRepo->find($node['id']);
-                    $author = $comment->getAuthor();
-
-                    $userPicture = UserManager::getUserPicture(
-                        $comment->getAuthor()->getId(),
-                        USER_IMAGE_SIZE_SMALL,
-                        null,
-                        [
-                            'picture_uri' => $author->getPictureUri(),
-                            'email' => $author->getEmail(),
-                        ]
-                    );
-
-                    return '<article class="media" id="comment-'.$node['id'].'">
-                        <div class="media-left"><img class="media-object thumbnail" src="'.$userPicture.'" alt="'
-                        .$author->getFullName().'"></div>
-                        <div class="media-body">';
-                },
-                'childClose' => '</div></article>',
-                'nodeDecorator' => function ($node) use ($commentsRepo, $clockIcon, $item) {
-                    $commentActions = [];
-                    /** @var PortfolioComment $comment */
-                    $comment = $commentsRepo->find($node['id']);
-
-                    if ($this->commentBelongsToOwner($comment)) {
-                        $commentActions[] = Display::url(
-                            Display::getMdiIcon(
-                                ActionIcon::FIX,
-                                $item->isTemplate() ? 'ch-tool-icon' : 'ch-tool-icon-disabled',
-                                null,
-                                ICON_SIZE_MEDIUM,
-                                $item->isTemplate() ? get_lang('Remove as template') : get_lang('Add as a template'),
-                            ),
-                            $this->baseUrl.http_build_query(['action' => 'template_comment', 'id' => $comment->getId()])
-                        );
-                    }
-
-                    $commentActions[] = Display::url(
-                        Display::getMdiIcon(ActionIcon::COMMENT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Reply to this comment')),
-                        '#',
-                        [
-                            'data-comment' => htmlspecialchars(
-                                json_encode(['id' => $comment->getId()])
-                            ),
-                            'role' => 'button',
-                            'class' => 'btn-reply-to',
-                        ]
-                    );
-                    $commentActions[] = Display::url(
-                        Display::getMdiIcon(ActionIcon::COPY_CONTENT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Copy to my portfolio')),
-                        $this->baseUrl.http_build_query(
-                            [
-                                'action' => 'copy',
-                                'copy' => 'comment',
-                                'id' => $comment->getId(),
-                            ]
-                        )
-                    );
-
-                    $isAllowedToEdit = api_is_allowed_to_edit();
-
-                    if ($isAllowedToEdit) {
-                        $commentActions[] = Display::url(
-                            Display::getMdiIcon(ActionIcon::COPY_CONTENT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Copy to student portfolio')),
-                            $this->baseUrl.http_build_query(
-                                [
-                                    'action' => 'teacher_copy',
-                                    'copy' => 'comment',
-                                    'id' => $comment->getId(),
-                                ]
-                            )
-                        );
-
-                        if ($comment->isImportant()) {
-                            $commentActions[] = Display::url(
-                                Display::getMdiIcon(ObjectIcon::PIN, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Unmark comment as important')),
-                                $this->baseUrl.http_build_query(
-                                    [
-                                        'action' => 'mark_important',
-                                        'item' => $item->getId(),
-                                        'id' => $comment->getId(),
-                                    ]
-                                )
-                            );
-                        } else {
-                            $commentActions[] = Display::url(
-                                Display::getMdiIcon(ObjectIcon::PIN, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Mark comment as important')),
-                                $this->baseUrl.http_build_query(
-                                    [
-                                        'action' => 'mark_important',
-                                        'item' => $item->getId(),
-                                        'id' => $comment->getId(),
-                                    ]
-                                )
-                            );
-                        }
-
-                        if ($this->course && '1' === api_get_course_setting('qualify_portfolio_comment')) {
-                            $commentActions[] = Display::url(
-                                Display::getMdiIcon(ObjectIcon::TEST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Grade this comment')),
-                                $this->baseUrl.http_build_query(
-                                    [
-                                        'action' => 'qualify',
-                                        'comment' => $comment->getId(),
-                                    ]
-                                )
-                            );
-                        }
-                    }
-
-                    if ($this->commentBelongsToOwner($comment)) {
-                        if ($this->advancedSharingEnabled) {
-                            $commentActions[] = Display::url(
-                                Display::getMdiIcon(ActionIcon::VISIBLE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Choose recipients')),
-                                $this->baseUrl.http_build_query(['action' => 'comment_visiblity_choose', 'id' => $comment->getId()])
-                            );
-                        }
-
-                        $commentActions[] = Display::url(
-                            Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Edit')),
-                            $this->baseUrl.http_build_query(['action' => 'edit_comment', 'id' => $comment->getId()])
-                        );
-                        $commentActions[] = Display::url(
-                            Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Delete')),
-                            $this->baseUrl.http_build_query(['action' => 'delete_comment', 'id' => $comment->getId()])
-                        );
-                    }
-
-                    $nodeHtml = '<div class="pull-right">'.implode(PHP_EOL, $commentActions).'</div>'.PHP_EOL
-                        .'<footer class="media-heading h4">'.PHP_EOL
-                        .'<p>'.$comment->getAuthor()->getFullName().'</p>'.PHP_EOL;
-
-                    if ($comment->isImportant()
-                        && ($this->itemBelongToOwner($comment->getItem()) || $isAllowedToEdit)
-                    ) {
-                        $nodeHtml .= '<span class="pull-right label label-warning origin-style">'
-                            .get_lang('Portfolio item marked as important')
-                            .'</span>'.PHP_EOL;
-                    }
-
-                    $nodeHtml .= '<small>'.$clockIcon.PHP_EOL
-                        .$this->getLabelForCommentDate($comment).'</small>'.PHP_EOL;
-
-                    $nodeHtml .= '</footer>'.PHP_EOL
-                        .Security::remove_XSS($comment->getContent()).PHP_EOL;
-
-                    $nodeHtml .= $this->generateAttachmentList($comment);
-
-                    return $nodeHtml;
-                },
-            ]
-        );
-
-        $template = new Template(null, false, false, false, false, false, false);
-        $template->assign('baseurl', $this->baseUrl);
-        $template->assign('item', $item);
-        $template->assign('item_content', $this->generateItemContent($item));
-        $template->assign('count_comments', count($comments));
-        $template->assign('comments', $commentsHtml);
-        $template->assign('form', $form);
-        $template->assign('attachment_list', $this->generateAttachmentList($item));
+        $commentsHtml = '';
+
+//        $commentsRepo->buildTree(
+//            $comments,
+//            [
+//                'decorate' => true,
+//                'rootOpen' => '<div class="media-list">',
+//                'rootClose' => '</div>',
+//                'childOpen' => function ($node) use ($commentsRepo) {
+//                    /** @var PortfolioComment $comment */
+//                    $comment = $commentsRepo->find($node['id']);
+//                    $author = $comment->getAuthor();
+//
+//                    $userPicture = UserManager::getUserPicture(
+//                        $comment->getAuthor()->getId(),
+//                        USER_IMAGE_SIZE_SMALL,
+//                        null,
+//                        [
+//                            'picture_uri' => $author->getPictureUri(),
+//                            'email' => $author->getEmail(),
+//                        ]
+//                    );
+//
+//                    return '<article class="media" id="comment-'.$node['id'].'">
+//                        <div class="media-left"><img class="media-object thumbnail" src="'.$userPicture.'" alt="'
+//                        .$author->getFullName().'"></div>
+//                        <div class="media-body">';
+//                },
+//                'childClose' => '</div></article>',
+//                'nodeDecorator' => function ($node) use ($commentsRepo, $clockIcon, $item) {
+//                    $commentActions = [];
+//                    /** @var PortfolioComment $comment */
+//                    $comment = $commentsRepo->find($node['id']);
+//
+//                    if ($this->commentBelongsToOwner($comment)) {
+//                        $commentActions[] = Display::url(
+//                            Display::getMdiIcon(
+//                                ActionIcon::FIX,
+//                                $item->isTemplate() ? 'ch-tool-icon' : 'ch-tool-icon-disabled',
+//                                null,
+//                                ICON_SIZE_MEDIUM,
+//                                $item->isTemplate() ? get_lang('Remove as template') : get_lang('Add as a template'),
+//                            ),
+//                            $this->baseUrl.http_build_query(['action' => 'template_comment', 'id' => $comment->getId()])
+//                        );
+//                    }
+//
+//                    $commentActions[] = Display::url(
+//                        Display::getMdiIcon(ActionIcon::COMMENT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Reply to this comment')),
+//                        '#',
+//                        [
+//                            'data-comment' => htmlspecialchars(
+//                                json_encode(['id' => $comment->getId()])
+//                            ),
+//                            'role' => 'button',
+//                            'class' => 'btn-reply-to',
+//                        ]
+//                    );
+//                    $commentActions[] = Display::url(
+//                        Display::getMdiIcon(ActionIcon::COPY_CONTENT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Copy to my portfolio')),
+//                        $this->baseUrl.http_build_query(
+//                            [
+//                                'action' => 'copy',
+//                                'copy' => 'comment',
+//                                'id' => $comment->getId(),
+//                            ]
+//                        )
+//                    );
+//
+//                    $isAllowedToEdit = api_is_allowed_to_edit();
+//
+//                    if ($isAllowedToEdit) {
+//                        $commentActions[] = Display::url(
+//                            Display::getMdiIcon(ActionIcon::COPY_CONTENT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Copy to student portfolio')),
+//                            $this->baseUrl.http_build_query(
+//                                [
+//                                    'action' => 'teacher_copy',
+//                                    'copy' => 'comment',
+//                                    'id' => $comment->getId(),
+//                                ]
+//                            )
+//                        );
+//
+//                        if ($comment->isImportant()) {
+//                            $commentActions[] = Display::url(
+//                                Display::getMdiIcon(ObjectIcon::PIN, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Unmark comment as important')),
+//                                $this->baseUrl.http_build_query(
+//                                    [
+//                                        'action' => 'mark_important',
+//                                        'item' => $item->getId(),
+//                                        'id' => $comment->getId(),
+//                                    ]
+//                                )
+//                            );
+//                        } else {
+//                            $commentActions[] = Display::url(
+//                                Display::getMdiIcon(ObjectIcon::PIN, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Mark comment as important')),
+//                                $this->baseUrl.http_build_query(
+//                                    [
+//                                        'action' => 'mark_important',
+//                                        'item' => $item->getId(),
+//                                        'id' => $comment->getId(),
+//                                    ]
+//                                )
+//                            );
+//                        }
+//
+//                        if ($this->course && '1' === api_get_course_setting('qualify_portfolio_comment')) {
+//                            $commentActions[] = Display::url(
+//                                Display::getMdiIcon(ObjectIcon::TEST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Grade this comment')),
+//                                $this->baseUrl.http_build_query(
+//                                    [
+//                                        'action' => 'qualify',
+//                                        'comment' => $comment->getId(),
+//                                    ]
+//                                )
+//                            );
+//                        }
+//                    }
+//
+//                    if ($this->commentBelongsToOwner($comment)) {
+//                        if ($this->advancedSharingEnabled) {
+//                            $commentActions[] = Display::url(
+//                                Display::getMdiIcon(ActionIcon::VISIBLE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Choose recipients')),
+//                                $this->baseUrl.http_build_query(['action' => 'comment_visiblity_choose', 'id' => $comment->getId()])
+//                            );
+//                        }
+//
+//                        $commentActions[] = Display::url(
+//                            Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Edit')),
+//                            $this->baseUrl.http_build_query(['action' => 'edit_comment', 'id' => $comment->getId()])
+//                        );
+//                        $commentActions[] = Display::url(
+//                            Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Delete')),
+//                            $this->baseUrl.http_build_query(['action' => 'delete_comment', 'id' => $comment->getId()])
+//                        );
+//                    }
+//
+//                    $nodeHtml = '<div class="pull-right">'.implode(PHP_EOL, $commentActions).'</div>'.PHP_EOL
+//                        .'<footer class="media-heading h4">'.PHP_EOL
+//                        .'<p>'.$comment->getAuthor()->getFullName().'</p>'.PHP_EOL;
+//
+//                    if ($comment->isImportant()
+//                        && ($this->itemBelongToOwner($comment->getItem()) || $isAllowedToEdit)
+//                    ) {
+//                        $nodeHtml .= '<span class="pull-right label label-warning origin-style">'
+//                            .get_lang('Portfolio item marked as important')
+//                            .'</span>'.PHP_EOL;
+//                    }
+//
+//                    $nodeHtml .= '<small>'.$clockIcon.PHP_EOL
+//                        .$this->getLabelForCommentDate($comment).'</small>'.PHP_EOL;
+//
+//                    $nodeHtml .= '</footer>'.PHP_EOL
+//                        .Security::remove_XSS($comment->getContent()).PHP_EOL;
+//
+//                    $nodeHtml .= $this->generateAttachmentList($comment);
+//
+//                    return $nodeHtml;
+//                },
+//            ]
+//        );
+
+        $context = [];
+        $context['baseurl'] = $this->baseUrl;
+        $context['item'] = $item;
+        $context['course'] = $itemCourse;
+        $context['session'] = $itemSession;
+        $context['item_content'] = $this->generateItemContent($item);
+        $context['count_comments'] = count($comments);
+        $context['comments'] = $commentsHtml;
+        $context['form'] = $form;
+        $context['attachment_list'] = $this->generateAttachmentList($item);
 
         if ($itemCourse) {
-            $propertyInfo = api_get_item_property_info(
+            $context['last_edit'] = [
+                'date' => $firstResourceLink->getUpdatedAt(),
+                'user' => $item->resourceNode->getCreator()->getFullName(),
+            ];
+
+            /*$propertyInfo = api_get_item_property_info(
                 $itemCourse->getId(),
                 TOOL_PORTFOLIO,
                 $item->getId(),
@@ -1373,18 +1383,14 @@ public function view(Portfolio $item, $urlUser)
             );
 
             if ($propertyInfo && empty($propertyInfo['to_user_id'])) {
-                $template->assign(
-                    'last_edit',
-                    [
-                        'date' => $propertyInfo['lastedit_date'],
-                        'user' => api_get_user_entity($propertyInfo['lastedit_user_id'])->getFullName(),
-                    ]
-                );
-            }
+                $context['last_edit'] = [
+                    'date' => $propertyInfo['lastedit_date'],
+                    'user' => api_get_user_entity($propertyInfo['lastedit_user_id'])->getFullName(),
+                ];
+            }*/
         }
 
-        $layout = $template->get_template('Portfolio/view.html.twig');
-        $content = $template->fetch($layout);
+        $content = Container::getTwig()->render('@ChamiloCore/Portfolio/view.html.twig', $context);
 
         $interbreadcrumb[] = ['name' => get_lang('Portfolio'), 'url' => $this->baseUrl];
 
@@ -1837,8 +1843,8 @@ public function details(HttpRequest $httpRequest)
             ;
             $frmStudent->setDefaults(['user' => $this->owner->getId()]);
             $frmStudent->addHidden('action', 'details');
-            $frmStudent->addHidden('cidReq', $this->course->getCode());
-            $frmStudent->addHidden('id_session', $this->session ? $this->session->getId() : 0);
+            $frmStudent->addHidden('cid', $this->course->getId());
+            $frmStudent->addHidden('sid', $this->session ? $this->session->getId() : 0);
             $frmStudent->addButtonFilter(get_lang('Filter'));
         }
 
@@ -2939,9 +2945,9 @@ function ($id) use ($editIcon, $deleteIcon) {
         $table->set_additional_parameters(
             [
                 'action' => 'tags',
-                'cidReq' => $this->course->getCode(),
-                'id_session' => $this->session ? $this->session->getId() : 0,
-                'gidReq' => 0,
+                'cid' => $this->course->getId(),
+                'sid' => $this->session ? $this->session->getId() : 0,
+                'gid' => 0,
             ]
         );
 
@@ -3601,9 +3607,9 @@ private function createFormTagFilter(bool $listByUser = false): FormValidator
         $frmTagList->addButtonFilter(get_lang('Filter'));
 
         if ($this->course) {
-            $frmTagList->addHidden('cidReq', $this->course->getCode());
-            $frmTagList->addHidden('id_session', $this->session ? $this->session->getId() : 0);
-            $frmTagList->addHidden('gidReq', 0);
+            $frmTagList->addHidden('cid', $this->course->getId());
+            $frmTagList->addHidden('sid', $this->session ? $this->session->getId() : 0);
+            $frmTagList->addHidden('gid', 0);
             $frmTagList->addHidden('gradebook', 0);
             $frmTagList->addHidden('origin', '');
             $frmTagList->addHidden('categoryId', 0);
@@ -3796,11 +3802,12 @@ private function getItemsForIndex(
     ) {
         $currentUserId = api_get_user_id();
 
+        $portfolioRepo = Container::getPortfolioRepository();
+
         if ($this->course) {
             $showBaseContentInSession = $this->session
-                && true === api_get_configuration_value('portfolio_show_base_course_post_in_sessions');
+                && 'true' === api_get_setting('platform.portfolio_show_base_course_post_in_sessions');
 
-            $portfolioRepo = Container::getPortfolioRepository();
             $portfolioCategoryHelper = Container::getPortfolioCategoryHelper();
 
             $filters = $frmFilterList && $frmFilterList->validate() ? $frmFilterList->exportValues() : [];
@@ -3852,22 +3859,32 @@ private function getItemsForIndex(
             if ($showBaseContentInSession) {
                 $items = array_filter(
                     $items,
-                    fn (Portfolio $item) => !($this->session && !$item->getSession() && $item->isDuplicatedInSession($this->session))
+                    function (Portfolio $item) {
+                        $itemResourceLink = $item->getFirstResourceLink();
+
+                        return !($this->session && !$itemResourceLink?->getSession()
+                            && $item->isDuplicatedInSession($this->session));
+                    }
                 );
             }
 
             return $items;
         } else {
-            $itemsCriteria = [];
-            $itemsCriteria['category'] = null;
-            $itemsCriteria['user'] = $this->owner;
+            $queryBuilder = $portfolioRepo->getResourcesByCreator($this->owner);
+            $queryBuilder->andWhere($queryBuilder->expr()->isNull('resource.category'));
 
             if ($currentUserId !== $this->owner->getId()) {
-                $itemsCriteria['visibility'] = Portfolio::VISIBILITY_VISIBLE;
+                $queryBuilder
+                    ->andWhere($queryBuilder->expr()->eq('resource.visibility', ':visible'))
+                    ->setParameter('visible', Portfolio::VISIBILITY_VISIBLE)
+                ;
             }
 
-            $items = Container::getPortfolioRepository()
-                ->findBy($itemsCriteria, ['creationDate' => 'DESC']);
+            $items = $queryBuilder
+                ->orderBy('node.createdAt', 'DESC')
+                ->getQuery()
+                ->getResult()
+            ;
         }
 
         return $items;
@@ -3881,15 +3898,7 @@ private function getItemsForIndex(
     private function createCommentForm(Portfolio $item): string
     {
         $formAction = $this->baseUrl.http_build_query(['action' => 'view', 'id' => $item->getId()]);
-
-        $templates = $this->em
-            ->getRepository(PortfolioComment::class)
-            ->findBy(
-                [
-                    'isTemplate' => true,
-                    'author' => $this->owner,
-                ]
-            );
+        $templates = Container::getPortfolioCommentRepository()->findTemplatesByUser($this->owner);
 
         $form = new FormValidator('frm_comment', 'post', $formAction);
         $form->addHeader(get_lang('Add a new comment'));
@@ -3915,10 +3924,12 @@ private function createCommentForm(Portfolio $item): string
 
         $form->addButtonSave(get_lang('Save'));
 
+        $itemResourceLink = $item->getFirstResourceLink();
+
         if ($form->validate()) {
             if ($this->session
                 && true === api_get_configuration_value('portfolio_show_base_course_post_in_sessions')
-                && !$item->getSession()
+                && !$itemResourceLink->getSession()
             ) {
                 $duplicate = $item->duplicateInSession($this->session);
 
@@ -3936,8 +3947,8 @@ private function createCommentForm(Portfolio $item): string
 
             $comment = new PortfolioComment();
             $comment
-                ->setAuthor($this->owner)
-                ->setParent($parentComment)
+                ->setCreator($this->owner)
+                ->setParent($parentComment ?: $item)
                 ->setContent($values['content'])
                 ->setDate(api_get_utc_datetime(null, false, true))
                 ->setItem($item);
@@ -3947,7 +3958,7 @@ private function createCommentForm(Portfolio $item): string
 
             $this->processAttachments(
                 $form,
-                $comment->getAuthor(),
+                $this->owner,
                 $comment->getId(),
                 Portfolio::TYPE_COMMENT
             );
@@ -3989,23 +4000,13 @@ private function createCommentForm(Portfolio $item): string
         return $form->returnForm().$js;
     }
 
-    private function generateAttachmentList($post, bool $includeHeader = true): string
+    private function generateAttachmentList(Portfolio|PortfolioComment $post, bool $includeHeader = true): string
     {
-        $attachmentsRepo = $this->em->getRepository(PortfolioAttachment::class);
+        $attachments = $post->resourceNode->getResourceFiles();
 
-        $postOwnerId = 0;
+        $postOwnerId = $post->getCreator()?->getId();
 
-        if ($post instanceof Portfolio) {
-            $attachments = $attachmentsRepo->findFromItem($post);
-
-            $postOwnerId = $post->getUser()->getId();
-        } elseif ($post instanceof PortfolioComment) {
-            $attachments = $attachmentsRepo->findFromComment($post);
-
-            $postOwnerId = $post->getAuthor()->getId();
-        }
-
-        if (empty($attachments)) {
+        if (!$attachments->count()) {
             return '';
         }
 
@@ -4016,15 +4017,14 @@ private function generateAttachmentList($post, bool $includeHeader = true): stri
         $deleteIcon = Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', 'display: inline-block', ICON_SIZE_MEDIUM, get_lang('Delete attachment'));
         $deleteAttrs = ['class' => 'btn-portfolio-delete'];
 
-        /** @var PortfolioAttachment $attachment */
         foreach ($attachments as $attachment) {
-            $downloadParams = http_build_query(['action' => 'download_attachment', 'file' => $attachment->getPath()]);
-            $deleteParams = http_build_query(['action' => 'delete_attachment', 'file' => $attachment->getPath()]);
+            $downloadParams = http_build_query(['action' => 'download_attachment', 'node_id' => $post->resourceNode->getId()]);
+            $deleteParams = http_build_query(['action' => 'delete_attachment', 'node_id' => $post->resourceNode->getId()]);
 
             $listItems .= '<li>'
                 .'<span class="fa-li fa fa-paperclip" aria-hidden="true"></span>'
                 .Display::url(
-                    Security::remove_XSS($attachment->getFilename()),
+                    Security::remove_XSS($attachment->getOriginalName()),
                     $this->baseUrl.$downloadParams
                 );
 
@@ -4032,8 +4032,8 @@ private function generateAttachmentList($post, bool $includeHeader = true): stri
                 $listItems .= PHP_EOL.Display::url($deleteIcon, $this->baseUrl.$deleteParams, $deleteAttrs);
             }
 
-            if ($attachment->getComment()) {
-                $listItems .= '<p class="text-muted">'.Security::remove_XSS($attachment->getComment()).'</p>';
+            if ($fileDescription = $attachment->getDescription()) {
+                $listItems .= '<p class="text-muted">'.Security::remove_XSS($fileDescription).'</p>';
             }
 
             $listItems .= '</li>';
@@ -4352,54 +4352,48 @@ private function getCommentsForIndex(FormValidator $frmFilterList = null): array
             return [];
         }
 
-        $queryBuilder = $this->em->createQueryBuilder()
-            ->select('c')
-            ->from(PortfolioComment::class, 'c')
-        ;
+        $commentsRepo = Container::getPortfolioCommentRepository();
+        $queryBuilder = $commentsRepo->getResources();
 
         if (!empty($values['date'])) {
             $queryBuilder
-                ->andWhere('c.date >= :date')
+                ->andWhere($queryBuilder->expr()->gte('node.createdAt', ':date'))
                 ->setParameter(':date', api_get_utc_datetime($values['date'], false, true))
             ;
         }
 
         if (!empty($values['text'])) {
             $queryBuilder
-                ->andWhere('c.content LIKE :text')
+                ->andWhere($queryBuilder->expr()->like('resource.content', ':text'))
                 ->setParameter('text', '%'.$values['text'].'%')
             ;
         }
 
         if ($this->advancedSharingEnabled) {
+            // @todo change to left join with resource_link to get resources with advanced sharing
+            if ($this->course) {
+                $queryBuilder
+                    ->andWhere($queryBuilder->expr()->eq('links.course', ':course'))
+                    ->setParameter('course', $this->course->getId())
+                ;
+            }
+
             $queryBuilder
-                ->leftJoin(
-                    CItemProperty::class,
-                    'cip',
-                    Join::WITH,
-                    "cip.ref = c.id
-                        AND cip.tool = :cip_tool
-                        AND cip.course = :course
-                        AND cip.lasteditType = 'visible'
-                        AND cip.toUser = :current_user"
-                )
+                ->andWhere($queryBuilder->expr()->eq('links.user', ':current_user'))
                 ->andWhere(
-                    sprintf(
-                        'c.visibility = %d
-                            OR (
-                                c.visibility = %d AND cip IS NOT NULL OR c.author = :current_user
-                            )',
-                        PortfolioComment::VISIBILITY_VISIBLE,
-                        PortfolioComment::VISIBILITY_PER_USER
+                    $queryBuilder->expr()->orX(
+                        $queryBuilder->expr()->eq('resource.visibility', Portfolio::VISIBILITY_VISIBLE),
+                        $queryBuilder->expr()->andX(
+                            $queryBuilder->expr()->eq('resource.visibility', Portfolio::VISIBILITY_PER_USER),
+                            $queryBuilder->expr()->eq('node.creator', ':current_user')
+                        )
                     )
                 )
-                ->setParameter('cip_tool', TOOL_PORTFOLIO_COMMENT)
                 ->setParameter('current_user', $this->owner->getId())
-                ->setParameter('course', $this->course)
             ;
         }
 
-        $queryBuilder->orderBy('c.date', 'DESC');
+        $queryBuilder->orderBy('node.createdAt', 'DESC');
 
         return $queryBuilder->getQuery()->getResult();
     }
diff --git a/public/main/inc/lib/PortfolioNotifier.php b/public/main/inc/lib/PortfolioNotifier.php
index 03f9e8cb938..6f076e7db6f 100644
--- a/public/main/inc/lib/PortfolioNotifier.php
+++ b/public/main/inc/lib/PortfolioNotifier.php
@@ -11,15 +11,16 @@ class PortfolioNotifier
     public static function notifyTeachersAndAuthor(PortfolioComment $comment)
     {
         $item = $comment->getItem();
-        $course = $item->getCourse();
-        $session = $item->getSession();
+        $itemResourceLink = $item->getFirstResourceLink();
+        $course = $itemResourceLink->getCourse();
+        $session = $itemResourceLink->getSession();
 
         $messageSubject = sprintf(
             get_lang('[Portfolio] New comment in post %s'),
             $item->getTitle(true)
         );
         $userIdListToSend = [];
-        $userIdListToSend[] = $comment->getItem()->getUser()->getId();
+        $userIdListToSend[] = $comment->getItem()->resourceNode->getCreator()->getId();
 
         $cidreq = api_get_cidreq_params(
             $course ? $course->getCode() : '',
@@ -58,7 +59,7 @@ public static function notifyTeachersAndAuthor(PortfolioComment $comment)
 
         $messageContent .= '<br><br><figure>'
             .'<blockquote>'.$comment->getExcerpt().'</blockquote>'
-            .'<figcaption>'.$comment->getAuthor()->getFullName().'</figcaption>'
+            .'<figcaption>'.$comment->resourceNode->getCreator()->getFullName().'</figcaption>'
             .'</figure>';
 
         foreach ($userIdListToSend as $userIdToSend) {
@@ -69,7 +70,6 @@ public static function notifyTeachersAndAuthor(PortfolioComment $comment)
                 0,
                 false,
                 false,
-                [],
                 false
             );
         }
@@ -78,7 +78,7 @@ public static function notifyTeachersAndAuthor(PortfolioComment $comment)
     private static function getCourseTitle(CourseEntity $course, ?SessionEntity $session = null): string
     {
         if ($session) {
-            return "{$course->getTitle()} ({$session->getName()})";
+            return "{$course->getTitle()} ({$session->getTitle()})";
         }
 
         return $course->getTitle();
diff --git a/src/CoreBundle/Entity/PortfolioComment.php b/src/CoreBundle/Entity/PortfolioComment.php
index fc01a9f88bb..e5f46415605 100644
--- a/src/CoreBundle/Entity/PortfolioComment.php
+++ b/src/CoreBundle/Entity/PortfolioComment.php
@@ -6,6 +6,7 @@
 
 namespace Chamilo\CoreBundle\Entity;
 
+use Cocur\Slugify\Slugify;
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
 use Stringable;
@@ -24,7 +25,7 @@ class PortfolioComment extends AbstractResource implements ResourceInterface, St
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column(type: 'integer')]
-    private int $id;
+    private ?int $id = null;
 
     #[ORM\ManyToOne(targetEntity: Portfolio::class, inversedBy: 'comments')]
     #[ORM\JoinColumn(name: 'item_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
@@ -143,7 +144,13 @@ public function setVisibility(int $visibility): self
 
     public function getResourceName(): string
     {
-        return 'portfolio_comment_'.$this->id;
+        if ($this->id) {
+            return 'portfolio_comment_'.$this->id;
+        }
+
+        return Slugify::create()->slugify(
+            $this->date->format('c')
+        );
     }
 
     public function setResourceName(string $name): static
diff --git a/src/CoreBundle/Framework/Container.php b/src/CoreBundle/Framework/Container.php
index 02743e4c095..02d91960dbb 100644
--- a/src/CoreBundle/Framework/Container.php
+++ b/src/CoreBundle/Framework/Container.php
@@ -30,6 +30,7 @@
 use Chamilo\CoreBundle\Repository\Node\IllustrationRepository;
 use Chamilo\CoreBundle\Repository\Node\MessageAttachmentRepository;
 use Chamilo\CoreBundle\Repository\Node\PersonalFileRepository;
+use Chamilo\CoreBundle\Repository\Node\PortfolioCommentRepository;
 use Chamilo\CoreBundle\Repository\Node\PortfolioRepository;
 use Chamilo\CoreBundle\Repository\Node\SocialPostAttachmentRepository;
 use Chamilo\CoreBundle\Repository\Node\TicketMessageAttachmentRepository;
@@ -37,6 +38,7 @@
 use Chamilo\CoreBundle\Repository\Node\UserRepository;
 use Chamilo\CoreBundle\Repository\PluginRepository;
 use Chamilo\CoreBundle\Repository\PromotionRepository;
+use Chamilo\CoreBundle\Repository\ResourceFileRepository;
 use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
 use Chamilo\CoreBundle\Repository\SequenceRepository;
 use Chamilo\CoreBundle\Repository\SequenceResourceRepository;
@@ -710,6 +712,12 @@ public static function getPortfolioRepository(): PortfolioRepository
         return self::$container->get(PortfolioRepository::class);
     }
 
+    public static function getPortfolioCommentRepository(): PortfolioCommentRepository
+    {
+        /** @var PortfolioRepository $repo */
+        return self::$container->get(PortfolioCommentRepository::class);
+    }
+
     public static function getPortfolioCategoryHelper(): PortfolioCategoryHelper
     {
         /** @var PortfolioCategoryHelper $helper */
@@ -720,4 +728,9 @@ public static function getSearchIndexPathResolver(): SearchIndexPathResolver
     {
         return self::$container->get(SearchIndexPathResolver::class);
     }
+
+    public static function getResourceFileRepository(): ResourceFileRepository
+    {
+        return self::$container->get(ResourceFileRepository::class);
+    }
 }
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20250927180002.php b/src/CoreBundle/Migrations/Schema/V200/Version20250927180002.php
index ea73e55c16c..edb842eaa40 100644
--- a/src/CoreBundle/Migrations/Schema/V200/Version20250927180002.php
+++ b/src/CoreBundle/Migrations/Schema/V200/Version20250927180002.php
@@ -64,7 +64,7 @@ public function up(Schema $schema): void
 
             $comment->setParent($resourceParent);
 
-            $resourceNode = $portfolioRepo->addResourceNode(
+            $resourceNode = $commentRepo->addResourceNode(
                 $comment,
                 $author,
                 $resourceParent,
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20260116085000.php b/src/CoreBundle/Migrations/Schema/V200/Version20260116085000.php
new file mode 100644
index 00000000000..dec47f4c4e7
--- /dev/null
+++ b/src/CoreBundle/Migrations/Schema/V200/Version20260116085000.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+final class Version20260116085000 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return "Fix wrong resource type for portfolio comments";
+    }
+
+    public function up(Schema $schema): void
+    {
+        $itemsType = $this->connection->fetchAssociative(
+            'SELECT id FROM resource_type WHERE title = ?',
+            ['portfolio_items']
+        );
+        $commentsType = $this->connection->fetchAssociative(
+            'SELECT id FROM resource_type WHERE title = ?',
+            ['portfolio_comments']
+        );
+
+        if (empty($itemsType) || empty($commentsType)) {
+            return;
+        }
+
+        $this->addSql(sprintf(
+            'UPDATE resource_node rn INNER JOIN portfolio_comment pc ON rn.id = pc.resource_node_id SET rn.resource_type_id = %d WHERE rn.resource_type_id = %d',
+            $commentsType['id'],
+            $itemsType['id']
+        ));
+    }
+
+    public function down(Schema $schema): void
+    {
+    }
+}
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20260116085001.php b/src/CoreBundle/Migrations/Schema/V200/Version20260116085001.php
new file mode 100644
index 00000000000..24dbaedeeb8
--- /dev/null
+++ b/src/CoreBundle/Migrations/Schema/V200/Version20260116085001.php
@@ -0,0 +1,285 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Entity\AbstractResource;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Chamilo\CoreBundle\Repository\Node\CourseRepository;
+use Chamilo\CoreBundle\Repository\Node\PersonalFileRepository;
+use Chamilo\CoreBundle\Repository\Node\UserRepository;
+use Chamilo\CourseBundle\Entity\CDocument;
+use Chamilo\CourseBundle\Repository\CDocumentRepository;
+use Doctrine\DBAL\Schema\Schema;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+final class Version20260116085001 extends AbstractMigrationChamilo
+{
+    private ?CDocumentRepository $documentRepo;
+    private ?CourseRepository $courseRepo;
+    private ?PersonalFileRepository $personalRepo;
+    private ?UserRepository $userRepo;
+
+    public function getDescription(): string
+    {
+        return "Migrate embed files in portfolio items and comments";
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->documentRepo = $this->container->get(CDocumentRepository::class);
+        $this->courseRepo = $this->container->get(CourseRepository::class);
+        $this->personalRepo = $this->container->get(PersonalFileRepository::class);
+        $this->userRepo = $this->container->get(UserRepository::class);
+
+        $this->entityManager->clear();
+
+        $updateConfigurations = [
+            ['table' => 'portfolio', 'field' => 'content'],
+            ['table' => 'portfolio_comment', 'field' => 'content'],
+        ];
+
+        foreach ($updateConfigurations as $config) {
+            $this->updateContentForUserFiles($config);
+
+            $this->updateContentForCourseFile($config['table'], $config['field']);
+        }
+    }
+
+    private function updateContentForUserFiles(array $config): void
+    {
+        $fields = isset($config['field']) ? [$config['field']] : $config['fields'] ?? [];
+
+        foreach ($fields as $field) {
+            $items = $this->connection
+                ->executeQuery("SELECT id, {$field} FROM {$config['table']}")
+                ->fetchAllAssociative()
+            ;
+
+            foreach ($items as $item) {
+                $originalText = $item[$field];
+
+                if (!empty($originalText)) {
+                    $updatedText = $this->replaceUserFilePaths($originalText);
+
+                    if ($originalText !== $updatedText) {
+                        $updateSql = "UPDATE {$config['table']} SET {$field} = :newText WHERE id = :id";
+                        $this->connection->executeQuery($updateSql, ['newText' => $updatedText, 'id' => $item['id']]);
+                    }
+                }
+            }
+        }
+    }
+
+    private function replaceUserFilePaths(string $content): string
+    {
+        $pattern = '/(src|href)=["\']?(https?:\/\/[^\/]+)?(\/app\/upload\/users\/(\d+)\/(\d+)\/my_files\/([^\/"\']+))["\']?/i';
+
+        preg_match_all($pattern, $content, $matches, PREG_SET_ORDER);
+
+        foreach ($matches as $match) {
+            $attribute = $match[1];
+            $baseUrlWithApp = $match[2] ? $match[2].$match[3] : $match[3];
+            $folderId = (int) $match[4];
+            $userId = (int) $match[5];
+            $filename = $match[6];
+
+            // Decode the filename to handle special characters
+            $decodedFilename = urldecode($filename);
+            $user = $this->userRepo->find($userId);
+            if (null !== $user) {
+                /** @var AbstractResource $personalFile */
+                $personalFile = $this->personalRepo->getResourceByCreatorFromTitle(
+                    $decodedFilename,
+                    $user,
+                    $user->getResourceNode()
+                );
+
+                if (!$personalFile) {
+                    continue;
+                }
+
+                $newUrl = $this->personalRepo->getResourceFileUrl($personalFile);
+
+                if ($newUrl) {
+                    $content = str_replace($baseUrlWithApp, $newUrl, $content);
+
+                    $this->write("Replaced old URL: {$baseUrlWithApp} with new URL: {$newUrl}");
+                }
+            }
+        }
+
+        return $content;
+    }
+
+    private function updateContentForCourseFile($tableName, $fieldName): void
+    {
+        $items = $this->connection
+            ->executeQuery("SELECT id, $fieldName FROM $tableName")
+            ->fetchAllAssociative()
+        ;
+
+        foreach ($items as $item) {
+            $originalText = $item[$fieldName];
+
+            if (empty($originalText)) {
+                continue;
+            }
+
+            $updatedText = $this->replaceCourseFilePaths($originalText);
+
+            if ($originalText !== $updatedText) {
+                $this->connection->executeQuery(
+                    "UPDATE $tableName SET $fieldName = :newText WHERE iid = :id",
+                    ['newText' => $updatedText, 'id' => $item['iid']]
+                );
+            }
+        }
+    }
+
+    private function replaceCourseFilePaths($itemDataText): string
+    {
+        $contentText = $itemDataText;
+        $specificCoursePattern = '/(src|href)=["\']((https?:\/\/[^\/]+)?(\/courses\/([^\/]+)\/document\/[^"\']+\.\w+))["\']/i';
+
+        preg_match_all($specificCoursePattern, $contentText, $matches);
+
+        foreach ($matches[2] as $index => $fullUrl) {
+            $videoPath = parse_url($fullUrl, PHP_URL_PATH) ?: $fullUrl;
+            $fileName = basename($videoPath);
+
+            $actualCourseDirectory = $matches[5][$index];
+
+            /** @var Course $course */
+            $course = $this->courseRepo->findOneBy(['directory' => $actualCourseDirectory]);
+
+            if (!$course) {
+                continue;
+            }
+
+            $resourcesQb = $this->documentRepo->getResources();
+
+            $documents = $this->documentRepo
+                ->addCourseQueryBuilder($course, $resourcesQb)
+                ->andWhere('node.title = :title')
+                ->setParameter('title', $fileName)
+                ->getQuery()
+                ->getResult()
+            ;
+
+            if (!empty($documents)) {
+                $this->replaceDocumentLinks($documents, $matches, $index, $contentText);
+
+                continue;
+            }
+
+            if ($document = $this->createNewDocument($videoPath, $course)) {
+                if ($newUrl = $this->documentRepo->getResourceFileUrl($document)) {
+                    $replacement = $matches[1][$index].'="'.$newUrl.'"';
+                    $contentText = str_replace($matches[0][$index], $replacement, $contentText);
+                }
+            }
+        }
+
+        return $contentText;
+    }
+
+    /**
+     * @param array<int, CDocument> $documents
+     * @param array $matches
+     * @param int $index
+     * @param string $contentText
+     *
+     * @return void
+     */
+    private function replaceDocumentLinks(array $documents, $matches, $index, $contentText): void
+    {
+        foreach ($documents as $document) {
+            $newUrl = $this->documentRepo->getResourceFileUrl($document);
+
+            if (empty($newUrl)) {
+                continue;
+            }
+
+            $this->write("Replacing old URL with new URL: $newUrl");
+
+            $patternForReplacement = '/'.preg_quote($matches[0][$index], '/').'/';
+            $replacement = $matches[1][$index].'="'.$newUrl.'"';
+
+            preg_replace($patternForReplacement, $replacement, $contentText, 1);
+        }
+    }
+
+    private function createNewDocument($videoPath, Course $course)
+    {
+        $rootPath = $this->getUpdateRootPath();
+        $appCourseOldPath = $rootPath.'/app'.$videoPath;
+        $title = basename($appCourseOldPath);
+
+        if (file_exists($appCourseOldPath) && !is_dir($appCourseOldPath)) {
+            $document = new CDocument();
+            $document->setFiletype('file')
+                ->setTitle($title)
+                ->setComment(null)
+                ->setReadonly(false)
+                ->setCreator($this->getAdmin())
+                ->setParent($course)
+                ->addCourseLink($course)
+            ;
+
+            $this->entityManager->persist($document);
+            $this->entityManager->flush();
+
+            $this->documentRepo->addFileFromPath($document, $title, $appCourseOldPath);
+
+            $this->write("Document '$title' successfully created for course ".$course->getId());
+
+            return $document;
+        }
+
+        if ($foundPath = $this->recursiveFileSearch($rootPath.'/app/courses/', $title)) {
+            $document = new CDocument();
+            $document->setFiletype('file')
+                ->setTitle($title)
+                ->setComment(null)
+                ->setReadonly(false)
+                ->setCreator($this->getAdmin())
+                ->setParent($course)
+                ->addCourseLink($course)
+            ;
+
+            $this->entityManager->persist($document);
+            $this->entityManager->flush();
+
+            $this->documentRepo->addFileFromPath($document, $title, $foundPath);
+
+            $this->write("File found in new location: $foundPath");
+
+            return $document;
+        }
+
+        $this->write("File '$title' not found for course ".$course->getId());
+
+        return null;
+    }
+
+    private function recursiveFileSearch($directory, $title)
+    {
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($directory)
+        );
+
+        foreach ($iterator as $file) {
+            if ($file->isFile() && $file->getFilename() === $title) {
+                return $file->getRealPath();
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/CoreBundle/Repository/Node/PortfolioCommentRepository.php b/src/CoreBundle/Repository/Node/PortfolioCommentRepository.php
index 1deea644c10..736f76a23f7 100644
--- a/src/CoreBundle/Repository/Node/PortfolioCommentRepository.php
+++ b/src/CoreBundle/Repository/Node/PortfolioCommentRepository.php
@@ -14,15 +14,30 @@
 use Chamilo\CoreBundle\Traits\Repository\ORM\NestedTreeRepositoryTrait;
 use Doctrine\Persistence\ManagerRegistry;
 
+/**
+ * @extends ResourceRepository<PortfolioComment>
+ */
 class PortfolioCommentRepository extends ResourceRepository
 {
-    use NestedTreeRepositoryTrait;
-
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, PortfolioComment::class);
     }
 
+    /**
+     * @return array<int, PortfolioComment>
+     */
+    public function findTemplatesByUser(User $user): array
+    {
+        $qb = $this->getResourcesByCreator($user);
+
+        $qb->andWhere(
+            $qb->expr()->eq('resource.isTemplate', true)
+        );
+
+        return $qb->getQuery()->getResult();
+    }
+
     public function findCommentsByUser(User $user, ?Course $course, ?Session $session, ?array $orderBy = null): array
     {
         $qbComments = $this->createQueryBuilder('comment');
diff --git a/src/CoreBundle/Repository/Node/PortfolioRepository.php b/src/CoreBundle/Repository/Node/PortfolioRepository.php
index 454f3560654..f5e6ee37e0e 100644
--- a/src/CoreBundle/Repository/Node/PortfolioRepository.php
+++ b/src/CoreBundle/Repository/Node/PortfolioRepository.php
@@ -66,7 +66,7 @@ public function getIndexCourseItems(
         ?Session $session = null,
         bool $showBaseContentInSession = false,
         bool $listByUser = false,
-        ?DateTime $date = null,
+        ?string $date = null,
         array $tags = [],
         ?string $searchText = null,
         array $searchCategories = [],
@@ -88,7 +88,7 @@ public function getIndexCourseItems(
 
         if ($date) {
             $queryBuilder
-                ->andWhere('resource.creationDate >= :date')
+                ->andWhere('node.createdAt >= :date')
                 ->setParameter(':date', $date)
             ;
         }
@@ -130,7 +130,7 @@ public function getIndexCourseItems(
 
         if ($listByUser) {
             $queryBuilder
-                ->andWhere('resource.user = :user')
+                ->andWhere('node.creator = :user')
                 ->setParameter('user', $owner)
             ;
         }
diff --git a/src/CoreBundle/Resources/views/Portfolio/items.html.twig b/src/CoreBundle/Resources/views/Portfolio/items.html.twig
index b18ba01714a..48a2fb6ad4f 100644
--- a/src/CoreBundle/Resources/views/Portfolio/items.html.twig
+++ b/src/CoreBundle/Resources/views/Portfolio/items.html.twig
@@ -65,7 +65,7 @@
                                 </a>
                             {% else %}
                                 <a href="{{ baseurl ~ {'action':'highlighted', 'id':item.id}|url_encode }}">
-                                    {{ 'award_red_na.png'|icon(22, 'Mark as highlighted'|get_lang) }}
+                                    {{ 'ActionIcon::AWARD'|mdi_icon_t(22, 'ch-tool-icon', 'Mark as highlighted'|get_lang) }}
                                 </a>
                             {% endif %}
                         {% endif %}
diff --git a/src/CoreBundle/Resources/views/Portfolio/view.html.twig b/src/CoreBundle/Resources/views/Portfolio/view.html.twig
index 5951a864a96..d6bffeb40e7 100644
--- a/src/CoreBundle/Resources/views/Portfolio/view.html.twig
+++ b/src/CoreBundle/Resources/views/Portfolio/view.html.twig
@@ -1,7 +1,8 @@
+{% autoescape false %}
 {% if item.isHighlighted %}
     <span class="label label-success">
         {{ 'ActionIcon::STAR'|mdi_icon(22) }}
-        {{ 'Highlighted'|get_lang }}
+        {{ 'Highlighted'|trans }}
     </span>
 {% endif %}
 
@@ -12,36 +13,36 @@
         <ul class="fa-ul list-inline">
             <li>
                 <span class="fa-li fa fa-user" aria-hidden="true"></span>
-                {{ item.user.completeName }}
+                {{ item.creator.fullName }}
             </li>
             <li>
                 <span class="fa-li fa fa-clock-o" aria-hidden="true"></span>
-                {{ 'Creation date'|get_lang ~ ': ' }}
-                {{ item.creationDate|date_to_time_ago }}
+                {{ 'Creation date'|trans ~ ': ' }}
+                {{ item.resourceNode.createdAt|date_to_time_ago }}
             </li>
 
             {% if last_edit %}
                 <li>
                     <span class="fa-li fa fa-clock-o" aria-hidden="true"></span>
-                    {{ 'Updated on %s by %s'|get_lang|format(last_edit.date|date_to_time_ago, last_edit.user) }}
+                    {{ 'Updated on %s by %s'|trans|format(last_edit.date|date_to_time_ago, last_edit.user) }}
                 </li>
-            {% elseif item.creationDate != item.updateDate %}
+            {% elseif item.resourceNode.createdAt != item.resourceNode.updatedAte %}
                 <li>
                     <span class="fa-li fa fa fa-clock-o" aria-hidden="true"></span>
-                    {{ 'Updated on %s'|get_lang|format(item.updateDate|date_to_time_ago) }}
+                    {{ 'Updated on %s'|trans|format(item.resourceNode.updateDate|date_to_time_ago) }}
                 </li>
             {% endif %}
 
-            {% if _c is empty %}
-                {% if item.session %}
+            {% if course is empty %}
+                {% if session %}
                     <li>
                         <span class="fa-li fa fa-book" aria-hidden="true"></span>
-                        {{ 'Course'|get_lang ~ ': ' ~ item.session.name ~ ' (' ~ item.course.title ~ ')' }}
+                        {{ 'Course'|trans ~ ': ' ~ session.name ~ ' (' ~ course.title ~ ')' }}
                     </li>
-                {% elseif not item.session and item.course %}
+                {% elseif not session and course %}
                     <li>
                         <span class="fa-li fa fa-book" aria-hidden="true"></span>
-                        {{ 'Course'|get_lang ~ ': ' ~ item.course.title }}
+                        {{ 'Course'|trans ~ ': ' ~ course.title }}
                     </li>
                 {% endif %}
             {% endif %}
@@ -59,7 +60,7 @@
     <section id="portfolio-item-comments">
         <h1 class="h3">
             {{ 'ActionIcon::COMMENT'|mdi_icon(22) }}
-            {{ 'XComments'|get_lang|format(count_comments) }}
+            {{ '%s comments'|trans|format(count_comments) }}
         </h1>
 
         {{ comments }}
@@ -95,3 +96,4 @@
         });
     });
 </script>
+{% endautoescape %}
\ No newline at end of file