-
Notifications
You must be signed in to change notification settings - Fork 33
Feature/disable apikey #1518
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Feature/disable apikey #1518
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
2bab945
Merge branch 'develop' into feature/disable-apikey
199c6f4
Merge branch 'develop' into feature/disable-apikey
10e48e6
import Apis
ae03bcf
added settings object to the apiumbrella schema
202073d
included field to proxy tab
8f4a281
Merge branch 'develop' into feature/disable-apikey
982231e
Merge branch 'develop' into feature/disable-apikey
93463ee
Merge branch 'develop' into feature/disable-apikey
5967d1d
Merge branch 'develop' into feature/disable-apikey
3581f76
renamed settings schema
33e0037
new UI for disable API key field
83aa5bb
changed default value and label
db18c8e
Merge branch 'develop' into feature/disable-apikey
c2decd4
Merge branch 'develop' into feature/disable-apikey
ef78cb5
organised code
00e52c2
styles
da7c2d5
i18n strings
9a748dc
moved button; changed style
e33f03e
missing i18n string
caf7733
more style
3be04d6
i18n label
3e88625
changed to ID
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -120,9 +120,31 @@ | |
| {{_ "proxyBackendForm_apiPort_helpText" }} | ||
| </p> | ||
| </div> | ||
|
|
||
| <!-- Advanced settings --> | ||
| <div class="form-group col-md-12 advanced-settings"> | ||
|
|
||
| <!-- Advanced settings block title --> | ||
| <h3> | ||
| {{_ "proxyBackendForm_advancedSettings_title" }} | ||
| </h3> | ||
|
|
||
| <!-- field input --> | ||
| {{> afQuickField | ||
| name="apiUmbrella.settings.disable_api_key" | ||
| type="boolean-checkbox" | ||
| }} | ||
|
|
||
| <!-- help text --> | ||
| <p class="help-block"> | ||
| {{_ "proxyBackendForm_disableApiKey_helpText" }} | ||
| </p> | ||
| </div> | ||
| </div> | ||
|
|
||
| <!-- submit button --> | ||
| <button type="submit" class="btn btn-primary pull-right">Save proxy settings</button> | ||
| <button type="submit" class="btn btn-success pull-left save-proxy-button"> | ||
|
||
| {{_ "proxyBackendForm_saveButton" }} | ||
| </button> | ||
| {{/ autoForm }} | ||
| </template> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| .advanced-settings { | ||
| margin-bottom: 0; | ||
|
|
||
| .form-group { | ||
| margin-bottom: 0; | ||
|
|
||
| .checkbox { | ||
| margin-bottom: 0.3em; | ||
| } | ||
| } | ||
|
|
||
| .help-block { | ||
| margin-bottom: 0; | ||
| margin-top: 0; | ||
|
|
||
| label { | ||
| margin-bottom: 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .save-proxy-button { | ||
| margin-top: 1em; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,16 @@ | ||
| // Utility import | ||
| import { proxyBasePathRegEx, apiBasePathRegEx } from './regex'; | ||
|
|
||
|
|
||
| const Settings = new SimpleSchema({ | ||
| 'disable_api_key': { | ||
| type: Boolean, | ||
| optional: true, | ||
| label: 'Disable API Key', | ||
|
||
| defaultValue: false | ||
| } | ||
| }); | ||
|
|
||
| const ApiUmbrellaSchema = new SimpleSchema({ | ||
| id: { | ||
| type: String, | ||
|
|
@@ -64,6 +74,10 @@ const ApiUmbrellaSchema = new SimpleSchema({ | |
| optional: true, | ||
| label: 'API port', | ||
| }, | ||
| settings: { | ||
| type: Settings, | ||
| optional: true, | ||
| }, | ||
| }); | ||
|
|
||
| export { ApiUmbrellaSchema }; | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is the only 'advanced-settings' element on the page, use
idinstead ofclass.