21128: reset context menu resource type, fixed spelling error in spec Arvados-DCO...

diff --git a/cypress/integration/project.spec.js b/cypress/integration/project.spec.js
index e61138219dcf01558151f2179aec78983c73f6ad..e4d7be87fb068df762c395048b6e4fac94133ad4 100644 (file)
--- a/cypress/integration/project.spec.js
+++ b/cypress/integration/project.spec.js
@@ -473,7 +473,7 @@ describe("Project tests", function () {
             });
         });
 
-        it("should be able to froze own project", () => {
+        it("should be able to freeze own project", () => {
             cy.getAll("@mainProject").then(([mainProject]) => {
                 cy.loginAs(activeUser);
 
@@ -503,7 +503,7 @@ describe("Project tests", function () {
             });
         });
 
-        it("should be able to froze not owned project", () => {
+        it("should be able to freeze not owned project", () => {
             cy.getAll("@adminProject").then(([adminProject]) => {
                 cy.loginAs(activeUser);
 
@@ -515,7 +515,7 @@ describe("Project tests", function () {
             });
         });
 
-        it("should be able to unfroze project if user is an admin", () => {
+        it("should be able to unfreeze project if user is an admin", () => {
             cy.getAll("@adminProject").then(([adminProject]) => {
                 cy.loginAs(adminUser);
 

diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx
index 877d927a1b20095c51ed88679be1bb227a4c67b6..aeb69de7624bf3e27a82f7a911f7de1d57e03d4c 100644 (file)
--- a/src/views-components/context-menu/context-menu.tsx
+++ b/src/views-components/context-menu/context-menu.tsx
@@ -16,7 +16,6 @@ type DataProps = Pick<ContextMenuProps, "anchorEl" | "items" | "open"> & { resou
 
 const mapStateToProps = (state: RootState): DataProps => {
     const { open, position, resource } = state.contextMenu;
-    const fullResource = resource ? state.resources[resource?.uuid] as any : resource
     const filteredItems = getMenuActionSet(resource).map(group =>
         group.filter(item => {
             if (resource && item.filters) {
@@ -32,7 +31,7 @@ const mapStateToProps = (state: RootState): DataProps => {
         anchorEl: resource ? createAnchorAt(position) : undefined,
         items: filteredItems,
         open,
-        resource: fullResource,
+        resource,
     };
 };