Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@CGoodwin90
CGoodwin90 committed Apr 12, 2024
1 parent 224d0ca commit 19698ee
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 62 deletions.
19 changes: 8 additions & 11 deletions src/components/DeleteVariable/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import React, { useEffect, useState } from 'react';
import { Mutation } from 'react-apollo';
import ButtonBootstrap from 'react-bootstrap/Button';

import { LoadingOutlined } from '@ant-design/icons';
import withLogic from 'components/AddVariable/logic';
import Button from 'components/Button';
import Modal from 'components/Modal';

import DeleteEnvVariableMutation from '../../lib/mutation/deleteEnvVariableByName';
import { DeleteVariableButton, DeleteVariableModal } from './StyledDeleteVariable';
import {LoadingOutlined} from "@ant-design/icons";

/**
* Deletes a Variable.
Expand Down Expand Up @@ -45,16 +45,13 @@ export const DeleteVariable = ({
return (
<React.Fragment>
<DeleteVariableButton>
{
loading && valueState ? (
<Button variant="red" action={openModal}>
<LoadingOutlined />
</Button>
) : (
<Button variant="red" icon={icon} action={handlePermissionCheck}>
</Button>
)
}
{loading && valueState ? (
<Button variant="red" action={openModal}>
<LoadingOutlined />
</Button>
) : (
<Button variant="red" icon={icon} action={handlePermissionCheck}></Button>
)}
</DeleteVariableButton>
<Modal isOpen={open} onRequestClose={closeModal} contentLabel={`Confirm`} variant={'large'}>
<DeleteVariableModal>
Expand Down
82 changes: 43 additions & 39 deletions src/components/EnvironmentVariables/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => {
getEnvVarValues();
setOpenEnvVars(false);
setAction(action);
if (action === "delete") {
if (action === 'delete') {
valuesShow(index);
}
};
Expand Down Expand Up @@ -284,61 +284,62 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => {
<div className="scope">
<label>Scope</label>
</div>
{!envLoading &&(
<Collapse in={openEnvVars}>
<div className="value">
<label>Value</label>
</div>
</Collapse>
{!envLoading && (
<Collapse in={openEnvVars}>
<div className="value">
<label>Value</label>
</div>
</Collapse>
)}
</div>
<div className="data-table" data-cy="environment-table">
{displayVars.map((envVar, index) => {
return (
<Fragment key={index}>
<div className={!envLoading && openEnvVars ? 'values-present data-row' : 'data-row'} data-cy="environment-row">
<div
className={!envLoading && openEnvVars ? 'values-present data-row' : 'data-row'}
data-cy="environment-row"
>
<div className="varName">{envVar.name}</div>
<div className="varScope">{envVar.scope}</div>
{renderEnvValues(envVar, index)}
<div className="varActions">
<VariableActions>
{ !envLoading && (
<Collapse in={openEnvVars}>
<div className="varUpdate">
<Tooltip overlayClassName="componentTooltip" title="Update Variable" placement="bottom">
<Button
onClick={() => setUpdateValue(envVar.value, envVar.name, envVar.scope)}
style={{ all: 'unset' }}
{!envLoading && (
<Collapse in={openEnvVars}>
<div className="varUpdate">
<Tooltip
overlayClassName="componentTooltip"
title="Update Variable"
placement="bottom"
>
<AddVariable
varProject={environment.project.name}
varEnvironment={environment.name}
varValues={displayVars}
varTarget="Environment"
varName={updateVarName}
varValue={updateVarValue}
varScope={updateVarScope}
refresh={onVariableAdded}
icon="edit"
action="edit"
/>
</Button>
</Tooltip>
</div>
</Collapse>
<Button
onClick={() => setUpdateValue(envVar.value, envVar.name, envVar.scope)}
style={{ all: 'unset' }}
>
<AddVariable
varProject={environment.project.name}
varEnvironment={environment.name}
varValues={displayVars}
varTarget="Environment"
varName={updateVarName}
varValue={updateVarValue}
varScope={updateVarScope}
refresh={onVariableAdded}
icon="edit"
action="edit"
/>
</Button>
</Tooltip>
</div>
</Collapse>
)}
<div className="varDelete">
<Tooltip overlayClassName="componentTooltip" title="Delete Variable" placement="bottom">
<Button onClick={() => permissionCheck('delete', index)} style={{ all: 'unset' }}>
{environmentErrorAlert ? (
<DeleteVariableButton>
<Btn
index={index}
variant="red"
icon="bin"
className="delete-btn"
>
</Btn>
<Btn index={index} variant="red" icon="bin" className="delete-btn"></Btn>
</DeleteVariableButton>
) : (
<DeleteVariable
Expand Down Expand Up @@ -430,7 +431,10 @@ const EnvironmentVariables = ({ environment, onVariableAdded }) => {
{displayProjectVars.map((projEnvVar, index) => {
return (
<Fragment key={index}>
<div className={!prjLoading && openPrjVars ? 'values-present data-row' : 'data-row'} data-cy="environment-row">
<div
className={!prjLoading && openPrjVars ? 'values-present data-row' : 'data-row'}
data-cy="environment-row"
>
<div className="varName">{projEnvVar.name}</div>
<div className="varScope">{projEnvVar.scope}</div>
{renderPrjValues(projEnvVar, index)}
Expand Down
27 changes: 15 additions & 12 deletions src/components/ProjectVariables/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const ProjectVariables = ({ project, onVariableAdded }) => {
getPrjEnvVarValues();
setOpenPrjVars(false);
setAction(action);
if (action === "delete") {
if (action === 'delete') {
valuesShow(index);
}
};
Expand Down Expand Up @@ -213,18 +213,27 @@ const ProjectVariables = ({ project, onVariableAdded }) => {
{displayVars.map((projEnvVar, index) => {
return (
<Fragment key={index}>
<div className={!prjLoading && openPrjVars ? 'values-present data-row' : 'data-row'} data-cy="environment-row">
<div
className={!prjLoading && openPrjVars ? 'values-present data-row' : 'data-row'}
data-cy="environment-row"
>
<div className="varName">{projEnvVar.name}</div>
<div className="varScope">{projEnvVar.scope}</div>
{renderValues(projEnvVar, index)}
<div className="varActions">
<VariableActions>
{ !prjLoading && (
{!prjLoading && (
<Collapse in={openPrjVars}>
<div className="varUpdate">
<Tooltip overlayClassName="componentTooltip" title="Update Variable" placement="bottom">
<Tooltip
overlayClassName="componentTooltip"
title="Update Variable"
placement="bottom"
>
<Button
onClick={() => setUpdateValue(projEnvVar.value, projEnvVar.name, projEnvVar.scope)}
onClick={() =>
setUpdateValue(projEnvVar.value, projEnvVar.name, projEnvVar.scope)
}
style={{ all: 'unset' }}
>
<AddVariable
Expand All @@ -248,13 +257,7 @@ const ProjectVariables = ({ project, onVariableAdded }) => {
<Button onClick={() => permissionCheck('delete', index)} style={{ all: 'unset' }}>
{projectErrorAlert ? (
<DeleteVariableButton>
<Btn
index={index}
variant="red"
icon="bin"
className="delete-btn"
>
</Btn>
<Btn index={index} variant="red" icon="bin" className="delete-btn"></Btn>
</DeleteVariableButton>
) : (
<DeleteVariable
Expand Down

0 comments on commit 19698ee

Please sign in to comment.