292d013f32
In the JSON of emitted by the repo list endpoint, the project IDs are URL-encoded using java.net.URLEncoder.encode. While the Java function encodes spaces as plus-signs, the JavaScript decodeURLComponent does not. As a result, when editing the "inherits from" field of a project's access settings where the parent project's ID includes spaces, the payload would use an improperly decoded parent value, and this would be rejected by the API for failing to identify the parent. Add a new decoding method to the URL encoding behavior that better matches the style of encoding used by java.net.URLEncoder. Because the behavior had no test coverage before, it's moved to a new location and a suite of tests are added. Add tests for the access screen properly encoding and decoding parent IDs. Change-Id: Icb1d28d8f1f88c3c7373aa1c8953238a61c32ace
142 lines
4.7 KiB
HTML
142 lines
4.7 KiB
HTML
<!--
|
|
@license
|
|
Copyright (C) 2017 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<link rel="import" href="../../../bower_components/polymer/polymer.html">
|
|
|
|
<link rel="import" href="../../../behaviors/base-url-behavior/base-url-behavior.html">
|
|
<link rel="import" href="../../../behaviors/gr-access-behavior/gr-access-behavior.html">
|
|
<link rel="import" href="../../../behaviors/gr-url-encoding-behavior/gr-url-encoding-behavior.html">
|
|
<link rel="import" href="../../../styles/gr-form-styles.html">
|
|
<link rel="import" href="../../../styles/shared-styles.html">
|
|
<link rel="import" href="../../shared/gr-button/gr-button.html">
|
|
<link rel="import" href="../../shared/gr-select/gr-select.html">
|
|
|
|
<dom-module id="gr-rule-editor">
|
|
<template>
|
|
<style include="shared-styles">
|
|
:host {
|
|
border-bottom: 1px solid var(--border-color);
|
|
padding: .7em;
|
|
display: block;
|
|
}
|
|
#removeBtn {
|
|
display: none;
|
|
}
|
|
.editing #removeBtn {
|
|
display: flex;
|
|
}
|
|
#options {
|
|
align-items: baseline;
|
|
display: flex;
|
|
}
|
|
#options > * {
|
|
margin-right: .5em;
|
|
}
|
|
#mainContainer {
|
|
align-items: baseline;
|
|
display: flex;
|
|
flex-wrap: nowrap;
|
|
justify-content: space-between;
|
|
}
|
|
#deletedContainer.deleted {
|
|
align-items: baseline;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
}
|
|
#undoBtn,
|
|
#force,
|
|
#deletedContainer,
|
|
#mainContainer.deleted {
|
|
display: none;
|
|
}
|
|
#undoBtn.modified,
|
|
#force.force {
|
|
display: block;
|
|
}
|
|
.groupPath {
|
|
color: var(--deemphasized-text-color);
|
|
}
|
|
</style>
|
|
<style include="gr-form-styles"></style>
|
|
<div id="mainContainer"
|
|
class$="gr-form-styles [[_computeSectionClass(editing, _deleted)]]">
|
|
<div id="options">
|
|
<gr-select id="action"
|
|
bind-value="{{rule.value.action}}"
|
|
on-change="_handleValueChange">
|
|
<select disabled$="[[!editing]]">
|
|
<template is="dom-repeat" items="[[_computeOptions(permission)]]">
|
|
<option value="[[item]]">[[item]]</option>
|
|
</template>
|
|
</select>
|
|
</gr-select>
|
|
<template is="dom-if" if="[[label]]">
|
|
<gr-select
|
|
id="labelMin"
|
|
bind-value="{{rule.value.min}}"
|
|
on-change="_handleValueChange">
|
|
<select disabled$="[[!editing]]">
|
|
<template is="dom-repeat" items="[[label.values]]">
|
|
<option value="[[item.value]]">[[item.value]]</option>
|
|
</template>
|
|
</select>
|
|
</gr-select>
|
|
<gr-select
|
|
id="labelMax"
|
|
bind-value="{{rule.value.max}}"
|
|
on-change="_handleValueChange">
|
|
<select disabled$="[[!editing]]">
|
|
<template is="dom-repeat" items="[[label.values]]">
|
|
<option value="[[item.value]]">[[item.value]]</option>
|
|
</template>
|
|
</select>
|
|
</gr-select>
|
|
</template>
|
|
<a class="groupPath" href$="[[_computeGroupPath(groupId)]]">
|
|
[[groupName]]
|
|
</a>
|
|
<gr-select
|
|
id="force"
|
|
class$="[[_computeForceClass(permission, rule.value.action)]]"
|
|
bind-value="{{rule.value.force}}"
|
|
on-change="_handleValueChange">
|
|
<select disabled$="[[!editing]]">
|
|
<template
|
|
is="dom-repeat"
|
|
items="[[_computeForceOptions(permission, rule.value.action)]]">
|
|
<option value="[[item.value]]">[[item.name]]</option>
|
|
</template>
|
|
</select>
|
|
</gr-select>
|
|
</div>
|
|
<gr-button
|
|
link
|
|
id="removeBtn"
|
|
on-tap="_handleRemoveRule">Remove</gr-button>
|
|
</div>
|
|
<div
|
|
id="deletedContainer"
|
|
class$="gr-form-styles [[_computeSectionClass(editing, _deleted)]]">
|
|
[[groupName]] was deleted
|
|
<gr-button link
|
|
id="undoRemoveBtn" on-tap="_handleUndoRemove">Undo</gr-button>
|
|
</div>
|
|
<gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
|
|
</template>
|
|
<script src="gr-rule-editor.js"></script>
|
|
</dom-module>
|