LogalDeveloper/owncast
0
Fork 0
Code Activity

- address https://github.com/owncast/owncast/issues/780 to stop showing 'loading' on OK button when error is returned (applies for video variant modal and social icon modal)

Browse Source 
- just use pre-exisiting const to render cpu table item
This commit is contained in:
gingervitis
2021-03-02 22:23:50 -08:00
parent 55f5406e5f
commit a573898547
2 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
web/components/config/edit-social-links.tsx
View File

@@ -3,7 +3,7 @@ import { Typography, Table, Button, Modal, Input } from 'antd';
import { ColumnsType } from 'antd/lib/table'; import { ColumnsType } from 'antd/lib/table';
import { DeleteOutlined } from '@ant-design/icons'; import { DeleteOutlined } from '@ant-design/icons';
import SocialDropdown from './social-icons-dropdown'; import SocialDropdown from './social-icons-dropdown';
import { fetchData, NEXT_PUBLIC_API_HOST, SOCIAL_PLATFORMS_LIST } from '../../utils/apis'; import { fetchData, SOCIAL_PLATFORMS_LIST } from '../../utils/apis';
import { ServerStatusContext } from '../../utils/server-status-context'; import { ServerStatusContext } from '../../utils/server-status-context';
import { import {
API_SOCIAL_HANDLES, API_SOCIAL_HANDLES,
@@ -138,6 +138,7 @@ export default function EditSocialLinks() {
}, },
onError: (message: string) => { onError: (message: string) => {
setSubmitStatus(createInputStatus(STATUS_ERROR, `There was an error: ${message}`)); setSubmitStatus(createInputStatus(STATUS_ERROR, `There was an error: ${message}`));
setModalProcessing(false);
resetTimer = setTimeout(resetStates, RESET_TIMEOUT); resetTimer = setTimeout(resetStates, RESET_TIMEOUT);
}, },
}); });
@@ -192,28 +193,26 @@ export default function EditSocialLinks() {
title: '', title: '',
dataIndex: '', dataIndex: '',
key: 'edit', key: 'edit',
render: (data, record, index) => { render: (data, record, index) => (
return ( <div className="actions">
<div className="actions"> <Button
<Button size="small"
size="small" onClick={() => {
onClick={() => { setEditId(index);
setEditId(index); setModalDataState({ ...currentSocialHandles[index] });
setModalDataState({ ...currentSocialHandles[index] }); setDisplayModal(true);
setDisplayModal(true); }}
}} >
> Edit
Edit </Button>
</Button> <Button
<Button className="delete-button"
className="delete-button" icon={<DeleteOutlined />}
icon={<DeleteOutlined />} size="small"
size="small" onClick={() => handleDeleteItem(index)}
onClick={() => handleDeleteItem(index)} />
/> </div>
</div> ),
);
},
}, },
]; ];

12
web/components/config/video-variants-table.tsx
View File

@@ -14,6 +14,7 @@ import {
DEFAULT_VARIANT_STATE, DEFAULT_VARIANT_STATE,
RESET_TIMEOUT, RESET_TIMEOUT,
postConfigUpdateToAPI, postConfigUpdateToAPI,
ENCODER_PRESET_TOOLTIPS,
} from '../../utils/config-constants'; } from '../../utils/config-constants';
import { import {
createInputStatus, createInputStatus,
@@ -26,14 +27,6 @@ import FormStatusIndicator from './form-status-indicator';
const { Title } = Typography; const { Title } = Typography;
const CPU_USAGE_LEVEL_MAP = {
1: 'lowest',
2: 'low',
3: 'medium',
4: 'high',
5: 'highest',
};
export default function CurrentVariantsTable() { export default function CurrentVariantsTable() {
const [displayModal, setDisplayModal] = useState(false); const [displayModal, setDisplayModal] = useState(false);
const [modalProcessing, setModalProcessing] = useState(false); const [modalProcessing, setModalProcessing] = useState(false);
@@ -97,6 +90,7 @@ export default function CurrentVariantsTable() {
}, },
onError: (message: string) => { onError: (message: string) => {
setSubmitStatus(createInputStatus(STATUS_ERROR, message)); setSubmitStatus(createInputStatus(STATUS_ERROR, message));
setModalProcessing(false);
resetTimer = setTimeout(resetStates, RESET_TIMEOUT); resetTimer = setTimeout(resetStates, RESET_TIMEOUT);
}, },
}); });
@@ -144,7 +138,7 @@ export default function CurrentVariantsTable() {
dataIndex: 'cpuUsageLevel', dataIndex: 'cpuUsageLevel',
key: 'cpuUsageLevel', key: 'cpuUsageLevel',
render: (level: string, variant: VideoVariant) => render: (level: string, variant: VideoVariant) =>
!level || variant.videoPassthrough ? 'n/a' : CPU_USAGE_LEVEL_MAP[level], !level || variant.videoPassthrough ? 'n/a' : ENCODER_PRESET_TOOLTIPS[level].split(' ')[0],
}, },
{ {
title: '', title: '',