Merge-v1.1.6-onto-mainline (#738)

* Miguel.abreu/gtt 1648 fix nav colors (#717)

* Fix locales tests

* Adjust nav colors to match buttons

Co-authored-by: Miguel Abreu <miabreu@amazon.com>

* Adds backend support for copying dashboards (#719)

* Backend support for copying dashboards.

* Setup title configuration and update route titles (#720)

* Setup title configuration and update route titles

* Unit tests

Co-authored-by: Miguel Abreu <miabreu@amazon.com>

* Adds frontend support for copying dashboards (#725)

* Frontend changes to copy dashboards

* Added aria label and tab functionality to the Vertical Tabs component (#726)

* change for release 1.1.6

* Add translation files for Portuguese and Spanish

Co-authored-by: Miguel Abreu <miabreu@amazon.com>
Co-authored-by: Mazen Kharbutli <89935687+mazenkh-amazon@users.noreply.github.com>
Co-authored-by: francisco-j-romero <65923669+francisco-j-romero@users.noreply.github.com>
Co-authored-by: Triet <triet05@gmail.com>
Co-authored-by: Miguel Pavon Diaz <miguelpdiaz8@gmail.com>

Author: 6 people

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.6] - 2021-12-17
+
+- Copy/duplicate an individual dashboard
+- Made improvements to meet accessibility requirements
+  - Added text alternative to label images
+  - Establish unique page titles
+  - Made global button color changes
+  - Introduced different visual indicators beyond color for line charts
+  - Improved vertical tabs for accessibility
+
 ## [1.1.5] - 2021-11-29
 
 - Made improvements to meet accessibility requirements

README.md

@@ -33,7 +33,7 @@ PDoA comes with pre-built code to provision an instance in your AWS account. You
 
 | Region               | Launch                                                                                                                                                                                                                                                                                                                             |
 | -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Install in us-east-1 | [![Install in us-east-1](docs/images/launch-stack.svg)](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?templateURL=https://performance-dashboard-on-aws-solution-releases-us-west-2.s3.us-west-2.amazonaws.com/performance-dashboard-on-aws/v1.1.5/performance-dashboard-on-aws.template) |
+| Install in us-east-1 | [![Install in us-east-1](docs/images/launch-stack.svg)](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?templateURL=https://performance-dashboard-on-aws-solution-releases-us-west-2.s3.us-west-2.amazonaws.com/performance-dashboard-on-aws/v1.1.6/performance-dashboard-on-aws.template) |
 
 ### Clone this repository
 

backend/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "performance-dashboard-backend",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Performance Dashboard on AWS Backend",
   "awssdkUserAgent": "AwsSolution/SO0157/v",
   "scripts": {

backend/package.json

@@ -297,6 +297,50 @@
           },
           "response": []
         },
+        {
+          "name": "Copy Dashboard",
+          "request": {
+            "auth": {
+              "type": "bearer",
+              "bearer": [
+                {
+                  "key": "token",
+                  "value": "{{token}}",
+                  "type": "string"
+                }
+              ]
+            },
+            "method": "POST",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": "{\n    \"updatedAt\": \"2020-10-16T00:25:24.576Z\"\n}",
+              "options": {
+                "raw": {
+                  "language": "json"
+                }
+              }
+            },
+            "url": {
+              "raw": "{{baseUrl}}/dashboard/:id/copy",
+              "host": [
+                "{{baseUrl}}"
+              ],
+              "path": [
+                "dashboard",
+                ":id",
+                "copy"
+              ],
+              "variable": [
+                {
+                  "key": "id",
+                  "value": "49b1e4c5-c621-459b-96c4-66504a6b21eb"
+                }
+              ]
+            }
+          },
+          "response": []
+        },
         {
           "name": "Archive Dashboard",
           "request": {

backend/postman/Performance Dashboard API.postman_collection.json

@@ -70,6 +70,12 @@ router.put(
   errorHandler(DashboardCtrl.moveToDraftDashboard)
 );
 
+router.post(
+  "/:id/copy",
+  rbac(Role.Admin, Role.Editor),
+  errorHandler(DashboardCtrl.copyDashboard)
+);
+
 router.put(
   "/:id/widgetorder",
   rbac(Role.Admin, Role.Editor),

backend/src/lib/api/dashboard-api.ts

@@ -13,6 +13,7 @@ import FriendlyURLService from "../../services/friendlyurl-service";
 import DashboardRepository from "../../repositories/dashboard-repo";
 import TopicAreaRepository from "../../repositories/topicarea-repo";
 import dashboardCtrl from "../dashboard-ctrl";
+import { WidgetType } from "../../models/widget";
 
 jest.mock("../../repositories/dashboard-repo");
 jest.mock("../../repositories/topicarea-repo");
@@ -845,3 +846,53 @@ describe("getPublicDashboardByFriendlyURL", () => {
     expect(res.send).toBeCalledWith("Dashboard not found");
   });
 });
+
+describe("copyDashboard", () => {
+  let req: Request;
+  let dashboard: Dashboard;
+  beforeEach(() => {
+    req = {
+      user,
+      params: {
+        id: "abcdef00",
+      },
+    } as any as Request;
+
+    dashboard = {
+      id: "abcdef00",
+      version: 3,
+      parentDashboardId: "abcdef00",
+      name: "My Dashboard",
+      topicAreaId: "abc",
+      topicAreaName: "My Topic Area",
+      displayTableOfContents: false,
+      updatedAt: new Date(),
+      createdBy: "johndoe",
+      state: DashboardState.Published,
+      description: "",
+      widgets: [
+        {
+          id: "12345678",
+          name: "Text Widget",
+          widgetType: WidgetType.Text,
+          dashboardId: "abcdef00",
+          order: 0,
+          updatedAt: new Date(),
+          showTitle: true,
+          content: {
+            text: "Just some simple text.",
+          },
+        },
+      ],
+      releaseNotes: "Release note test",
+    };
+  });
+
+  it("creates a copy dashboard in draft state", async () => {
+    repository.getDashboardWithWidgets = jest.fn().mockReturnValue(dashboard);
+
+    await DashboardCtrl.copyDashboard(req, res);
+
+    expect(repository.saveDashboardAndWidgets).toBeCalledTimes(2);
+  });
+});

backend/src/lib/controllers/__tests__/dashboard-ctrl.test.ts

@@ -352,6 +352,23 @@ async function createNewDraft(req: Request, res: Response) {
   return res.json(draft);
 }
 
+async function copyDashboard(req: Request, res: Response) {
+  const user = req.user;
+  const { id } = req.params;
+
+  const repo = DashboardRepository.getInstance();
+
+  const origDashboard = await repo.getDashboardWithWidgets(id);
+
+  const newDashboard = DashboardFactory.createCopyFromDashboard(
+    origDashboard,
+    user
+  );
+
+  await repo.saveDashboardAndWidgets(newDashboard);
+  res.json(newDashboard);
+}
+
 export default {
   listDashboards,
   createDashboard,
@@ -367,4 +384,5 @@ export default {
   deleteDashboards,
   getPublicDashboardById,
   createNewDraft,
+  copyDashboard,
 };

backend/src/lib/controllers/dashboard-ctrl.ts

@@ -5,6 +5,7 @@ import {
   DashboardState,
 } from "../../models/dashboard";
 import { User } from "../../models/user";
+import { convertCompilerOptionsFromJson } from "typescript";
 
 const user: User = {
   userId: "johndoe",
@@ -304,3 +305,34 @@ describe("createDraftFromDashboard", () => {
     expect(draft.friendlyURL).toBeUndefined();
   });
 });
+
+describe("createCopyFromDashboard", () => {
+  const dashboard: Dashboard = {
+    id: "123",
+    version: 3,
+    parentDashboardId: "123",
+    name: "Original Dashboard",
+    topicAreaId: "456",
+    topicAreaName: "Topic 1",
+    displayTableOfContents: false,
+    description: "Description original dashboard",
+    createdBy: user.userId,
+    updatedAt: new Date(),
+    state: DashboardState.Published,
+    releaseNotes: "release note test",
+  };
+
+  it("Should create a copy of the original dashboard", () => {
+    const copy = factory.createCopyFromDashboard(dashboard, user);
+
+    expect(copy.id).not.toEqual(dashboard.id);
+    expect(copy.name).toEqual("Copy of Original Dashboard");
+    expect(copy.version).toEqual(1);
+    expect(copy.topicAreaId).toEqual(dashboard.topicAreaId);
+    expect(copy.topicAreaName).toEqual(dashboard.topicAreaName);
+    expect(copy.createdBy).toEqual(dashboard.createdBy);
+    expect(copy.state).toEqual(DashboardState.Draft);
+    expect(copy.parentDashboardId).not.toEqual(dashboard.parentDashboardId);
+    expect(copy.friendlyURL).toBeUndefined();
+  });
+});

backend/src/lib/factories/__tests__/dashboard-factory.test.ts

@@ -86,6 +86,55 @@ function createDraftFromDashboard(
   };
 }
 
+function createCopyFromDashboard(dashboard: Dashboard, user: User): Dashboard {
+  const id = uuidv4();
+
+  // Copy all widgets associated with the dashboard.
+  let widgets: Array<Widget> = [];
+  if (dashboard.widgets) {
+    widgets = dashboard.widgets.map((widget) =>
+      WidgetFactory.createFromWidget(id, widget)
+    );
+    for (const widget of widgets) {
+      if (widget.section) {
+        const sectionIndex = dashboard.widgets.findIndex(
+          (w) => w.id === widget.section
+        );
+        widget.section = widgets[sectionIndex].id;
+      }
+      if (widget.content && widget.content.widgetIds) {
+        const widgetIds: string[] = [];
+        for (const id of widget.content.widgetIds) {
+          const widgetIndex = dashboard.widgets.findIndex((w) => w.id === id);
+          widgetIds.push(widgets[widgetIndex].id);
+        }
+        widget.content.widgetIds = widgetIds;
+      }
+    }
+  }
+
+  return {
+    id,
+    name: "Copy of " + dashboard.name,
+    version: 1,
+    parentDashboardId: id,
+    topicAreaId: dashboard.topicAreaId,
+    topicAreaName: dashboard.topicAreaName,
+    displayTableOfContents: dashboard.displayTableOfContents,
+    tableOfContents: dashboard.tableOfContents,
+    description: dashboard.description,
+    state: DashboardState.Draft,
+    createdBy: user.userId,
+    updatedAt: new Date(),
+    updatedBy: user.userId,
+    submittedBy: undefined,
+    publishedBy: undefined,
+    archivedBy: undefined,
+    widgets,
+    friendlyURL: undefined,
+  };
+}
+
 /**
  * Converts a Dashboard to a DynamoDB item.
  */
@@ -177,6 +226,7 @@ function toVersion(dashboard: Dashboard): DashboardVersion {
 export default {
   createNew,
   createDraftFromDashboard,
+  createCopyFromDashboard,
   toItem,
   fromItem,
   itemId,