Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
cy.get('[data-cy=collection-files-panel]')
.should('contain', 'foo').and('contain', 'bar');
cy.get('[data-cy=collection-files-panel]')
.should('contain', 'foo').and('contain', 'bar');
- // Check that old collection action is available on context menu
- cy.get('[data-cy=collection-panel-options-btn]').click()
- cy.get('[data-cy=context-menu]').should('contain', 'Recover version')
+ // Check that only old collection action are available on context menu
+ cy.get('[data-cy=collection-panel-options-btn]').click();
+ cy.get('[data-cy=context-menu]')
+ .should('contain', 'Recover version')
+ .and('not.contain', 'Add to favorites');
cy.get('body').click(); // Collapse the menu avoiding details panel expansion
// Click on "head version" link, confirm that it's the latest version.
cy.get('body').click(); // Collapse the menu avoiding details panel expansion
// Click on "head version" link, confirm that it's the latest version.
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionSet } from "../context-menu-action-set";
+import {
+ ContextMenuAction,
+ ContextMenuActionSet
+} from "../context-menu-action-set";
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "~/store/favorites/favorites-actions";
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "~/store/favorites/favorites-actions";
-import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, AdvancedIcon, OpenIcon, Link, RecoverVersionIcon } from "~/components/icon/icon";
+import {
+ RenameIcon,
+ ShareIcon,
+ MoveToIcon,
+ CopyIcon,
+ DetailsIcon,
+ AdvancedIcon,
+ OpenIcon,
+ Link,
+ RecoverVersionIcon
+} from "~/components/icon/icon";
import { openCollectionUpdateDialog } from "~/store/collections/collection-update-actions";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
import { openMoveCollectionDialog } from '~/store/collections/collection-move-actions';
import { openCollectionUpdateDialog } from "~/store/collections/collection-update-actions";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
import { openMoveCollectionDialog } from '~/store/collections/collection-move-actions';
import { togglePublicFavorite } from "~/store/public-favorites/public-favorites-actions";
import { publicFavoritePanelActions } from "~/store/public-favorites-panel/public-favorites-action";
import { togglePublicFavorite } from "~/store/public-favorites/public-favorites-actions";
import { publicFavoritePanelActions } from "~/store/public-favorites-panel/public-favorites-action";
-export const readOnlyCollectionActionSet: ContextMenuActionSet = [[
- {
- component: ToggleFavoriteAction,
- name: 'ToggleFavoriteAction',
- execute: (dispatch, resource) => {
- dispatch<any>(toggleFavorite(resource)).then(() => {
- dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
- });
- }
- },
+const toggleFavoriteAction: ContextMenuAction = {
+ component: ToggleFavoriteAction,
+ name: 'ToggleFavoriteAction',
+ execute: (dispatch, resource) => {
+ dispatch<any>(toggleFavorite(resource)).then(() => {
+ dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
+ });
+ }
+};
+
+const commonActionSet: ContextMenuActionSet = [[
{
icon: OpenIcon,
name: "Open in new tab",
{
icon: OpenIcon,
name: "Open in new tab",
+export const readOnlyCollectionActionSet: ContextMenuActionSet = [[
+ ...commonActionSet.reduce((prev, next) => prev.concat(next), []),
+ toggleFavoriteAction,
+]];
+
export const collectionActionSet: ContextMenuActionSet = [
[
...readOnlyCollectionActionSet.reduce((prev, next) => prev.concat(next), []),
export const collectionActionSet: ContextMenuActionSet = [
[
...readOnlyCollectionActionSet.reduce((prev, next) => prev.concat(next), []),
export const oldCollectionVersionActionSet: ContextMenuActionSet = [
[
export const oldCollectionVersionActionSet: ContextMenuActionSet = [
[
- ...readOnlyCollectionActionSet.reduce((prev, next) => prev.concat(next), []),
+ ...commonActionSet.reduce((prev, next) => prev.concat(next), []),
{
icon: RecoverVersionIcon,
name: 'Recover version',
{
icon: RecoverVersionIcon,
name: 'Recover version',