Fixing minor bugs

This commit is contained in:
Jeffrey Morgan 2015-05-25 15:27:49 -07:00
parent d9f83e43f9
commit fd30c0fef6
3 changed files with 16 additions and 5 deletions

View File

@ -96,7 +96,7 @@ module.exports = React.createClass({
render: function () {
let filter = this.getQuery().filter || 'all';
let repos = _.values(this.state.repos)
.filter(repo => repo.name.indexOf(this.state.query) !== -1 || repo.namespace.indexOf(this.state.query) !== -1)
.filter(repo => repo.name.toLowerCase().indexOf(this.state.query.toLowerCase()) !== -1 || repo.namespace.toLowerCase().indexOf(this.state.query.toLowerCase()) !== -1)
.filter(repo => filter === 'all' || (filter === 'recommended' && repo.is_recommended) || (filter === 'userrepos' && repo.is_user_repo));
let results;

View File

@ -373,10 +373,14 @@ export default {
if (!columns.progress) {
columns.progress = []; // layerIDs, nbLayers, maxLayers, progress value
let layersToLoad = _.keys(layerProgress).length;
let layersPerColumn = Math.floor(layersToLoad / columns.amount);
let leftOverLayers = layersToLoad % columns.amount;
for (let i = 0; i < columns.amount; i++) {
let layerAmount = Math.ceil(layersToLoad / (columns.amount - i));
layersToLoad -= layerAmount;
columns.progress[i] = {layerIDs:[], nbLayers:0, maxLayers:layerAmount, value:0.0};
let layerAmount = layersPerColumn;
if (i < leftOverLayers) {
layerAmount += 1;
}
columns.progress[i] = {layerIDs: [], nbLayers:0, maxLayers: layerAmount, value: 0.0};
}
}

View File

@ -5,6 +5,8 @@ var util = require('../utils/Util');
var repositoryServerActions = require('../actions/RepositoryServerActions');
var tagServerActions = require('../actions/TagServerActions');
let searchReq = null;
module.exports = {
// Normalizes results from search to v2 repository results
normalize: function (repo) {
@ -21,11 +23,16 @@ module.exports = {
},
search: function (query, page) {
if (searchReq) {
searchReq.abort();
searchReq = null;
}
if (!query) {
repositoryServerActions.resultsUpdated({repos: []});
}
request.get({
searchReq = request.get({
url: 'https://registry.hub.docker.com/v1/search?',
qs: {q: query, page}
}, (error, response, body) => {