Skip to content

Commit

Permalink
Reword file system to filesystem
Browse files Browse the repository at this point in the history
Longhorn 2187

Signed-off-by: Eric Weber <eric.weber@suse.com>
  • Loading branch information
ejweber committed Apr 29, 2024
1 parent d0551de commit b4aa8ca
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 72 deletions.
32 changes: 16 additions & 16 deletions src/models/volume.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ export default {
bulkUnmapMarkSnapChainRemovedModalVisible: false,
updateSnapshotDataIntegrityModalVisible: false,
updateBulkSnapshotDataIntegrityModalVisible: false,
updateFreezeFSForSnapshotModalVisible: false,
updateBulkFreezeFSForSnapshotModalVisible: false,
updateFreezeFilesystemForSnapshotModalVisible: false,
updateBulkFreezeFilesystemForSnapshotModalVisible: false,
isDetachBulk: false,
changeVolumeActivate: '',
defaultPvOrPvcName: '',
Expand Down Expand Up @@ -104,8 +104,8 @@ export default {
updateSnapshotDataIntegrityModalKey: Math.random(),
updateBulkSnapshotDataIntegrityModalKey: Math.random(),
updateReplicaSoftAntiAffinityModalKey: Math.random(),
updateFreezeFSForSnapshotModalKey: Math.random(),
updateBulkFreezeFSForSnapshotModalKey: Math.random(),
updateFreezeFilesystemForSnapshotModalKey: Math.random(),
updateBulkFreezeFilesystemForSnapshotModalKey: Math.random(),
socketStatus: 'closed',
sorter: getSorter('volumeList.sorter'),
customColumnList: window.__column__, // eslint-disable-line no-underscore-dangle
Expand Down Expand Up @@ -326,17 +326,17 @@ export default {
yield call(execAction, payload.url, payload.params)
yield put({ type: 'query' })
},
*updateFreezeFSForSnapshot({
*updateFreezeFilesystemForSnapshot({
payload,
}, { call, put }) {
yield put({ type: 'hideUpdateFreezeFSForSnapshotModal' })
yield put({ type: 'hideUpdateFreezeFilesystemForSnapshotModal' })
yield call(execAction, payload.url, payload.params)
yield put({ type: 'query' })
},
*updateBulkFreezeFSForSnapshot({
*updateBulkFreezeFilesystemForSnapshot({
payload,
}, { call, put }) {
yield put({ type: 'hideUpdateBulkFreezeFSForSnapshotModal' })
yield put({ type: 'hideUpdateBulkFreezeFilesystemForSnapshotModal' })
if (payload?.urls?.length > 0) {
for (let i = 0; i < payload.urls.length; i++) {
yield call(execAction, payload.urls[i], payload.params)
Expand Down Expand Up @@ -824,17 +824,17 @@ export default {
showUpdateBulkSnapshotDataIntegrityModal(state, action) {
return { ...state, ...action.payload, updateBulkSnapshotDataIntegrityModalVisible: true, updateBulkSnapshotDataIntegrityModalKey: Math.random() }
},
showUpdateFreezeFSForSnapshotModal(state, action) {
return { ...state, ...action.payload, updateFreezeFSForSnapshotModalVisible: true, updateFreezeFSForSnapshotModalKey: Math.random() }
showUpdateFreezeFilesystemForSnapshotModal(state, action) {
return { ...state, ...action.payload, updateFreezeFilesystemForSnapshotModalVisible: true, updateFreezeFilesystemForSnapshotModalKey: Math.random() }
},
hideUpdateFreezeFSForSnapshotModal(state, action) {
return { ...state, ...action.payload, updateFreezeFSForSnapshotModalVisible: false, updateFreezeFSForSnapshotModalKey: Math.random() }
hideUpdateFreezeFilesystemForSnapshotModal(state, action) {
return { ...state, ...action.payload, updateFreezeFilesystemForSnapshotModalVisible: false, updateFreezeFilesystemForSnapshotModalKey: Math.random() }
},
showUpdateBulkFreezeFSForSnapshotModal(state, action) {
return { ...state, ...action.payload, updateBulkFreezeFSForSnapshotModalVisible: true, updateBulkFreezeFSForSnapshotModalKey: Math.random() }
showUpdateBulkFreezeFilesystemForSnapshotModal(state, action) {
return { ...state, ...action.payload, updateBulkFreezeFilesystemForSnapshotModalVisible: true, updateBulkFreezeFilesystemForSnapshotModalKey: Math.random() }
},
hideUpdateBulkFreezeFSForSnapshotModal(state, action) {
return { ...state, ...action.payload, updateBulkFreezeFSForSnapshotModalVisible: false, updateBulkFreezeFSForSnapshotModalKey: Math.random() }
hideUpdateBulkFreezeFilesystemForSnapshotModal(state, action) {
return { ...state, ...action.payload, updateBulkFreezeFilesystemForSnapshotModalVisible: false, updateBulkFreezeFilesystemForSnapshotModalKey: Math.random() }
},
showUpdateAccessMode(state, action) {
return { ...state, ...action.payload, updateAccessModeModalVisible: true, updateAccessModeModalKey: Math.random() }
Expand Down
4 changes: 2 additions & 2 deletions src/routes/volume/CreateVolume.js
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,8 @@ const modal = ({
<Option key={'ignored'} value={'ignored'}>Ignored (Follow the global setting)</Option>
</Select>)}
</FormItem>}
<FormItem label="Freeze File System For Snapshot" hasFeedback {...formItemLayoutForAdvanced}>
{getFieldDecorator('freezeFSForSnapshot', {
<FormItem label="Freeze Filesystem For Snapshot" hasFeedback {...formItemLayoutForAdvanced}>
{getFieldDecorator('freezeFilesystemForSnapshot', {
initialValue: 'ignored',
})(<Select>
<Option key={'enabled'} value={'enabled'}>Enabled</Option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ const modal = ({
const data = {
...getFieldsValue(),
}
let urls = items.map((item) => item?.actions?.updateFreezeFSForSnapshot)
let urls = items.map((item) => item?.actions?.updateFreezeFilesystemForSnapshot)

onOk(data, urls)
})
}

const modalOpts = {
title: 'Update Freeze File System For Snapshot',
title: 'Update Freeze Filesystem For Snapshot',
visible,
onCancel,
width: 600,
Expand All @@ -54,14 +54,14 @@ const modal = ({
<ModalBlur {...modalOpts}>
<Form layout="horizontal">
<FormItem label="Option" {...formItemLayout}>
{getFieldDecorator('freezeFSForSnapshot', {
{getFieldDecorator('freezeFilesystemForSnapshot', {
initialValue: 'ignored',
})(<Select>
{ option.map(ele => <Option key={ele.key} value={ele.value}>{ele.key}</Option>) }
</Select>)}
<Alert
style={{ marginTop: 10 }}
message="This action may override the global setting “Freeze File System For Snapshot”"
message="This action may override the global setting “Freeze Filesystem For Snapshot”"
type="warning"
/>
</FormItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ const modal = ({
const data = {
...getFieldsValue(),
}
let url = item?.actions?.updateFreezeFSForSnapshot
let url = item?.actions?.updateFreezeFilesystemForSnapshot

onOk(data, url)
})
}

const modalOpts = {
title: 'Update Freeze File System For Snapshot',
title: 'Update Freeze Filesystem For Snapshot',
visible,
onCancel,
width: 600,
Expand All @@ -54,14 +54,14 @@ const modal = ({
<ModalBlur {...modalOpts}>
<Form layout="horizontal">
<FormItem label="Option" {...formItemLayout}>
{getFieldDecorator('freezeFSForSnapshot', {
initialValue: item?.freezeFSForSnapshot,
{getFieldDecorator('freezeFilesystemForSnapshot', {
initialValue: item?.freezeFilesystemForSnapshot,
})(<Select>
{ option.map(ele => <Option key={ele.key} value={ele.value}>{ele.key}</Option>) }
</Select>)}
<Alert
style={{ marginTop: 10 }}
message="This action may override the global setting “Freeze File System For Snapshot”"
message="This action may override the global setting “Freeze Filesystem For Snapshot”"
type="warning"
/>
</FormItem>
Expand Down
10 changes: 5 additions & 5 deletions src/routes/volume/VolumeActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function actions({
showUpdateReplicaZoneSoftAntiAffinityModal,
showUpdateReplicaDiskSoftAntiAffinityModal,
showOfflineReplicaRebuildingModal,
showUpdateFreezeFSForSnapshotModal,
showUpdateFreezeFilesystemForSnapshotModal,
commandKeyDown,
}) {
const deleteWranElement = (record) => {
Expand Down Expand Up @@ -153,8 +153,8 @@ function actions({
case 'updateOfflineReplicaRebuilding':
showOfflineReplicaRebuildingModal(record)
break
case 'updateFreezeFSForSnapshot':
showUpdateFreezeFSForSnapshotModal(record)
case 'updateFreezeFilesystemForSnapshot':
showUpdateFreezeFilesystemForSnapshotModal(record)
break
case 'trimFilesystem':
confirm({
Expand Down Expand Up @@ -229,7 +229,7 @@ function actions({
{ key: 'updateSnapshotMaxSize', name: 'Update Snapshot Max Size', disabled: false },
{ key: 'updateReplicaDiskSoftAntiAffinity', name: 'Update Replica Disk Soft Anti Affinity', disabled: false },
{ key: 'updateOfflineReplicaRebuilding', name: 'Update Offline Replica Rebuilding', disabled: false || selected.dataEngine !== 'v2' },
{ key: 'updateFreezeFSForSnapshot', name: 'Update Freeze File System For Snapshot', disabled: false },
{ key: 'updateFreezeFilesystemForSnapshot', name: 'Update Freeze Filesystem For Snapshot', disabled: false },
]
const availableActions = [{ key: 'backups', name: 'Backups', disabled: selected.standby || isRestoring(selected) }, { key: 'delete', name: 'Delete' }]

Expand Down Expand Up @@ -286,7 +286,7 @@ actions.propTypes = {
trimFilesystem: PropTypes.func,
showUpdateSnapshotDataIntegrityModal: PropTypes.func,
engineUpgradePerNodeLimit: PropTypes.object,
showUpdateFreezeFSForSnapshotModal: PropTypes.func,
showUpdateFreezeFilesystemForSnapshotModal: PropTypes.func,
}

export default actions
10 changes: 5 additions & 5 deletions src/routes/volume/VolumeBulkActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function bulkActions({
showUpdateReplicaZoneSoftAntiAffinityModal,
showUpdateReplicaDiskSoftAntiAffinityModal,
showOfflineReplicaRebuildingModal,
showUpdateBulkFreezeFSForSnapshotModal,
showUpdateBulkFreezeFilesystemForSnapshotModal,
}) {
const deleteWranElement = (rows) => {
let workloadResources = []
Expand Down Expand Up @@ -137,8 +137,8 @@ function bulkActions({
case 'updateOfflineReplicaRebuilding':
showOfflineReplicaRebuildingModal(selectedRows)
break
case 'updateFreezeFSForSnapshot':
showUpdateBulkFreezeFSForSnapshotModal(selectedRows)
case 'updateFreezeFilesystemForSnapshot':
showUpdateBulkFreezeFilesystemForSnapshotModal(selectedRows)
break
case 'trimFilesystem':
confirm({
Expand Down Expand Up @@ -207,7 +207,7 @@ function bulkActions({
{ key: 'updateReplicaDiskSoftAntiAffinity', name: 'Update Replica Disk Soft Anti Affinity', disabled() { return selectedRows.length === 0 } },
{ key: 'updateOfflineReplicaRebuilding', name: 'Update Offline Replica Rebuilding', disabled() { return selectedRows.length === 0 || selectedRows.some((item) => item.dataEngine !== 'v2') } },
{ key: 'trimFilesystem', name: 'Trim Filesystem', disabled() { return selectedRows.length === 0 || notAttached() } },
{ key: 'updateFreezeFSForSnapshot', name: 'Update Freeze File System For Snapshot', disabled() { return selectedRows.length === 0 } },
{ key: 'updateFreezeFilesystemForSnapshot', name: 'Update Freeze Filesystem For Snapshot', disabled() { return selectedRows.length === 0 } },
]

const menu = (<Menu>
Expand Down Expand Up @@ -263,7 +263,7 @@ bulkActions.propTypes = {
commandKeyDown: PropTypes.bool,
showBulkUnmapMarkSnapChainRemovedModal: PropTypes.func,
trimBulkFilesystem: PropTypes.func,
showUpdateBulkFreezeFSForSnapshotModal: PropTypes.func,
showUpdateBulkFreezeFilesystemForSnapshotModal: PropTypes.func,
}

export default bulkActions
6 changes: 3 additions & 3 deletions src/routes/volume/VolumeList.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function list({
showUpdateReplicaZoneSoftAntiAffinityModal,
showUpdateReplicaDiskSoftAntiAffinityModal,
showOfflineReplicaRebuildingModal,
showUpdateFreezeFSForSnapshotModal,
showUpdateFreezeFilesystemForSnapshotModal,
onRowClick = f => f,
}) {
const volumeActionsProps = {
Expand Down Expand Up @@ -97,7 +97,7 @@ function list({
showUpdateReplicaZoneSoftAntiAffinityModal,
showUpdateReplicaDiskSoftAntiAffinityModal,
showOfflineReplicaRebuildingModal,
showUpdateFreezeFSForSnapshotModal,
showUpdateFreezeFilesystemForSnapshotModal,
onRowClick,
}
/**
Expand Down Expand Up @@ -581,7 +581,7 @@ list.propTypes = {
showUpdateSnapshotDataIntegrityModal: PropTypes.func,
replicaSoftAntiAffinitySettingValue: PropTypes.bool,
engineUpgradePerNodeLimit: PropTypes.object,
showUpdateFreezeFSForSnapshotModal: PropTypes.func,
showUpdateFreezeFilesystemForSnapshotModal: PropTypes.func,
}

export default list
4 changes: 2 additions & 2 deletions src/routes/volume/detail/VolumeInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,8 @@ function VolumeInfo({ selectedVolume, snapshotModalState, engineImages, hosts, c
{selectedVolume?.replicaDiskSoftAntiAffinity}
</div>
<div className={styles.row}>
<span className={styles.label}> Freeze File System For Snapshot:</span>
{addGlobalSettingDescription(selectedVolume?.freezeFSForSnapshot)}
<span className={styles.label}> Freeze Filesystem For Snapshot:</span>
{addGlobalSettingDescription(selectedVolume?.freezeFilesystemForSnapshot)}
</div>
{ selectedVolume.kubernetesStatus ? <div>
{ selectedVolume.kubernetesStatus.lastPVCRefAt ? <div className={styles.row}>
Expand Down
16 changes: 8 additions & 8 deletions src/routes/volume/detail/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import UpdateAccessMode from '../UpdateAccessMode'
import UpdateUnmapMarkSnapChainRemovedModal from '../UpdateUnmapMarkSnapChainRemovedModal'
import UpdateSnapshotMaxCountModal from '../UpdateSnapshotMaxCountModal.js'
import UpdateSnapshotMaxSizeModal from '../UpdateSnapshotMaxSizeModal.js'
import UpdateFreezeFSForSnapshotModal from '../UpdateFreezeFSForSnapshotModal'
import UpdateFreezeFilesystemForSnapshotModal from '../UpdateFreezeFilesystemForSnapshotModal'
import Snapshots from './Snapshots'
import RecurringJob from './RecurringJob'
import EventList from './EventList'
Expand All @@ -44,7 +44,7 @@ import {
getUpdateOfflineReplicaRebuildingModalProps,
getUpdateSnapshotMaxCountModalProps,
getUpdateSnapshotMaxSizeModalProps,
getUpdateFreezeFSForSnapshotModalProps,
getUpdateFreezeFilesystemForSnapshotModalProps,
} from '../helper'

const confirm = Modal.confirm
Expand Down Expand Up @@ -90,8 +90,8 @@ function VolumeDetail({ snapshotModal, dispatch, backup, engineimage, eventlog,
detachHostModalKey,
updateSnapshotMaxCountModalVisible,
updateSnapshotMaxSizeModalVisible,
updateFreezeFSForSnapshotModalKey,
updateFreezeFSForSnapshotModalVisible,
updateFreezeFilesystemForSnapshotModalKey,
updateFreezeFilesystemForSnapshotModalVisible,
} = volume
const { backupStatus, backupTargetAvailable, backupTargetMessage } = backup
const { data: snapshotData, state: snapshotModalState } = snapshotModal
Expand Down Expand Up @@ -466,9 +466,9 @@ function VolumeDetail({ snapshotModal, dispatch, backup, engineimage, eventlog,
})
}
},
showUpdateFreezeFSForSnapshotModal(record) {
showUpdateFreezeFilesystemForSnapshotModal(record) {
dispatch({
type: 'volume/showUpdateFreezeFSForSnapshotModal',
type: 'volume/showUpdateFreezeFilesystemForSnapshotModal',
payload: {
selected: record,
},
Expand Down Expand Up @@ -551,7 +551,7 @@ function VolumeDetail({ snapshotModal, dispatch, backup, engineimage, eventlog,
const updateSnapshotMaxCountModalProps = getUpdateSnapshotMaxCountModalProps(selectedVolume,
updateSnapshotMaxCountModalVisible, dispatch)
const updateSnapshotMaxSizeModalProps = getUpdateSnapshotMaxSizeModalProps(selectedVolume, updateSnapshotMaxSizeModalVisible, dispatch)
const updateFreezeFSForSnapshotModalProps = getUpdateFreezeFSForSnapshotModalProps(selectedVolume, updateFreezeFSForSnapshotModalVisible, dispatch)
const updateFreezeFilesystemForSnapshotModalProps = getUpdateFreezeFilesystemForSnapshotModalProps(selectedVolume, updateFreezeFilesystemForSnapshotModalVisible, dispatch)
const createPVAndPVCSingleProps = {
item: {
defaultPVName,
Expand Down Expand Up @@ -684,7 +684,7 @@ function VolumeDetail({ snapshotModal, dispatch, backup, engineimage, eventlog,
{updateReplicaAutoBalanceModalVisible ? <UpdateReplicaAutoBalanceModal key={updateReplicaAutoBalanceModalKey} {...updateReplicaAutoBalanceModalProps} /> : ''}
{updateReplicaSoftAntiAffinityVisible ? <CommonModal key={updateReplicaSoftAntiAffinityModalKey} {...updateReplicaSoftAntiAffinityModalProps} /> : ''}
{updateOfflineReplicaRebuildingVisible ? <CommonModal key={updateOfflineReplicaRebuildingModalKey} {...updateOfflineReplicaRebuildingModalProps} /> : ''}
{updateFreezeFSForSnapshotModalVisible ? <UpdateFreezeFSForSnapshotModal key={updateFreezeFSForSnapshotModalKey} {...updateFreezeFSForSnapshotModalProps} /> : ''}
{updateFreezeFilesystemForSnapshotModalVisible ? <UpdateFreezeFilesystemForSnapshotModal key={updateFreezeFilesystemForSnapshotModalKey} {...updateFreezeFilesystemForSnapshotModalProps} /> : ''}
</div>
</div>
)
Expand Down
12 changes: 6 additions & 6 deletions src/routes/volume/helper/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ export function getUpdateBulkDataLocalityModalProps(volumes, visible, defaultDat
}
}

export function getUpdateFreezeFSForSnapshotModalProps(volume, visible, dispatch) {
export function getUpdateFreezeFilesystemForSnapshotModalProps(volume, visible, dispatch) {
let option = [
{ key: 'Enabled', value: 'enabled' },
{ key: 'Disabled', value: 'disabled' },
Expand All @@ -412,7 +412,7 @@ export function getUpdateFreezeFSForSnapshotModalProps(volume, visible, dispatch
visible,
onOk(v, url) {
dispatch({
type: 'volume/updateFreezeFSForSnapshot',
type: 'volume/updateFreezeFilesystemForSnapshot',
payload: {
params: v,
url,
Expand All @@ -421,7 +421,7 @@ export function getUpdateFreezeFSForSnapshotModalProps(volume, visible, dispatch
},
onCancel() {
dispatch({
type: 'volume/hideUpdateFreezeFSForSnapshotModal',
type: 'volume/hideUpdateFreezeFilesystemForSnapshotModal',
})
dispatch({
type: 'app/changeBlur',
Expand All @@ -431,7 +431,7 @@ export function getUpdateFreezeFSForSnapshotModalProps(volume, visible, dispatch
}
}

export function getUpdateBulkFreezeFSForSnapshotModalProps(volumes, visible, dispatch) {
export function getUpdateBulkFreezeFilesystemForSnapshotModalProps(volumes, visible, dispatch) {
let option = [
{ key: 'Enabled', value: 'enabled' },
{ key: 'Disabled', value: 'disabled' },
Expand All @@ -444,7 +444,7 @@ export function getUpdateBulkFreezeFSForSnapshotModalProps(volumes, visible, dis
visible,
onOk(v, urls) {
dispatch({
type: 'volume/updateBulkFreezeFSForSnapshot',
type: 'volume/updateBulkFreezeFilesystemForSnapshot',
payload: {
params: v,
urls,
Expand All @@ -453,7 +453,7 @@ export function getUpdateBulkFreezeFSForSnapshotModalProps(volumes, visible, dis
},
onCancel() {
dispatch({
type: 'volume/hideUpdateBulkFreezeFSForSnapshotModal',
type: 'volume/hideUpdateBulkFreezeFilesystemForSnapshotModal',
})
dispatch({
type: 'app/changeBlur',
Expand Down
Loading

0 comments on commit b4aa8ca

Please sign in to comment.