import org.sonar.server.user.UserSession;
import static com.google.common.collect.Sets.newHashSet;
-import static org.sonar.server.es.SearchOptions.MAX_LIMIT;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
+import static org.sonar.server.es.SearchOptions.MAX_LIMIT;
+import static org.sonar.server.project.Visibility.PRIVATE;
+import static org.sonar.server.project.Visibility.PUBLIC;
import static org.sonar.server.ws.WsUtils.checkFoundWithOptional;
public class GhostsAction implements ProjectsWsAction {
private static final String PARAM_ORGANIZATION = "organization";
private static final String ACTION = "ghosts";
- private static final Set<String> POSSIBLE_FIELDS = newHashSet("uuid", "key", "name", "creationDate");
+ private static final Set<String> POSSIBLE_FIELDS = newHashSet("uuid", "key", "name", "creationDate", "visibility");
private final DbClient dbClient;
private final UserSession userSession;
action.setChangelog(new Change("6.4", "The 'uuid' field is deprecated in the response"));
action
- .setDescription("List ghost projects.<br /> Requires 'Administer System' permission.")
+ .setDescription("List ghost projects.<br /> " +
+ "Requires 'Administer System' permission.")
.setResponseExample(Resources.getResource(getClass(), "projects-example-ghosts.json"))
.setSince("5.2")
.addPagingParams(100, MAX_LIMIT)
.setHandler(this);
action.createParam(PARAM_ORGANIZATION)
- .setDescription("the organization key")
+ .setDescription("Organization key")
.setRequired(false)
.setInternal(true)
.setSince("6.3");
writeIfWished(json, "key", project.key(), fieldsToReturn);
writeIfWished(json, "name", project.name(), fieldsToReturn);
writeIfWished(json, "creationDate", project.getCreatedAt(), fieldsToReturn);
+ writeIfWished(json, "visibility", project.isPrivate() ? PRIVATE.getLabel() : PUBLIC.getLabel(), fieldsToReturn);
json.endObject();
}
json.endArray();
import static org.sonar.core.util.stream.MoreCollectors.toList;
import static org.sonar.db.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.server.es.SearchOptions.MAX_LIMIT;
+import static org.sonar.server.project.Visibility.PRIVATE;
+import static org.sonar.server.project.Visibility.PUBLIC;
import static org.sonar.server.project.ws.ProjectsWsSupport.PARAM_ORGANIZATION;
import static org.sonar.server.ws.WsUtils.writeProtobuf;
public class ProvisionedAction implements ProjectsWsAction {
private static final Set<String> QUALIFIERS_FILTER = newHashSet(Qualifiers.PROJECT);
- private static final Set<String> POSSIBLE_FIELDS = newHashSet("uuid", "key", "name", "creationDate");
+ private static final Set<String> POSSIBLE_FIELDS = newHashSet("uuid", "key", "name", "creationDate", "visibility");
private final ProjectsWsSupport support;
private final DbClient dbClient;
writeIfNeeded("key", project.key(), compBuilder::setKey, desiredFields);
writeIfNeeded("name", project.name(), compBuilder::setName, desiredFields);
writeIfNeeded("creationDate", project.getCreatedAt(), compBuilder::setCreationDate, desiredFields);
+ writeIfNeeded("visibility", project.isPrivate() ? PRIVATE.getLabel() : PUBLIC.getLabel(), compBuilder::setVisibility, desiredFields);
return compBuilder.build();
}).collect(toList());
}
import static java.util.Optional.ofNullable;
import static org.sonar.api.resources.Qualifiers.PROJECT;
import static org.sonar.api.resources.Qualifiers.VIEW;
+import static org.sonar.server.project.Visibility.PRIVATE;
+import static org.sonar.server.project.Visibility.PUBLIC;
import static org.sonar.server.ws.WsUtils.writeProtobuf;
import static org.sonarqube.ws.WsProjects.SearchWsResponse.Component;
import static org.sonarqube.ws.WsProjects.SearchWsResponse.newBuilder;
.setId(dto.uuid())
.setKey(dto.key())
.setName(dto.name())
- .setQualifier(dto.qualifier());
+ .setQualifier(dto.qualifier())
+ .setVisibility(dto.isPrivate() ? PRIVATE.getLabel() : PUBLIC.getLabel());
return builder.build();
}
"uuid": "ce4c03d6-430f-40a9-b777-ad877c00aa4d",
"key": "org.apache.hbas:hbase",
"name": "HBase",
- "creationDate": "2015-03-04T23:03:44+0100"
+ "creationDate": "2015-03-04T23:03:44+0100",
+ "visibility": "public"
},
{
"uuid": "c526ef20-131b-4486-9357-063fa64b5079",
"key": "com.microsoft.roslyn:roslyn",
"name": "Roslyn",
- "creationDate": "2013-03-04T23:03:44+0100"
+ "creationDate": "2013-03-04T23:03:44+0100",
+ "visibility": "private"
}
],
"total": 2,
"uuid": "ce4c03d6-430f-40a9-b777-ad877c00aa4d",
"key": "org.apache.hbas:hbase",
"name": "HBase",
- "creationDate": "2015-03-04T23:03:44+0100"
+ "creationDate": "2015-03-04T23:03:44+0100",
+ "visibility": "public"
},
{
"uuid": "c526ef20-131b-4486-9357-063fa64b5079",
"key": "com.microsoft.roslyn:roslyn",
"name": "Roslyn",
- "creationDate": "2013-03-04T23:03:44+0100"
+ "creationDate": "2013-03-04T23:03:44+0100",
+ "visibility": "private"
}
]
}
"id": "project-uuid-1",
"key": "project-key-1",
"name": "Project Name 1",
- "qualifier": "TRK"
+ "qualifier": "TRK",
+ "visibility": "public"
},
{
"organization": "my-org-1",
"id": "project-uuid-2",
"key": "project-key-2",
"name": "Project Name 1",
- "qualifier": "TRK"
+ "qualifier": "TRK",
+ "visibility": "private"
}
]
}
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.organization.TestDefaultOrganizationProvider;
import org.sonar.server.tester.UserSessionRule;
-import org.sonar.server.ws.TestRequest;
import org.sonar.server.ws.TestResponse;
import org.sonar.server.ws.WsActionTester;
assertThat(action.params()).hasSize(5);
Param organization = action.param("organization");
- assertThat(organization.description()).isEqualTo("the organization key");
+ assertThat(organization.description()).isEqualTo("Organization key");
assertThat(organization.since()).isEqualTo("6.3");
assertThat(organization.isRequired()).isFalse();
assertThat(organization.isInternal()).isTrue();
" {" +
" \"uuid\": \"" + ghost1.uuid() + "\"," +
" \"key\": \"" + ghost1.key() + "\"," +
- " \"name\": \"" + ghost1.name() + "\"" +
+ " \"name\": \"" + ghost1.name() + "\"," +
+ " \"visibility\": \"private\"" +
" }," +
" {" +
" \"uuid\": \"" + ghost2.uuid() + "\"," +
" \"key\": \"" + ghost2.key() + "\"," +
- " \"name\": \"" + ghost2.name() + "\"" +
+ " \"name\": \"" + ghost2.name() + "\"," +
+ " \"visibility\": \"private\"" +
" }" +
" ]" +
"}");
ComponentDto hBaseProject = ComponentTesting.newPrivateProjectDto(organization, "ce4c03d6-430f-40a9-b777-ad877c00aa4d")
.setKey("org.apache.hbas:hbase")
.setName("HBase")
- .setCreatedAt(DateUtils.parseDateTime("2015-03-04T23:03:44+0100"));
+ .setCreatedAt(DateUtils.parseDateTime("2015-03-04T23:03:44+0100"))
+ .setPrivate(false);
dbClient.componentDao().insert(db.getSession(), hBaseProject);
dbClient.snapshotDao().insert(db.getSession(), SnapshotTesting.newAnalysis(hBaseProject)
.setStatus(STATUS_UNPROCESSED));
@Test
public void fail_with_NotFoundException_when_organization_with_specified_key_does_not_exist() {
- TestRequest request = underTest.newRequest()
- .setParam("organization", "foo");
userSessionRule.logIn();
expectedException.expect(NotFoundException.class);
expectedException.expectMessage("No organization for key 'foo'");
- request.execute();
+ underTest.newRequest().setParam("organization", "foo").execute();
}
private ComponentDto insertGhostProject(OrganizationDto organization) {
" {" +
" \"uuid\":\"provisioned-uuid-1\"," +
" \"key\":\"provisioned-key-1\"," +
- " \"name\":\"provisioned-name-1\"" +
+ " \"name\":\"provisioned-name-1\"," +
+ " \"visibility\":\"private\"" +
" }," +
" {" +
" \"uuid\":\"provisioned-uuid-2\"," +
" \"key\":\"provisioned-key-2\"," +
- " \"name\":\"provisioned-name-2\"" +
+ " \"name\":\"provisioned-name-2\"," +
+ " \"visibility\":\"private\"" +
" }" +
" ]" +
"}");
ComponentDto hBaseProject = ComponentTesting.newPrivateProjectDto(org, "ce4c03d6-430f-40a9-b777-ad877c00aa4d")
.setKey("org.apache.hbas:hbase")
.setName("HBase")
- .setCreatedAt(DateUtils.parseDateTime("2015-03-04T23:03:44+0100"));
+ .setCreatedAt(DateUtils.parseDateTime("2015-03-04T23:03:44+0100"))
+ .setPrivate(false);
ComponentDto roslynProject = ComponentTesting.newPrivateProjectDto(org, "c526ef20-131b-4486-9357-063fa64b5079")
.setKey("com.microsoft.roslyn:roslyn")
.setName("Roslyn")
OrganizationDto organization = db.organizations().insertForKey("my-org-1");
userSession.addPermission(ADMINISTER, organization);
db.components().insertComponents(
- newPrivateProjectDto(organization, "project-uuid-1").setName("Project Name 1").setKey("project-key-1"),
+ newPrivateProjectDto(organization, "project-uuid-1").setName("Project Name 1").setKey("project-key-1").setPrivate(false),
newPrivateProjectDto(organization, "project-uuid-2").setName("Project Name 1").setKey("project-key-2"));
String response = ws.newRequest()
import QualifierIcon from '../../../../components/shared/QualifierIcon';
import { getOrganizationByKey, areThereCustomOrganizations } from '../../../../store/rootReducer';
import OrganizationLink from '../../../../components/ui/OrganizationLink';
+import PrivateBadge from '../../../../components/common/PrivateBadge';
class ComponentNavBreadcrumbs extends React.PureComponent {
static propTypes = {
- breadcrumbs: React.PropTypes.array
+ breadcrumbs: React.PropTypes.array,
+ component: React.PropTypes.shape({
+ visibility: React.PropTypes.string
+ }).isRequired
};
render() {
<span className="slash-separator" />
</span>}
{items}
+ {this.props.component.visibility === 'private' && <PrivateBadge className="spacer-left" />}
</h2>
);
}
import { Unconnected } from '../ComponentNavBreadcrumbs';
it('should not render breadcrumbs with one element', () => {
- const breadcrumbs = [{ key: 'my-project', name: 'My Project', qualifier: 'TRK' }];
- const result = shallow(<Unconnected breadcrumbs={breadcrumbs} />);
+ const component = {
+ key: 'my-project',
+ name: 'My Project',
+ qualifier: 'TRK',
+ visibility: 'public'
+ };
+ const breadcrumbs = [component];
+ const result = shallow(<Unconnected breadcrumbs={breadcrumbs} component={component} />);
expect(result).toMatchSnapshot();
});
it('should render organization', () => {
- const breadcrumbs = [{ key: 'my-project', name: 'My Project', qualifier: 'TRK' }];
+ const component = {
+ key: 'my-project',
+ name: 'My Project',
+ organization: 'foo',
+ qualifier: 'TRK',
+ visibility: 'public'
+ };
+ const breadcrumbs = [component];
const organization = { key: 'foo', name: 'The Foo Organization' };
const result = shallow(
<Unconnected
breadcrumbs={breadcrumbs}
+ component={component}
organization={organization}
shouldOrganizationBeDisplayed={true}
/>
);
expect(result).toMatchSnapshot();
});
+
+it('renders private badge', () => {
+ const component = {
+ key: 'my-project',
+ name: 'My Project',
+ qualifier: 'TRK',
+ visibility: 'private'
+ };
+ const breadcrumbs = [component];
+ const result = shallow(<Unconnected breadcrumbs={breadcrumbs} component={component} />);
+ expect(result.find('PrivateBadge')).toHaveLength(1);
+});
if (this.state.page > 1) {
projects = [].concat(this.state.projects, projects);
}
- this.setState({ ready: true, projects, total: r.total });
+ this.setState({ ready: true, projects, total: r.paging.total });
});
};
import ApplyTemplateView from '../permissions/project/views/ApplyTemplateView';
import Checkbox from '../../components/controls/Checkbox';
import QualifierIcon from '../../components/shared/QualifierIcon';
+import PrivateBadge from '../../components/common/PrivateBadge';
import { translate } from '../../helpers/l10n';
export default class Projects extends React.PureComponent {
<td className="nowrap">
<span className="note">{project.key}</span>
</td>
+ <td className="width-20">
+ {project.visibility === 'private' && <PrivateBadge />}
+ </td>
<td className="thin nowrap">
<div className="dropdown">
<button className="dropdown-toggle" data-toggle="dropdown">
import FavoriteContainer from '../../../components/controls/FavoriteContainer';
import Organization from '../../../components/shared/Organization';
import TagsList from '../../../components/tags/TagsList';
+import PrivateBadge from '../../../components/common/PrivateBadge';
import { translate, translateWithParameters } from '../../../helpers/l10n';
export default class ProjectCard extends React.PureComponent {
{project.name}
</Link>
</h2>
+ {project.visibility === 'private' && <PrivateBadge className="spacer-left" />}
{project.tags.length > 0 && <TagsList tags={project.tags} customClass="spacer-left" />}
</div>
--- /dev/null
+.private-badge {
+ display: inline-block;
+ vertical-align: middle;
+ height: 20px;
+ line-height: 19px;
+ padding: 0 8px;
+ border: 1px solid #cdcdcd;
+ border-radius: 2px;
+ box-sizing: border-box;
+ color: #777;
+ font-size: 12px;
+}
\ No newline at end of file
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+// @flow
+import React from 'react';
+import classNames from 'classnames';
+import Tooltip from '../controls/Tooltip';
+import { translate } from '../../helpers/l10n';
+import './PrivateBadge.css';
+
+type Props = {
+ className?: string
+};
+
+export default function PrivateBadge(props: Props) {
+ return (
+ <Tooltip overlay={translate('visibility.private.description')}>
+ <div className={classNames('private-badge', props.className)}>
+ {translate('visibility.private')}
+ </div>
+ </Tooltip>
+ );
+}
optional string key = 2;
optional string name = 3;
optional string creationDate = 4;
+ optional string visibility = 5;
}
}
optional string key = 3;
optional string name = 4;
optional string qualifier = 5;
+ optional string visibility = 6;
}
}
projects / sonarqube.git / commitdiff