show a placeholder for each tag

mvillis · Nov 22, 2016 · fd1fe75 · fd1fe75
1 parent 883aa4c
commit fd1fe75
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/client/js/components/assessment/assessmentList.js b/client/js/components/assessment/assessmentList.js
@@ -59,7 +59,7 @@ var AssessmentList = React.createClass({
                   <td className='wrap'>
                     {this.props.assessmentTags.hasOwnProperty(assessment.id)
                       ? <TagList tags={this.props.assessmentTags[assessment.id] || []} />
-                      : <span>•••&nbsp;</span>}
+                      : assessment.tags.map(function (tagId) { return <span key={tagId}>•••&nbsp;</span> })}
                     {assessment.status === 'DONE' && <Label bsStyle='default'>Read Only</Label>}
                   </td>
                   {this.props.showTeams && <td>

diff --git a/client/js/components/team/teamList.js b/client/js/components/team/teamList.js
@@ -50,7 +50,7 @@ var TeamList = React.createClass({
                   <td className='wrap'>
                     {this.props.teamTags.hasOwnProperty(team.id)
                       ? <TagList tags={this.props.teamTags[team.id] || []} />
-                      : <span>•••</span>}
+                      : team.tags.map(function (tagId) { return <span key={tagId}>•••&nbsp;</span> })}
                   </td>
                   <td data-sort={team.created}>
                     {prettyCreated} <small>({relativeCreated})</small>

diff --git a/client/js/components/team/teamTable.js b/client/js/components/team/teamTable.js
@@ -38,9 +38,17 @@ var TeamTable = React.createClass({
       url: '/api/teams/',
       dataType: 'json',
       cache: false,
-      success: function (data) {
+      success: function (teams) {
+        var tags = {}
+        teams.filter(function (team) {
+          return (team.tags.length == 0)
+        }, this).forEach(function (team) {
+          tags[team.id] = []
+        }, this)
+
         this.setState({
-          teams: data,
+          teams: teams,
+          teamTags: tags,
           loaded: true
         })
         this.loadAllTagsFromServer()

diff --git a/measure_mate/settings/dev.py b/measure_mate/settings/dev.py
@@ -2,7 +2,11 @@
 
 DEBUG = os.environ.get('DJANGO_DEBUG', True)
 
-CSP_CONNECT_SRC = ("'self'", "ws://localhost:3000", "ws://127.0.0.1:3000")
+CSP_CONNECT_SRC = (
+    "'self'",
+    "ws://localhost:*", "ws://127.0.0.1:*",
+    "http://localhost:*", "http://127.0.0.1:*"
+)
 
 INSTALLED_APPS += (
     'django_extensions',

diff --git a/yarn.lock b/yarn.lock
@@ -4352,7 +4352,7 @@ gulp-sourcemaps@1.6.0:
     through2 "^2.0.0"
     vinyl "^1.0.0"
 
-gulp-sourcemaps@^2.2.0:
+gulp-sourcemaps@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-2.2.1.tgz#b9c7321526089d022180485a9eba2277d72805a7"
   dependencies:
@@ -8548,11 +8548,11 @@ stylehacks@^2.3.0:
     text-table "^0.2.0"
     write-file-stdout "0.0.2"
 
-stylelint-config-standard@15.0.0:
+stylelint-config-standard@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-15.0.0.tgz#3180b2f9aa3896a754ce6a69bf1b1fe7ab2e0ca0"
 
-stylelint@^7.4.2, stylelint@^7.5.0:
+stylelint@^7.4.2, stylelint@^7.6.0:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.6.0.tgz#ddeb06ccc95f72c119fcde5e85439fb7e9cde4df"
   dependencies: