general -> other

Author: vogievetsky

src/client/modals/cluster-seed-modal/cluster-seed-modal.tsx

@@ -120,14 +120,14 @@ export class ClusterSeedModal extends React.Component<ClusterSeedModalProps, Clu
 
     if (clusterType === 'mysql' || clusterType === 'postgres') {
       extraSQLFields = <div>
+        {makeLabel('database')}
+        {makeTextInput('database', /^.+$/)}
+
         {makeLabel('user')}
         {makeTextInput('user', /^.+$/)}
 
         {makeLabel('password')}
         {makeTextInput('password')}
-
-        {makeLabel('database')}
-        {makeTextInput('database', /^.+$/)}
       </div>;
     }
 

src/client/modals/measure-modal/measure-modal.tsx

@@ -89,12 +89,12 @@ export class MeasureModal extends React.Component<MeasureModalProps, ImmutableFo
         {makeLabel('title')}
         {makeTextInput('title', /^.+$/, true)}
 
-        {makeLabel('units')}
-        {makeTextInput('units')}
-
         {makeLabel('formula')}
         {makeTextInput('formula')}
 
+        {makeLabel('units')}
+        {makeTextInput('units')}
+
       </form>
 
       <div className="button-bar">

…views/settings-view/general/general.scss …ent/views/settings-view/other/other.scsssrc/client/views/settings-view/general/general.scss renamed to src/client/views/settings-view/other/other.scss src/client/views/settings-view/general/general.scss renamed to src/client/views/settings-view/other/other.scss

@@ -16,6 +16,6 @@
 
 @import '../../../imports';
 
-.general {
+.other {
   height: 100%;
 }

…/views/settings-view/general/general.tsx …ient/views/settings-view/other/other.tsxsrc/client/views/settings-view/general/general.tsx renamed to src/client/views/settings-view/other/other.tsx src/client/views/settings-view/general/general.tsx renamed to src/client/views/settings-view/other/other.tsx

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-require('./general.css');
+require('./other.css');
 
 import { Timezone } from 'chronoshift';
 import * as React from 'react';
-import { Fn } from '../../../../common/utils/general/general';
 import { classNames } from '../../../utils/dom/dom';
 
 import { SvgIcon } from '../../../components/svg-icon/svg-icon';
@@ -32,12 +31,12 @@ import { AppSettings, AppSettingsJS } from '../../../../common/models/index';
 
 import { ImmutableFormDelegate, ImmutableFormState } from '../../../utils/immutable-form-delegate/immutable-form-delegate';
 
-export interface GeneralProps extends React.Props<any> {
+export interface OtherProps extends React.Props<any> {
   settings?: AppSettings;
   onSave?: (settings: AppSettings) => void;
 }
 
-export class General extends React.Component<GeneralProps, ImmutableFormState<AppSettings>> {
+export class Other extends React.Component<OtherProps, ImmutableFormState<AppSettings>> {
 
   private delegate: ImmutableFormDelegate<AppSettings>;
 
@@ -47,7 +46,7 @@ export class General extends React.Component<GeneralProps, ImmutableFormState<Ap
     this.delegate = new ImmutableFormDelegate<AppSettings>(this);
   }
 
-  componentWillReceiveProps(nextProps: GeneralProps) {
+  componentWillReceiveProps(nextProps: OtherProps) {
     if (nextProps.settings) this.setState({
       newInstance: nextProps.settings,
       errors: {}
@@ -73,9 +72,9 @@ export class General extends React.Component<GeneralProps, ImmutableFormState<Ap
     var makeLabel = FormLabel.simpleGenerator(LABELS, errors);
     var makeTextInput = ImmutableInput.simpleGenerator(newInstance, this.delegate.onChange);
 
-    return <div className="general">
+    return <div className="other">
       <div className="title-bar">
-        <div className="title">General</div>
+        <div className="title">Other</div>
         {canSave ? <Button className="save" title="Save" type="primary" onClick={this.save.bind(this)}/> : null}
       </div>
       <div className="content">

src/client/views/settings-view/settings-view.tsx

@@ -38,12 +38,12 @@ import { ClusterSeedModal, DataCubeSeedModal } from '../../modals/index';
 import { AppSettings, Cluster } from '../../../common/models/index';
 
 import { SettingsHeaderBar } from './settings-header-bar/settings-header-bar';
-import { General } from './general/general';
+
 import { Clusters } from './clusters/clusters';
 import { ClusterEdit } from './cluster-edit/cluster-edit';
 import { DataCubes } from './data-cubes/data-cubes';
 import { DataCubeEdit } from './data-cube-edit/data-cube-edit';
-
+import { Other } from './other/other';
 
 export interface SettingsViewProps extends React.Props<any> {
   user?: User;
@@ -62,16 +62,16 @@ export interface SettingsViewState {
 }
 
 const PATHS = {
-  general: 'general',
   clusters: 'clusters',
   dataCubes: 'data-cubes',
-  newDataCube: 'new-data-cube'
+  newDataCube: 'new-data-cube',
+  other: 'other'
 };
 
 const VIEWS = [
-  {label: 'General', value: PATHS.general, svg: require('../../icons/full-settings.svg')},
   {label: 'Clusters', value: PATHS.clusters, svg: require('../../icons/full-cluster.svg')},
-  {label: 'Data Cubes', value: PATHS.dataCubes, svg: require('../../icons/full-cube.svg')}
+  {label: 'Data Cubes', value: PATHS.dataCubes, svg: require('../../icons/full-cube.svg')},
+  {label: 'Other', value: PATHS.other, svg: require('../../icons/full-more.svg')}
 ];
 
 function autoFillDataCube(dataCube: DataCube, cluster: Cluster): Q.Promise<DataCube> {
@@ -314,10 +314,6 @@ export class SettingsView extends React.Component<SettingsViewProps, SettingsVie
 
         <Router rootFragment="settings" onURLChange={this.onURLChange.bind(this)}>
 
-          <Route fragment={PATHS.general}>
-            <General settings={settings} onSave={this.onSave.bind(this)}/>
-          </Route>
-
           <Route fragment={PATHS.clusters}>
             <Clusters settings={settings} onSave={this.onSave.bind(this)}/>
 
@@ -373,6 +369,11 @@ export class SettingsView extends React.Component<SettingsViewProps, SettingsVie
             </Route>
 
           </Route>
+
+          <Route fragment={PATHS.other}>
+            <Other settings={settings} onSave={this.onSave.bind(this)}/>
+          </Route>
+
         </Router>
       </div>
      </div>;