🚩 Visa Tab should be enabled through configuration #235

leoraba · 2023-07-13T15:21:05Z

feature: #234

ticket #234

leoraba · 2023-07-13T15:22:14Z

src/common/injectGlobals.ts

@@ -12,6 +12,8 @@ export const EGO_CLIENT_ID = process.env.REACT_APP_EGO_CLIENT_ID;

 export const PUBLIC_PATH = process.env.REACT_APP_PUBLIC_PATH;

+export const PASSPORT_ENABLED = process.env.REACT_APP_PASSPORT_ENABLED === 'true' || false;
+


Passport flag disabled by default

leoraba · 2023-07-13T15:22:48Z

src/services/createVisa.ts

@@ -4,7 +4,7 @@ import ajax from 'services/ajax';
 const BLOCKED_KEYS = ['id', 'createdAt', 'lastLogin', 'groups', 'applications'];

 export const createVisa = ({ item }) => {
-  return ajax.post(`/visa`, _.omit(item, BLOCKED_KEYS)).then(r => {
+  return ajax.post(`/visas`, _.omit(item, BLOCKED_KEYS)).then(r => {


fixing a typo..

leoraba · 2023-07-13T15:27:42Z

.env.schema

@@ -4,3 +4,4 @@ REACT_APP_EGO_CLIENT_ID=ego
 # debug namespace, e.g. "app". See https://www.npmjs.com/package/debug
 REACT_APP_DEBUG=app
 REACT_APP_KEYCLOAK_ENABLED=false
+REACT_APP_PASSPORT_ENABLED=false


schema file defines the basic configuration variables needed to run this app, mentioned in .readme file

joneubank · 2023-07-20T14:16:08Z

src/components/Login.tsx

@@ -182,7 +182,7 @@ class Component extends React.Component<any, any> {
              ? 'Or login with one of the following services'
              : 'Login with one of the following'}
          </h3>
-          {providers.map(({ name, path, Icon }) => {
+          {providers.filter(provider => !(provider.name === LoginProvider.Passport && !PASSPORT_ENABLED)).map(({ name, path, Icon }) => {


Hard to interpret this but I believe the logic is "remove Passport type providers if passport is not enabled"...

Can we simplify it to "all true when passport_enabled is true, otherwise not the passport providers":

Suggested change

{providers.filter(provider => !(provider.name === LoginProvider.Passport && !PASSPORT_ENABLED)).map(({ name, path, Icon }) => {

{providers.filter(provider => PASSPORT_ENABLED || provider.name !== LoginProvider.Passport).map(({ name, path, Icon }) => {

changed as suggested

joneubank · 2023-07-20T14:18:39Z

src/components/Nav/Nav.tsx

@@ -72,7 +74,7 @@ const Nav = ({ effects, state }) => {
        </Emblem>
      </div>
      <ul css={listStyles}>
-        {Object.keys(pickBy(RESOURCE_MAP, (r) => r.isParent)).map((key) => {
+        {Object.keys(pickBy(RESOURCE_MAP, (r) => r.isParent)).filter(key => !(key === VISAS && !PASSPORT_ENABLED)).map((key) => {


This filter is also a bit confusing. Since we know our keys and there is always exactly one named VISA would you consider:

Suggested change

{Object.keys(pickBy(RESOURCE_MAP, (r) => r.isParent)).filter(key => !(key === VISAS && !PASSPORT_ENABLED)).map((key) => {

{Object.keys(pickBy(RESOURCE_MAP, (r) => r.isParent)).map((key) => {

if(key === VISAS && !PASSPORT_ENABLED) { return null; }

changed as suggested

leoraba · 2023-07-24T14:23:56Z

src/components/Nav/Nav.tsx

@@ -73,6 +75,7 @@ const Nav = ({ effects, state }) => {
      </div>
      <ul css={listStyles}>
        {Object.keys(pickBy(RESOURCE_MAP, (r) => r.isParent)).map((key) => {
+          if(key === VISAS && !PASSPORT_ENABLED) { return null; }


Refactored condition as suggested

leoraba · 2023-07-24T14:25:02Z

src/components/Login.tsx

@@ -182,7 +182,7 @@ class Component extends React.Component<any, any> {
              ? 'Or login with one of the following services'
              : 'Login with one of the following'}
          </h3>
-          {providers.map(({ name, path, Icon }) => {
+          {providers.filter(provider => PASSPORT_ENABLED || provider.name !== LoginProvider.Passport).map(({ name, path, Icon }) => {


Refactored condition as suggested for better readability

leoraba added 2 commits July 13, 2023 11:18

Enable Visa Tab through configuration flag

f2ed4dc

ticket #234

visa endpoint typo

702bda7

leoraba commented Jul 13, 2023

View reviewed changes

leoraba requested a review from joneubank July 13, 2023 15:32

joneubank requested changes Jul 20, 2023

View reviewed changes

refactor passport flag conditions

63fb2ea

leoraba commented Jul 24, 2023

View reviewed changes

leoraba requested a review from joneubank July 25, 2023 14:12

leoraba merged commit f7bc57c into develop-passport Jul 25, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🚩 Visa Tab should be enabled through configuration #235

🚩 Visa Tab should be enabled through configuration #235

leoraba commented Jul 13, 2023

leoraba Jul 13, 2023

leoraba Jul 13, 2023 •

edited

Loading

leoraba Jul 13, 2023

joneubank Jul 20, 2023 •

edited

Loading

leoraba Jul 24, 2023

joneubank Jul 20, 2023

leoraba Jul 24, 2023

leoraba Jul 24, 2023

leoraba Jul 24, 2023

		@@ -12,6 +12,8 @@ export const EGO_CLIENT_ID = process.env.REACT_APP_EGO_CLIENT_ID;

		export const PUBLIC_PATH = process.env.REACT_APP_PUBLIC_PATH;

		export const PASSPORT_ENABLED = process.env.REACT_APP_PASSPORT_ENABLED === 'true' \|\| false;

	{providers.filter(provider => !(provider.name === LoginProvider.Passport && !PASSPORT_ENABLED)).map(({ name, path, Icon }) => {
	{providers.filter(provider => PASSPORT_ENABLED \|\| provider.name !== LoginProvider.Passport).map(({ name, path, Icon }) => {

🚩 Visa Tab should be enabled through configuration #235

🚩 Visa Tab should be enabled through configuration #235

Conversation

leoraba commented Jul 13, 2023

leoraba Jul 13, 2023

Choose a reason for hiding this comment

leoraba Jul 13, 2023 • edited Loading

Choose a reason for hiding this comment

leoraba Jul 13, 2023

Choose a reason for hiding this comment

joneubank Jul 20, 2023 • edited Loading

Choose a reason for hiding this comment

leoraba Jul 24, 2023

Choose a reason for hiding this comment

joneubank Jul 20, 2023

Choose a reason for hiding this comment

leoraba Jul 24, 2023

Choose a reason for hiding this comment

leoraba Jul 24, 2023

Choose a reason for hiding this comment

leoraba Jul 24, 2023

Choose a reason for hiding this comment

leoraba Jul 13, 2023 •

edited

Loading

joneubank Jul 20, 2023 •

edited

Loading