mirror of
https://github.com/usebruno/bruno.git
synced 2025-08-24 14:25:52 +02:00
feat: added icons to env modal buttons
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import React, { useRef, useEffect } from 'react';
|
import React, { useRef, useEffect } from 'react';
|
||||||
import cloneDeep from 'lodash/cloneDeep';
|
import cloneDeep from 'lodash/cloneDeep';
|
||||||
import { IconTrash, IconAlertCircle } from '@tabler/icons';
|
import { IconTrash, IconAlertCircle, IconDeviceFloppy, IconRefresh, IconCircleCheck } from '@tabler/icons';
|
||||||
import { useTheme } from 'providers/Theme';
|
import { useTheme } from 'providers/Theme';
|
||||||
import { useDispatch } from 'react-redux';
|
import { useDispatch } from 'react-redux';
|
||||||
import { selectEnvironment } from 'providers/ReduxStore/slices/collections/actions';
|
import { selectEnvironment } from 'providers/ReduxStore/slices/collections/actions';
|
||||||
@@ -14,7 +14,7 @@ import { saveEnvironment } from 'providers/ReduxStore/slices/collections/actions
|
|||||||
import toast from 'react-hot-toast';
|
import toast from 'react-hot-toast';
|
||||||
import { Tooltip } from 'react-tooltip';
|
import { Tooltip } from 'react-tooltip';
|
||||||
|
|
||||||
const EnvironmentVariables = ({ environment, collection, setIsModified, originalEnvironmentVariables }) => {
|
const EnvironmentVariables = ({ environment, collection, setIsModified, originalEnvironmentVariables, onClose }) => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const { storedTheme } = useTheme();
|
const { storedTheme } = useTheme();
|
||||||
const addButtonRef = useRef(null);
|
const addButtonRef = useRef(null);
|
||||||
@@ -90,6 +90,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
|
|||||||
.then(() => {
|
.then(() => {
|
||||||
if (environment) {
|
if (environment) {
|
||||||
toast.success(`Environment changed to ${environment.name}`);
|
toast.success(`Environment changed to ${environment.name}`);
|
||||||
|
onClose();
|
||||||
} else {
|
} else {
|
||||||
toast.success(`No Environments are active now`);
|
toast.success(`No Environments are active now`);
|
||||||
}
|
}
|
||||||
@@ -196,20 +197,19 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div className="flex items-center">
|
||||||
<span class="mr-2">
|
<button type="submit" className="submit btn btn-sm btn-secondary mt-2 flex items-center" onClick={formik.handleSubmit}>
|
||||||
<button type="submit" className="submit btn btn-md btn-secondary mt-2" onClick={formik.handleSubmit}>
|
<IconDeviceFloppy size={16} strokeWidth={1.5} className="mr-1" />
|
||||||
Save
|
Save
|
||||||
</button>
|
</button>
|
||||||
</span>
|
<button type="submit" className="ml-2 px-1 submit btn btn-sm btn-close mt-2 flex items-center" onClick={handleReset}>
|
||||||
<button type="submit" className="ml-2 px-1 submit btn btn-md btn-secondary mt-2" onClick={handleReset}>
|
<IconRefresh size={16} strokeWidth={1.5} className="mr-1" />
|
||||||
Reset
|
Reset
|
||||||
</button>
|
</button>
|
||||||
<span>
|
<button type="submit" className="submit btn btn-sm btn-close mt-2 flex items-center" onClick={onActivate}>
|
||||||
<button type="submit" className="submit btn btn-md btn-secondary mt-2" onClick={onActivate}>
|
<IconCircleCheck size={16} strokeWidth={1.5} className="mr-1" />
|
||||||
Activate
|
Activate
|
||||||
</button>
|
</button>
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
</StyledWrapper>
|
</StyledWrapper>
|
||||||
);
|
);
|
||||||
|
@@ -5,7 +5,7 @@ import DeleteEnvironment from '../../DeleteEnvironment';
|
|||||||
import RenameEnvironment from '../../RenameEnvironment';
|
import RenameEnvironment from '../../RenameEnvironment';
|
||||||
import EnvironmentVariables from './EnvironmentVariables';
|
import EnvironmentVariables from './EnvironmentVariables';
|
||||||
|
|
||||||
const EnvironmentDetails = ({ environment, collection, setIsModified }) => {
|
const EnvironmentDetails = ({ environment, collection, setIsModified, onClose }) => {
|
||||||
const [openEditModal, setOpenEditModal] = useState(false);
|
const [openEditModal, setOpenEditModal] = useState(false);
|
||||||
const [openDeleteModal, setOpenDeleteModal] = useState(false);
|
const [openDeleteModal, setOpenDeleteModal] = useState(false);
|
||||||
const [openCopyModal, setOpenCopyModal] = useState(false);
|
const [openCopyModal, setOpenCopyModal] = useState(false);
|
||||||
@@ -38,7 +38,7 @@ const EnvironmentDetails = ({ environment, collection, setIsModified }) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<EnvironmentVariables environment={environment} collection={collection} setIsModified={setIsModified} />
|
<EnvironmentVariables environment={environment} collection={collection} setIsModified={setIsModified} onClose={onClose} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@@ -11,7 +11,7 @@ import ConfirmSwitchEnv from './ConfirmSwitchEnv';
|
|||||||
import ToolHint from 'components/ToolHint';
|
import ToolHint from 'components/ToolHint';
|
||||||
import { isEqual } from 'lodash';
|
import { isEqual } from 'lodash';
|
||||||
|
|
||||||
const EnvironmentList = ({ selectedEnvironment, setSelectedEnvironment, collection, isModified, setIsModified }) => {
|
const EnvironmentList = ({ selectedEnvironment, setSelectedEnvironment, collection, isModified, setIsModified, onClose }) => {
|
||||||
const { environments } = collection;
|
const { environments } = collection;
|
||||||
const [openCreateModal, setOpenCreateModal] = useState(false);
|
const [openCreateModal, setOpenCreateModal] = useState(false);
|
||||||
const [openImportModal, setOpenImportModal] = useState(false);
|
const [openImportModal, setOpenImportModal] = useState(false);
|
||||||
@@ -141,6 +141,7 @@ const EnvironmentList = ({ selectedEnvironment, setSelectedEnvironment, collecti
|
|||||||
collection={collection}
|
collection={collection}
|
||||||
setIsModified={setIsModified}
|
setIsModified={setIsModified}
|
||||||
originalEnvironmentVariables={originalEnvironmentVariables}
|
originalEnvironmentVariables={originalEnvironmentVariables}
|
||||||
|
onClose={onClose}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</StyledWrapper>
|
</StyledWrapper>
|
||||||
|
@@ -72,6 +72,7 @@ const EnvironmentSettings = ({ collection, onClose }) => {
|
|||||||
collection={collection}
|
collection={collection}
|
||||||
isModified={isModified}
|
isModified={isModified}
|
||||||
setIsModified={setIsModified}
|
setIsModified={setIsModified}
|
||||||
|
onClose={onClose}
|
||||||
/>
|
/>
|
||||||
</Modal>
|
</Modal>
|
||||||
);
|
);
|
||||||
|
Reference in New Issue
Block a user