From bbfd78f7c515abeee153fd66609062d1ca37b196 Mon Sep 17 00:00:00 2001 From: Youssef Date: Mon, 11 Oct 2021 09:53:38 +0100 Subject: [PATCH 1/5] fix: show project link in mobile nav --- frontend/src/component/menu/routes.js | 280 +++++++++++++------------- 1 file changed, 139 insertions(+), 141 deletions(-) diff --git a/frontend/src/component/menu/routes.js b/frontend/src/component/menu/routes.js index d9eac6e4e1..fc08d52914 100644 --- a/frontend/src/component/menu/routes.js +++ b/frontend/src/component/menu/routes.js @@ -42,6 +42,145 @@ import CreateEnvironment from '../environments/CreateEnvironment/CreateEnvironme import FeatureView2 from '../feature/FeatureView2/FeatureView2'; export const routes = [ + // Project + { + path: '/projects/create', + parent: '/projects', + title: 'Create', + component: CreateProject, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/projects/:id/archived', + title: ':name', + parent: '/archive', + component: RedirectArchive, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/projects/:id/features/:name/:activeTab/copy', + parent: '/projects/:id/features/:name/:activeTab', + title: 'Copy', + component: CopyFeatureToggle, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/projects/:id/features2/:name/:activeTab/copy', + parent: '/projects/:id/features/:name/:activeTab', + title: 'Copy', + component: CopyFeatureToggle, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/projects/:projectId/features2/:featureId', + parent: '/projects', + title: 'FeatureView2', + component: FeatureView2, + type: 'protected', + layout: 'main', + flags: E, + menu: {}, + }, + { + path: '/projects/:id/features/:name/:activeTab', + parent: '/projects', + title: ':name', + component: ViewFeatureToggle, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/projects/:id/create-toggle', + parent: '/projects', + title: 'Create', + component: CreateFeatureToggle, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/projects/:id/:activeTab', + parent: '/projects', + title: ':id', + component: Project, + flag: P, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/projects/:id', + parent: '/projects', + title: ':id', + component: Project, + flag: P, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/projects', + title: 'Projects', + component: ProjectListNew, + type: 'protected', + layout: 'main', + menu: { mobile: true }, + }, + + { + path: '/tag-types/create', + parent: '/tag-types', + title: 'Create', + component: CreateTagType, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/tag-types/edit/:name', + parent: '/tag-types', + title: ':name', + component: EditTagType, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/tag-types', + title: 'Tag types', + component: ListTagTypes, + type: 'protected', + layout: 'main', + menu: { mobile: true, advanced: true }, + }, + + { + path: '/tags/create', + parent: '/tags', + title: 'Create', + component: CreateTag, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/tags', + title: 'Tags', + component: ListTags, + hidden: true, + type: 'protected', + layout: 'main', + menu: {}, + }, // Features { path: '/features/:activeTab/:name', @@ -193,147 +332,6 @@ export const routes = [ menu: { mobile: true, advanced: true }, }, - // Project - { - path: '/projects/create', - parent: '/projects', - title: 'Create', - component: CreateProject, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/projects/:id/archived', - title: ':name', - parent: '/archive', - component: RedirectArchive, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/projects/:id/features/:name/:activeTab/copy', - parent: '/projects/:id/features/:name/:activeTab', - title: 'Copy', - component: CopyFeatureToggle, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/projects/:id/features2/:name/:activeTab/copy', - parent: '/projects/:id/features/:name/:activeTab', - title: 'Copy', - component: CopyFeatureToggle, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/projects/:projectId/features2/:featureId', - parent: '/projects', - title: 'FeatureView2', - component: FeatureView2, - type: 'protected', - layout: 'main', - flags: E, - menu: {}, - }, - { - path: '/projects/:id/features/:name/:activeTab', - parent: '/projects', - title: ':name', - component: ViewFeatureToggle, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/projects/:id/create-toggle', - parent: '/projects', - title: 'Create', - component: CreateFeatureToggle, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/projects/:id/:activeTab', - parent: '/projects', - title: ':id', - component: Project, - flag: P, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/projects/:id', - parent: '/projects', - title: ':id', - component: Project, - flag: P, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/projects', - title: 'Projects', - component: ProjectListNew, - flag: P, - type: 'protected', - layout: 'main', - menu: { mobile: true }, - }, - - { - path: '/tag-types/create', - parent: '/tag-types', - title: 'Create', - component: CreateTagType, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/tag-types/edit/:name', - parent: '/tag-types', - title: ':name', - component: EditTagType, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/tag-types', - title: 'Tag types', - component: ListTagTypes, - type: 'protected', - layout: 'main', - menu: { mobile: true, advanced: true }, - }, - - { - path: '/tags/create', - parent: '/tags', - title: 'Create', - component: CreateTag, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/tags', - title: 'Tags', - component: ListTags, - hidden: true, - type: 'protected', - layout: 'main', - menu: {}, - }, - // Addons { path: '/addons/create/:provider', From 1abe6bcbb1ab7cc4ec09d8ccd21913186eed76d7 Mon Sep 17 00:00:00 2001 From: Youssef Date: Mon, 11 Oct 2021 10:13:50 +0100 Subject: [PATCH 2/5] update createTheme import --- frontend/src/themes/main-theme.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/themes/main-theme.js b/frontend/src/themes/main-theme.js index 1a45f5e8c2..70c1443632 100644 --- a/frontend/src/themes/main-theme.js +++ b/frontend/src/themes/main-theme.js @@ -1,6 +1,6 @@ -import { createMuiTheme } from '@material-ui/core/styles'; +import { createTheme } from '@material-ui/core/styles'; -const theme = createMuiTheme({ +const theme = createTheme({ typography: { fontFamily: ['Sen', 'Roboto, sans-serif'], fontWeightBold: '700', From 34adfa9ad079050a27440cc8cadaf0cbe952a354 Mon Sep 17 00:00:00 2001 From: Youssef Date: Mon, 11 Oct 2021 10:32:42 +0100 Subject: [PATCH 3/5] updating snapshots --- .../__snapshots__/routes-test.jsx.snap | 265 +++++++++--------- 1 file changed, 132 insertions(+), 133 deletions(-) diff --git a/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap b/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap index 6ed3d00a54..b5a1354ce6 100644 --- a/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap +++ b/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap @@ -2,6 +2,138 @@ exports[`returns all baseRoutes 1`] = ` Array [ + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/projects", + "path": "/projects/create", + "title": "Create", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/archive", + "path": "/projects/:id/archived", + "title": ":name", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/projects/:id/features/:name/:activeTab", + "path": "/projects/:id/features/:name/:activeTab/copy", + "title": "Copy", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/projects/:id/features/:name/:activeTab", + "path": "/projects/:id/features2/:name/:activeTab/copy", + "title": "Copy", + "type": "protected", + }, + Object { + "component": [Function], + "flags": "E", + "layout": "main", + "menu": Object {}, + "parent": "/projects", + "path": "/projects/:projectId/features2/:featureId", + "title": "FeatureView2", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/projects", + "path": "/projects/:id/features/:name/:activeTab", + "title": ":name", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/projects", + "path": "/projects/:id/create-toggle", + "title": "Create", + "type": "protected", + }, + Object { + "component": [Function], + "flag": "P", + "layout": "main", + "menu": Object {}, + "parent": "/projects", + "path": "/projects/:id/:activeTab", + "title": ":id", + "type": "protected", + }, + Object { + "component": [Function], + "flag": "P", + "layout": "main", + "menu": Object {}, + "parent": "/projects", + "path": "/projects/:id", + "title": ":id", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object { + "mobile": true, + }, + "path": "/projects", + "title": "Projects", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/tag-types", + "path": "/tag-types/create", + "title": "Create", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/tag-types", + "path": "/tag-types/edit/:name", + "title": ":name", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object { + "advanced": true, + "mobile": true, + }, + "path": "/tag-types", + "title": "Tag types", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/tags", + "path": "/tags/create", + "title": "Create", + "type": "protected", + }, Object { "component": [Function], "layout": "main", @@ -157,139 +289,6 @@ Array [ "title": "Context Fields", "type": "protected", }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/projects", - "path": "/projects/create", - "title": "Create", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/archive", - "path": "/projects/:id/archived", - "title": ":name", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/projects/:id/features/:name/:activeTab", - "path": "/projects/:id/features/:name/:activeTab/copy", - "title": "Copy", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/projects/:id/features/:name/:activeTab", - "path": "/projects/:id/features2/:name/:activeTab/copy", - "title": "Copy", - "type": "protected", - }, - Object { - "component": [Function], - "flags": "E", - "layout": "main", - "menu": Object {}, - "parent": "/projects", - "path": "/projects/:projectId/features2/:featureId", - "title": "FeatureView2", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/projects", - "path": "/projects/:id/features/:name/:activeTab", - "title": ":name", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/projects", - "path": "/projects/:id/create-toggle", - "title": "Create", - "type": "protected", - }, - Object { - "component": [Function], - "flag": "P", - "layout": "main", - "menu": Object {}, - "parent": "/projects", - "path": "/projects/:id/:activeTab", - "title": ":id", - "type": "protected", - }, - Object { - "component": [Function], - "flag": "P", - "layout": "main", - "menu": Object {}, - "parent": "/projects", - "path": "/projects/:id", - "title": ":id", - "type": "protected", - }, - Object { - "component": [Function], - "flag": "P", - "layout": "main", - "menu": Object { - "mobile": true, - }, - "path": "/projects", - "title": "Projects", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/tag-types", - "path": "/tag-types/create", - "title": "Create", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/tag-types", - "path": "/tag-types/edit/:name", - "title": ":name", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object { - "advanced": true, - "mobile": true, - }, - "path": "/tag-types", - "title": "Tag types", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/tags", - "path": "/tags/create", - "title": "Create", - "type": "protected", - }, Object { "component": [Function], "layout": "main", From 2c8b234dfc6c9cb240cb769a207b898f252e6405 Mon Sep 17 00:00:00 2001 From: Youssef Date: Tue, 12 Oct 2021 05:57:25 +0100 Subject: [PATCH 4/5] fix links order --- .../__snapshots__/routes-test.jsx.snap | 248 ++++++++-------- frontend/src/component/menu/routes.js | 264 +++++++++--------- 2 files changed, 257 insertions(+), 255 deletions(-) diff --git a/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap b/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap index b5a1354ce6..c493186d80 100644 --- a/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap +++ b/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap @@ -96,44 +96,6 @@ Array [ "title": "Projects", "type": "protected", }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/tag-types", - "path": "/tag-types/create", - "title": "Create", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/tag-types", - "path": "/tag-types/edit/:name", - "title": ":name", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object { - "advanced": true, - "mobile": true, - }, - "path": "/tag-types", - "title": "Tag types", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/tags", - "path": "/tags/create", - "title": "Create", - "type": "protected", - }, Object { "component": [Function], "layout": "main", @@ -153,92 +115,6 @@ Array [ "title": "Feature Toggles", "type": "protected", }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/strategies", - "path": "/strategies/create", - "title": "Create", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/strategies", - "path": "/strategies/:activeTab/:strategyName", - "title": ":strategyName", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object { - "advanced": true, - "mobile": true, - }, - "path": "/strategies", - "title": "Strategies", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/environments", - "path": "/environments/create", - "title": "Environments", - "type": "protected", - }, - Object { - "component": [Function], - "flag": "E", - "layout": "main", - "menu": Object { - "advanced": true, - "mobile": true, - }, - "path": "/environments", - "title": "Environments", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/history", - "path": "/history/:toggleName", - "title": ":toggleName", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object { - "adminSettings": true, - }, - "path": "/history", - "title": "Event History", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "parent": "/archive", - "path": "/projects/:id/archived/:name/:activeTab", - "title": ":name", - "type": "protected", - }, - Object { - "component": [Function], - "layout": "main", - "menu": Object {}, - "path": "/archive", - "title": "Archived Toggles", - "type": "protected", - }, Object { "component": [Function], "layout": "main", @@ -289,6 +165,94 @@ Array [ "title": "Context Fields", "type": "protected", }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/strategies", + "path": "/strategies/create", + "title": "Create", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/strategies", + "path": "/strategies/:activeTab/:strategyName", + "title": ":strategyName", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object { + "advanced": true, + "mobile": true, + }, + "path": "/strategies", + "title": "Strategies", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/environments", + "path": "/environments/create", + "title": "Environments", + "type": "protected", + }, + Object { + "component": [Function], + "flag": "E", + "layout": "main", + "menu": Object { + "advanced": true, + "mobile": true, + }, + "path": "/environments", + "title": "Environments", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/tag-types", + "path": "/tag-types/create", + "title": "Create", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/tag-types", + "path": "/tag-types/edit/:name", + "title": ":name", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object { + "advanced": true, + "mobile": true, + }, + "path": "/tag-types", + "title": "Tag types", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/tags", + "path": "/tags/create", + "title": "Create", + "type": "protected", + }, Object { "component": [Function], "layout": "main", @@ -319,6 +283,42 @@ Array [ "title": "Addons", "type": "protected", }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/history", + "path": "/history/:toggleName", + "title": ":toggleName", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object { + "adminSettings": true, + }, + "path": "/history", + "title": "Event History", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "parent": "/archive", + "path": "/projects/:id/archived/:name/:activeTab", + "title": ":name", + "type": "protected", + }, + Object { + "component": [Function], + "layout": "main", + "menu": Object {}, + "path": "/archive", + "title": "Archived Toggles", + "type": "protected", + }, Object { "component": [Function], "layout": "main", diff --git a/frontend/src/component/menu/routes.js b/frontend/src/component/menu/routes.js index fc08d52914..3280dc64de 100644 --- a/frontend/src/component/menu/routes.js +++ b/frontend/src/component/menu/routes.js @@ -136,51 +136,6 @@ export const routes = [ menu: { mobile: true }, }, - { - path: '/tag-types/create', - parent: '/tag-types', - title: 'Create', - component: CreateTagType, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/tag-types/edit/:name', - parent: '/tag-types', - title: ':name', - component: EditTagType, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/tag-types', - title: 'Tag types', - component: ListTagTypes, - type: 'protected', - layout: 'main', - menu: { mobile: true, advanced: true }, - }, - - { - path: '/tags/create', - parent: '/tags', - title: 'Create', - component: CreateTag, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/tags', - title: 'Tags', - component: ListTags, - hidden: true, - type: 'protected', - layout: 'main', - menu: {}, - }, // Features { path: '/features/:activeTab/:name', @@ -199,91 +154,7 @@ export const routes = [ layout: 'main', menu: { mobile: true }, }, - - // Strategies - { - path: '/strategies/create', - title: 'Create', - parent: '/strategies', - component: CreateStrategies, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/strategies/:activeTab/:strategyName', - title: ':strategyName', - parent: '/strategies', - component: StrategyView, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/strategies', - title: 'Strategies', - component: Strategies, - type: 'protected', - layout: 'main', - menu: { mobile: true, advanced: true }, - }, - { - path: '/environments/create', - title: 'Environments', - component: CreateEnvironment, - parent: '/environments', - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/environments', - title: 'Environments', - component: EnvironmentList, - type: 'protected', - layout: 'main', - flag: E, - menu: { mobile: true, advanced: true }, - }, - - // History - { - path: '/history/:toggleName', - title: ':toggleName', - parent: '/history', - component: HistoryTogglePage, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/history', - title: 'Event History', - component: HistoryPage, - type: 'protected', - layout: 'main', - menu: { adminSettings: true }, - }, - - // Archive - { - path: '/projects/:id/archived/:name/:activeTab', - title: ':name', - parent: '/archive', - component: ShowArchive, - type: 'protected', - layout: 'main', - menu: {}, - }, - { - path: '/archive', - title: 'Archived Toggles', - component: Archive, - type: 'protected', - layout: 'main', - menu: {}, - }, - + // Applications { path: '/applications/:name', @@ -332,8 +203,100 @@ export const routes = [ menu: { mobile: true, advanced: true }, }, - // Addons + // Strategies { + path: '/strategies/create', + title: 'Create', + parent: '/strategies', + component: CreateStrategies, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/strategies/:activeTab/:strategyName', + title: ':strategyName', + parent: '/strategies', + component: StrategyView, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/strategies', + title: 'Strategies', + component: Strategies, + type: 'protected', + layout: 'main', + menu: { mobile: true, advanced: true }, + }, + { + path: '/environments/create', + title: 'Environments', + component: CreateEnvironment, + parent: '/environments', + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/environments', + title: 'Environments', + component: EnvironmentList, + type: 'protected', + layout: 'main', + flag: E, + menu: { mobile: true, advanced: true }, + }, + + // Tags + { + path: '/tag-types/create', + parent: '/tag-types', + title: 'Create', + component: CreateTagType, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/tag-types/edit/:name', + parent: '/tag-types', + title: ':name', + component: EditTagType, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/tag-types', + title: 'Tag types', + component: ListTagTypes, + type: 'protected', + layout: 'main', + menu: { mobile: true, advanced: true }, + }, + { + path: '/tags/create', + parent: '/tags', + title: 'Create', + component: CreateTag, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/tags', + title: 'Tags', + component: ListTags, + hidden: true, + type: 'protected', + layout: 'main', + menu: {}, + }, + + // Addons + { path: '/addons/create/:provider', parent: '/addons', title: 'Create', @@ -360,6 +323,45 @@ export const routes = [ layout: 'main', menu: { mobile: true, advanced: true }, }, + + // History + { + path: '/history/:toggleName', + title: ':toggleName', + parent: '/history', + component: HistoryTogglePage, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/history', + title: 'Event History', + component: HistoryPage, + type: 'protected', + layout: 'main', + menu: { adminSettings: true }, + }, + + // Archive + { + path: '/projects/:id/archived/:name/:activeTab', + title: ':name', + parent: '/archive', + component: ShowArchive, + type: 'protected', + layout: 'main', + menu: {}, + }, + { + path: '/archive', + title: 'Archived Toggles', + component: Archive, + type: 'protected', + layout: 'main', + menu: {}, + }, + // Admin { path: '/admin/api', From a139cd4034943ba6a81bc865113a18c83147195e Mon Sep 17 00:00:00 2001 From: Youssef Date: Tue, 12 Oct 2021 08:39:31 +0100 Subject: [PATCH 5/5] fix reload env and setting tabs --- .../src/component/project/Project/Project.tsx | 78 ++++++++++--------- .../ProjectEnvironment/ProjectEnvironment.tsx | 2 - 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx index e9cc62d9db..305ad5d659 100644 --- a/frontend/src/component/project/Project/Project.tsx +++ b/frontend/src/component/project/Project/Project.tsx @@ -33,42 +33,6 @@ const Project = () => { const { a11yProps, activeTabIdx, setActiveTab } = useTabs(0); const basePath = `/projects/${id}`; - - useEffect(() => { - const created = params.get('created'); - const edited = params.get('edited'); - - if (created || edited) { - const text = created ? 'Project created' : 'Project updated'; - setToastData({ - show: true, - type: 'success', - text, - }); - } - /* eslint-disable-next-line */ - }, []); - - useEffect(() => { - const tabIdx = tabData.findIndex(tab => tab.name === activeTab); - if(tabIdx > 0) { - setActiveTab(tabIdx); - } else { - setActiveTab(0); - } - - /* eslint-disable-next-line */ - }, []); - - const goToTabWithName = (name: string) => { - const index = tabData.findIndex(t => t.name === name); - if(index >= 0) { - const tab = tabData[index]; - history.push(tab.path); - setActiveTab(index); - } - } - const tabData = [ { title: 'Overview', @@ -102,7 +66,47 @@ const Project = () => { path: `${basePath}/settings`, name: 'settings', }, - ].filter(tab => !tab.disabled); + ] + + useEffect(() => { + const created = params.get('created'); + const edited = params.get('edited'); + + if (created || edited) { + const text = created ? 'Project created' : 'Project updated'; + setToastData({ + show: true, + type: 'success', + text, + }); + } + + tabData.filter(tab => !tab.disabled); + + /* eslint-disable-next-line */ + }, []); + + useEffect(() => { + const tabIdx = tabData.findIndex(tab => tab.name === activeTab); + if(tabIdx > 0) { + setActiveTab(tabIdx); + } else { + setActiveTab(0); + } + + /* eslint-disable-next-line */ + }, []); + + const goToTabWithName = (name: string) => { + const index = tabData.findIndex(t => t.name === name); + if(index >= 0) { + const tab = tabData[index]; + history.push(tab.path); + setActiveTab(index); + } + } + + const renderTabs = () => { diff --git a/frontend/src/component/project/ProjectEnvironment/ProjectEnvironment.tsx b/frontend/src/component/project/ProjectEnvironment/ProjectEnvironment.tsx index 73a107bee3..1570066c59 100644 --- a/frontend/src/component/project/ProjectEnvironment/ProjectEnvironment.tsx +++ b/frontend/src/component/project/ProjectEnvironment/ProjectEnvironment.tsx @@ -45,8 +45,6 @@ const ProjectEnvironmentList = ({ projectId }: ProjectEnvironmentListProps) => { const { removeEnvironmentFromProject, addEnvironmentToProject } = useProjectApi(); - console.log(project); - // local state const [selectedEnv, setSelectedEnv] = useState(); const [confirmName, setConfirmName] = useState('');