Skip to content

Commit

Permalink
Merge pull request #16466 from dannon/datatype-edit-tab
Browse files Browse the repository at this point in the history 
[23.1] Swap datatype&convert tab to a static 'datatypes' tab.
  • Loading branch information
@mvdbeek
mvdbeek authored Jul 26, 2023
2 parents baa7b66 + 55ebff6 commit 437fe9c
Showing 1 changed file with 16 additions and 21 deletions.
37 changes: 16 additions & 21 deletions client/src/components/DatasetInformation/DatasetAttributes.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,48 +31,43 @@
!result['metadata_disable']
">
<template v-slot:title>
<span v-if="!result['conversion_disable']">
<font-awesome-icon icon="cog" class="mr-1" />{{ "Convert" | l }}
</span>
<span v-else>
<font-awesome-icon icon="database" class="mr-1" />{{ "Datatypes" | l }}
</span>
<font-awesome-icon icon="database" class="mr-1" />{{ "Datatypes" | l }}
</template>
<div v-if="!result['conversion_disable']" class="ui-portlet-section">
<div v-if="!result['datatype_disable']" class="ui-portlet-section">
<div class="portlet-header">
<div class="portlet-title">
<font-awesome-icon icon="cog" class="portlet-title-icon fa-fw mr-1" />
<font-awesome-icon icon="database" class="portlet-title-icon fa-fw mr-1" />
<span class="portlet-title-text">
<b itemprop="name">{{ "Convert" | l }}</b>
<b itemprop="name">{{ "Assign Datatype" | l }}</b>
</span>
</div>
</div>
<div class="portlet-content">
<FormDisplay :inputs="result['conversion_inputs']" @onChange="onConversion" />
<FormDisplay :inputs="result['datatype_inputs']" @onChange="onDatatype" />
<div class="mt-2">
<b-button variant="primary" @click="submit('conversion', 'conversion')">
<font-awesome-icon icon="exchange-alt" class="mr-1" />{{ "Create Dataset" | l }}
<b-button variant="primary" class="mr-1" @click="submit('datatype', 'datatype')">
<font-awesome-icon icon="save" class="mr-1" />{{ "Save" | l }}
</b-button>
<b-button @click="submit('datatype', 'datatype_detect')">
<font-awesome-icon icon="redo" class="mr-1" />{{ "Auto-detect" | l }}
</b-button>
</div>
</div>
</div>
<div v-if="!result['datatype_disable']" class="ui-portlet-section">
<div v-if="!result['conversion_disable']" class="ui-portlet-section">
<div class="portlet-header">
<div class="portlet-title">
<font-awesome-icon icon="database" class="portlet-title-icon fa-fw mr-1" />
<font-awesome-icon icon="cog" class="portlet-title-icon fa-fw mr-1" />
<span class="portlet-title-text">
<b itemprop="name">{{ "Datatypes" | l }}</b>
<b itemprop="name">{{ "Convert to Datatype" | l }}</b>
</span>
</div>
</div>
<div class="portlet-content">
<FormDisplay :inputs="result['datatype_inputs']" @onChange="onDatatype" />
<FormDisplay :inputs="result['conversion_inputs']" @onChange="onConversion" />
<div class="mt-2">
<b-button variant="primary" class="mr-1" @click="submit('datatype', 'datatype')">
<font-awesome-icon icon="save" class="mr-1" />{{ "Save" | l }}
</b-button>
<b-button @click="submit('datatype', 'datatype_detect')">
<font-awesome-icon icon="redo" class="mr-1" />{{ "Auto-detect" | l }}
<b-button variant="primary" @click="submit('conversion', 'conversion')">
<font-awesome-icon icon="exchange-alt" class="mr-1" />{{ "Create Dataset" | l }}
</b-button>
</div>
</div>
Expand Down

0 comments on commit 437fe9c

Please sign in to comment.