Skip to content

Commit 414fec7

Browse files
author
a.dmitryuk
committed
Fix css colors and add new params
1 parent 6c8bc1f commit 414fec7

File tree

6 files changed

+57
-16
lines changed

6 files changed

+57
-16
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>com.validate_lab.confluence</groupId>
99
<artifactId>stoplightelements_previewer</artifactId>
10-
<version>1.2.1</version>
10+
<version>1.3.0</version>
1111

1212
<organization>
1313
<name>ValidateLab</name>

‎src/main/java/com/validate_lab/confluence/stoplightelements_previewer/macro/StoplightElementsPreviewer.java‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,19 @@ public StoplightElementsPreviewer(@ComponentImport PageBuilderService pageBuilde
2020
this.pageBuilderService = pageBuilderService;
2121
}
2222

23-
public String execute(Map<String, String> map, String s, ConversionContext conversionContext) throws MacroExecutionException {
23+
public String execute(Map<String, String> parameters, String s, ConversionContext conversionContext) throws MacroExecutionException {
2424
// load JS and CSS
2525
pageBuilderService.assembler().resources().requireWebResource("com.validate_lab.confluence.stoplightelements_previewer:resources");
2626

27-
return "<elements-api apiDescriptionUrl=\"" + map.get("link") + "\" router=\"hash\" />";
27+
return "<elements-api" +
28+
" apiDescriptionUrl=\"" + parameters.get("link") + "\"" +
29+
" hideInternal=\"" + getBoolean(parameters, "hideInternal", "false") + "\"" +
30+
" hideTryIt=\"" + getBoolean(parameters, "hideTryIt", "false") + "\"" +
31+
" hideTryItPanel=\"" + getBoolean(parameters, "hideTryItPanel", "false") + "\"" +
32+
" hideSchemas=\"" + getBoolean(parameters, "hideSchemas", "false") + "\"" +
33+
" hideExport=\"" + getBoolean(parameters, "hideExport", "false") + "\"" +
34+
" router=\"hash\"" +
35+
" />";
2836
}
2937

3038
public BodyType getBodyType() {
@@ -34,4 +42,13 @@ public BodyType getBodyType() {
3442
public OutputType getOutputType() {
3543
return OutputType.BLOCK;
3644
}
45+
46+
private String getBoolean(Map<String, String> parameters, String parameter, String defaultValue) {
47+
String value = parameters.get(parameter);
48+
if (value == null) {
49+
return defaultValue;
50+
}
51+
52+
return value;
53+
}
3754
}

‎src/main/resources/WebVideo.properties‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/main/resources/atlassian-plugin.xml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,37 @@
88
</plugin-info>
99

1010
<!-- add our i18n resource -->
11-
<resource type="i18n" name="i18n" location="WebVideo"/>
11+
<resource type="i18n" name="i18n" location="previewer-context"/>
1212
<resource key="images" name="images/" type="download" location="/images"/>
1313

14-
<!-- add our web resources -->
1514
<web-resource key="resources" name="Web Resources">
1615
<dependency>com.atlassian.auiplugin:ajs</dependency>
1716
<resource type="download" name="images/" location="/images"/>
18-
<resource type="download" name="styles.css" location="/css/styles.css"/>
17+
<resource type="download" name="styles.css" location="/css/styles.css">
18+
<property key="content-type" value="text/css"/>
19+
</resource>
1920
<resource type="download" name="web-components.min.js" location="/js/web-components.min.js"/>
20-
<context>WebVideo</context>
21+
<context>previewer-context</context>
2122
</web-resource>
22-
<xhtml-macro name="stoplight-elements-previewer" class="com.validate_lab.confluence.stoplightelements_previewer.macro.StoplightElementsPreviewer" key='webvideo' icon="/download/resources/${atlassian.plugin.key}/images/Icon.png" >
23-
<description key="stoplight-elements-previewer.macro.desc"/>
23+
<xhtml-macro name="previewer-workspace" class="com.validate_lab.confluence.stoplightelements_previewer.macro.StoplightElementsPreviewer" key='previewer-workspace' icon="/download/resources/${atlassian.plugin.key}/images/Icon.png" >
2424
<category name="media" />
2525
<parameters>
2626
<parameter name="link" type="url" required="true" >
27+
<option key="showValueInPlaceholder" value="true"/>
28+
</parameter>
29+
<parameter name="hideInternal" type="boolean" default="false" >
30+
<option key="showValueInPlaceholder" value="false"/>
31+
</parameter>
32+
<parameter name="hideTryIt" type="boolean" default="false" >
33+
<option key="showValueInPlaceholder" value="false"/>
34+
</parameter>
35+
<parameter name="hideTryItPanel" type="boolean" default="false" >
36+
<option key="showValueInPlaceholder" value="false"/>
37+
</parameter>
38+
<parameter name="hideSchemas" type="boolean" default="false" >
39+
<option key="showValueInPlaceholder" value="false"/>
40+
</parameter>
41+
<parameter name="hideExport" type="boolean" default="false" >
2742
<option key="showValueInPlaceholder" value="false"/>
2843
</parameter>
2944
</parameters>

‎src/main/resources/css/styles.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/resources/previewer-context.properties‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#put any key/value pairs here
2+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.label=StoplightElements previewer
3+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.macro.desc=Plugin to integrate stoplight Elements into Confluence
4+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.link.label=Link
5+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.link.desc=URL
6+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideInternal.label=HideInternal
7+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideInternal.desc=filter out any content which has been marked as internal with x-internal
8+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideTryIt.label=HideTryIt
9+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideTryIt.desc=Hide the Try It feature completely
10+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideTryItPanel.label=HideTryItPanel
11+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideTryItPanel.desc=Hide the Try It panel while still display the Request Sample, expects hideTryIt to be false
12+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideSchemas.label=HideSchemas
13+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideSchemas.desc=Hide the schemas in the Table of Contents, when using the sidebar layout
14+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideExport.label=HideExport
15+
com.validate_lab.confluence.stoplightelements_previewer.previewer-workspace.param.hideExport.desc=Hide the Export button on overview section of the documentation

0 commit comments

Comments
 (0)