From 5f3b5d5b3bceac62321acc1e1e4e74c45e521c7e Mon Sep 17 00:00:00 2001 From: Joshua Shoemaker Date: Wed, 22 Jul 2020 22:47:34 -0500 Subject: [PATCH] refact: renamed Collections to Models --- src/Controllers/CreateNoduleController.js | 4 ++-- src/Controllers/CreateTableController.js | 2 +- src/Controllers/NoduleListController.js | 7 ++++++- src/Controllers/TableListController.js | 2 +- src/{Collections => Models}/Nodules.js | 4 +++- src/{Collections => Models}/Tables.js | 0 src/views/CreateNodule/CreateJoinNoduleForm.js | 2 +- src/views/CreateNodule/CreateNodule.js | 2 +- src/views/CreateNodule/TableSelect.js | 2 +- src/views/TableList/TableList.js | 2 +- 10 files changed, 17 insertions(+), 10 deletions(-) rename src/{Collections => Models}/Nodules.js (91%) rename src/{Collections => Models}/Tables.js (100%) diff --git a/src/Controllers/CreateNoduleController.js b/src/Controllers/CreateNoduleController.js index 97da646..908f615 100644 --- a/src/Controllers/CreateNoduleController.js +++ b/src/Controllers/CreateNoduleController.js @@ -1,5 +1,5 @@ -import Tables from '../Collections/Tables' -import Nodules from '../Collections/Nodules' +import Tables from '../Models/Tables' +import Nodules from '../Models/Nodules' class CreateNoduleController { constructor() { diff --git a/src/Controllers/CreateTableController.js b/src/Controllers/CreateTableController.js index acf6ee8..574ea50 100644 --- a/src/Controllers/CreateTableController.js +++ b/src/Controllers/CreateTableController.js @@ -1,4 +1,4 @@ -import Tables from '../Collections/Tables' +import Tables from '../Models/Tables' import FileAccess from '../Services/FileAccess' class CreateTableController { diff --git a/src/Controllers/NoduleListController.js b/src/Controllers/NoduleListController.js index 322de51..54401fd 100644 --- a/src/Controllers/NoduleListController.js +++ b/src/Controllers/NoduleListController.js @@ -1,4 +1,4 @@ -import Nodules from '../Collections/Nodules' +import Nodules from '../Models/Nodules' class NoduleistController { constructor() { @@ -10,6 +10,11 @@ class NoduleistController { this.nodules.removeById(id) document.dispatchEvent(this.updatedNodulesEvent) } + + logExportById = id => { + const nodule = this.nodules.getNoduleById(id) + console.log(nodule.export()) + } } export default NoduleistController \ No newline at end of file diff --git a/src/Controllers/TableListController.js b/src/Controllers/TableListController.js index fc9bb29..afe87a0 100644 --- a/src/Controllers/TableListController.js +++ b/src/Controllers/TableListController.js @@ -1,4 +1,4 @@ -import Tables from '../Collections/Tables' +import Tables from '../Models/Tables' class TableListController { constructor() { diff --git a/src/Collections/Nodules.js b/src/Models/Nodules.js similarity index 91% rename from src/Collections/Nodules.js rename to src/Models/Nodules.js index 84d5c80..926d83d 100644 --- a/src/Collections/Nodules.js +++ b/src/Models/Nodules.js @@ -60,7 +60,9 @@ class Nodules { getCollectionProps = () => this.collection.map(nodule => nodule.getProperties()) - getTableByLabel = label => this.collection.find(n => label === n.label) + getNoduleById = id => this.collection.find(n => id === n.id) + + getNoduleByLabel = label => this.collection.find(n => label === n.label) } export default Nodules \ No newline at end of file diff --git a/src/Collections/Tables.js b/src/Models/Tables.js similarity index 100% rename from src/Collections/Tables.js rename to src/Models/Tables.js diff --git a/src/views/CreateNodule/CreateJoinNoduleForm.js b/src/views/CreateNodule/CreateJoinNoduleForm.js index 14110fa..9dc2463 100644 --- a/src/views/CreateNodule/CreateJoinNoduleForm.js +++ b/src/views/CreateNodule/CreateJoinNoduleForm.js @@ -2,7 +2,7 @@ import React, { Component } from 'react' import { Input, Dropdown, Button, Icon, List } from 'semantic-ui-react' import './CreateNodule.css' -import Tables from '../../Collections/Tables' +import Tables from '../../Models/Tables' class CreateJoinNoduleForm extends Component { constructor () { diff --git a/src/views/CreateNodule/CreateNodule.js b/src/views/CreateNodule/CreateNodule.js index b9ab26c..7d26b1a 100644 --- a/src/views/CreateNodule/CreateNodule.js +++ b/src/views/CreateNodule/CreateNodule.js @@ -3,7 +3,7 @@ import { Button, Input, Header, Dropdown } from 'semantic-ui-react' import CreateFilterNoduleForm from './CreateFilterNoduleForm' import './CreateNodule.css' -import Tables from '../../Collections/Tables' +import Tables from '../../Models/Tables' import CreateNoduleController from '../../Controllers/CreateNoduleController' import CreateJoinNoduleForm from './CreateJoinNoduleForm' import CreateTransformNoduleForm from './CreateTransformNoduleForm' diff --git a/src/views/CreateNodule/TableSelect.js b/src/views/CreateNodule/TableSelect.js index ced8155..bb152d2 100644 --- a/src/views/CreateNodule/TableSelect.js +++ b/src/views/CreateNodule/TableSelect.js @@ -2,7 +2,7 @@ import React, { Component } from 'react' import { Label, Icon } from 'semantic-ui-react' import './CreateNodule.css' -import Tables from '../../Collections/Tables' +import Tables from '../../Models/Tables' class TableSelect extends Component { constructor () { diff --git a/src/views/TableList/TableList.js b/src/views/TableList/TableList.js index abe2008..e674edf 100644 --- a/src/views/TableList/TableList.js +++ b/src/views/TableList/TableList.js @@ -2,7 +2,7 @@ import React, { Component } from 'react' import { Card, Icon, CardContent } from 'semantic-ui-react' import './TableList.css' -import Tables from '../../Collections/Tables' +import Tables from '../../Models/Tables' import TableListController from '../../Controllers/TableListController' class TableList extends Component {