From 2c27c953a7ac80913ec10c22d1b243e3f252ecac Mon Sep 17 00:00:00 2001 From: cgoodwin90 Date: Fri, 1 Mar 2024 12:08:14 +1100 Subject: [PATCH] Fixed formatting --- src/components/AddVariable/index.js | 45 +-- src/components/EnvironmentVariables/index.js | 390 +++++++++---------- src/components/ProjectVariables/index.js | 51 +-- 3 files changed, 236 insertions(+), 250 deletions(-) diff --git a/src/components/AddVariable/index.js b/src/components/AddVariable/index.js index c8bdabf2..676de2c4 100644 --- a/src/components/AddVariable/index.js +++ b/src/components/AddVariable/index.js @@ -3,6 +3,7 @@ import { Mutation } from 'react-apollo'; import ButtonBootstrap from 'react-bootstrap/Button'; import ReactSelect from 'react-select'; +import { LoadingOutlined } from '@ant-design/icons'; import { Popconfirm } from 'antd'; import withLogic from 'components/AddVariable/logic'; import Button from 'components/Button'; @@ -10,7 +11,6 @@ import Modal from 'components/Modal'; import addOrUpdateEnvVariableMutation from '../../lib/mutation/AddOrUpdateEnvVariableByName'; import { NewVariable, NewVariableModal } from './StyledAddVariable'; -import {LoadingOutlined} from "@ant-design/icons"; /** * Adds a Variable. @@ -58,7 +58,9 @@ export const AddVariable = ({ const [updateValue, setUpdateValue] = useState(varValue); const [updateScope, setUpdateScope] = useState(varScope); const [openPop, setOpenPop] = useState(false); - const handleUpdateValue = (event) => {setUpdateValue(event.target.value)}; + const handleUpdateValue = event => { + setUpdateValue(event.target.value); + }; const handlePopCancel = () => { setOpenPop(false); }; @@ -77,38 +79,33 @@ export const AddVariable = ({ const handlePermissionCheck = () => { let waitForGQL = setTimeout(() => { openModal(); - }, [1000]) + }, [1000]); if (prjEnvValues || envValues) { clearTimeout(waitForGQL); openModal(); } - } + }; return ( - { - icon ? - - : !loading ? - - Add - - : - } - + {icon ? ( + + ) : !loading ? ( + + Add + + ) : ( + + + + )} +
- { - !updateName ? `Add ${varTarget} Variable` : `Update ${varTarget} Variable` - } + {!updateName ? `Add ${varTarget} Variable` : `Update ${varTarget} Variable`}
diff --git a/src/components/EnvironmentVariables/index.js b/src/components/EnvironmentVariables/index.js index 6559f886..f1332e87 100644 --- a/src/components/EnvironmentVariables/index.js +++ b/src/components/EnvironmentVariables/index.js @@ -79,7 +79,7 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => { if (envValues) { displayVars = envValues.environmentVars.envVariables; - }; + } if (envError) console.error(envError); @@ -132,7 +132,7 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => { setUpdateVarScope(rowScope); }; - const permissionCheck = (action) => { + const permissionCheck = action => { getEnvVarValues(); setOpenEnvVars(false); setAction(action); @@ -140,33 +140,31 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => { const renderEnvValue = (envVar, index) => { if (envVar.value.length >= 0 && !valueState[index]) { - return hashValue(envVar.value).substring(0, 25) + return hashValue(envVar.value).substring(0, 25); } else if (envVar.value.length >= 100 && valueState[index]) { - return envVar.value.substring(0, 25) + ".." + return envVar.value.substring(0, 25) + '..'; } else if (envVar.value.length === 0 && valueState[index]) { - return Empty + return Empty; } else { - return envVar.value + return envVar.value; } }; const renderPrjValue = (projEnvVar, index) => { if (projEnvVar.value.length >= 0 && !prjValueState[index]) { - return hashValue(projEnvVar.value).substring(0, 25) + return hashValue(projEnvVar.value).substring(0, 25); } else if (projEnvVar.value.length >= 100 && prjValueState[index]) { - return projEnvVar.value.substring(0, 25) + ".." + return projEnvVar.value.substring(0, 25) + '..'; } else if (projEnvVar.value.length === 0 && prjValueState[index]) { - return Empty + return Empty; } else { - return projEnvVar.value + return projEnvVar.value; } }; const renderEnvValues = (envVar, index) => { if (envLoading) { - return ( -
- ) + return
; } if (envVar.value !== undefined) { @@ -175,30 +173,28 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => {
{renderEnvValue(envVar, index)} - valuesShow(index) : () => valuesHide(index)}> - - + valuesShow(index) : () => valuesHide(index)}> + +
- { envVar.value.length >= 100 && valueState[index] && ( + {envVar.value.length >= 100 && valueState[index] && ( )}
- ) + ); } }; const renderPrjValues = (projEnvVar, index) => { if (prjLoading) { - return ( -
- ) + return
; } if (projEnvVar.value !== undefined) { @@ -207,22 +203,22 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => {
{renderPrjValue(projEnvVar, index)} - prjValuesShow(index) : () => prjValuesHide(index)}> - - + prjValuesShow(index) : () => prjValuesHide(index)}> + +
- { projEnvVar.value.length >= 100 && prjValueState[index] && ( + {projEnvVar.value.length >= 100 && prjValueState[index] && ( )}
- ) + ); } }; @@ -234,140 +230,137 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => { type="error" closeAlert={closeEnvironmentError} header="Unauthorized:" - message={`You don't have permission to ${action} environment ${action === 'view' ? ' variable values' : 'variables'}. Contact your administrator to obtain the relevant permissions.`} + message={`You don't have permission to ${action} environment ${ + action === 'view' ? ' variable values' : 'variables' + }. Contact your administrator to obtain the relevant permissions.`} /> - )} + )}
- : - - } - - { displayVars.length > 0 && ( + + ) : ( + + )} + + {displayVars.length > 0 && ( )}
- { !displayVars.length && ( + {!displayVars.length && ( <> -
-
+
+
-
+
)} - { displayVars.length > 0 && ( -
- -
-
- -
-
- -
- -
- + {displayVars.length > 0 && ( +
+ +
+
+
- -
-
- {displayVars.map((envVar, index) => { - return ( - -
-
{envVar.name}
-
{envVar.scope}
- {renderEnvValues(envVar, index)} -
- - -
-
+
+ {displayVars.map((envVar, index) => { + return ( + +
+
{envVar.name}
+
{envVar.scope}
+ {renderEnvValues(envVar, index)} +
+ + +
+ +
+
+
+
- -
- -
-
+ +
-
- - ); - })} -
- -
+
+ ); + })} +
+
+
)} - { - displayVars.length !== 0 ?
: '' - } + {displayVars.length !== 0 ?
: ''} <> {projectErrorAlert && ( @@ -382,71 +375,64 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => {
- { displayProjectVars.length > 0 && ( - + {displayProjectVars.length > 0 && ( + )}
- { !displayProjectVars.length && ( + {!displayProjectVars.length && ( <> -
-
+
+
-
+
)} - { displayProjectVars.length > 0 && ( -
- -
-
- -
-
- -
- -
- -
-
-
-
- {displayProjectVars.map((projEnvVar, index) => { - return ( - -
-
{projEnvVar.name}
-
{projEnvVar.scope}
- {renderPrjValues(projEnvVar, index)} + {displayProjectVars.length > 0 && ( +
+ +
+
+ +
+
+ +
+ +
+
- - ); - })} +
+
+
+ {displayProjectVars.map((projEnvVar, index) => { + return ( + +
+
{projEnvVar.name}
+
{projEnvVar.scope}
+ {renderPrjValues(projEnvVar, index)} +
+
+ ); + })} +
+
- -
- )} - + )} + ); }; diff --git a/src/components/ProjectVariables/index.js b/src/components/ProjectVariables/index.js index cafc475b..29db26fd 100644 --- a/src/components/ProjectVariables/index.js +++ b/src/components/ProjectVariables/index.js @@ -88,7 +88,7 @@ const ProjectVariables = ({ project, onVariableAdded }) => { setUpdateVarScope(rowScope); }; - const permissionCheck = (action) => { + const permissionCheck = action => { getPrjEnvVarValues(); setOpenPrjVars(false); setAction(action); @@ -96,21 +96,19 @@ const ProjectVariables = ({ project, onVariableAdded }) => { const renderValue = (projEnvVar, index) => { if (projEnvVar.value.length >= 0 && !valueState[index]) { - return hashValue(projEnvVar.value).substring(0, 25) + return hashValue(projEnvVar.value).substring(0, 25); } else if (projEnvVar.value.length >= 100 && valueState[index]) { - return projEnvVar.value.substring(0, 25) + ".." + return projEnvVar.value.substring(0, 25) + '..'; } else if (projEnvVar.value.length === 0 && valueState[index]) { - return Empty + return Empty; } else { - return projEnvVar.value + return projEnvVar.value; } }; const renderValues = (projEnvVar, index) => { if (prjLoading) { - return ( -
- ) + return
; } if (projEnvVar.value !== undefined) { @@ -119,22 +117,23 @@ const ProjectVariables = ({ project, onVariableAdded }) => {
{renderValue(projEnvVar, index)} - valuesShow(index) : () => valuesHide(index)}> + valuesShow(index) : () => valuesHide(index)}>
- { projEnvVar.value.length >= 100 && valueState[index] && ( + {projEnvVar.value.length >= 100 && valueState[index] && ( )}
- )} + ); + } }; return ( @@ -145,14 +144,18 @@ const ProjectVariables = ({ project, onVariableAdded }) => { type="error" closeAlert={closeProjectError} header="Unauthorized:" - message={`You don't have permission to ${action} project ${action === 'view' ? ' variable values' : 'variables'}. Contact your administrator to obtain the relevant permissions.`} + message={`You don't have permission to ${action} project ${ + action === 'view' ? ' variable values' : 'variables' + }. Contact your administrator to obtain the relevant permissions.`} /> )}
: + {projectErrorAlert ? ( + + ) : ( { refresh={onVariableAdded} setProjectErrorAlert={setProjectErrorAlert} action="add" - loading={prjLoading && action === "add"} + loading={prjLoading && action === 'add'} prjEnvValues={prjEnvValues} /> - } + )} - { displayVars.length > 0 && ( + {displayVars.length > 0 && (
- { !displayVars.length && ( + {!displayVars.length && ( <> -
-
- -
-
+
+
+ +
+
)} - { displayVars.length > 0 && ( + {displayVars.length > 0 && (