Skip to content

Commit 3fa002f

Browse files
golluroSICKAGgolluroSICKAG
authored
Release 1.1.1 (#3)
# Release 1.1.1 ## Bugfix - Legacy bindings of ValueDisplay / upload button / download button elements within UI did not work if deployed with VS Code AppSpace SDK - UI differs if deployed via Appstudio or VS Code AppSpace SDK - Fullscreen icon of iFrame was visible
1 parent 440e3fb commit 3fa002f

8 files changed

Lines changed: 78 additions & 48 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## Release 1.1.1
5+
6+
### Bugfix
7+
- Legacy bindings of ValueDisplay / upload button / download button elements within UI did not work if deployed with VS Code AppSpace SDK
8+
- UI differs if deployed via Appstudio or VS Code AppSpace SDK
9+
- Fullscreen icon of iFrame was visible
10+
411
## Release 1.1.0
512

613
### New features

‎CSK_Module_FileManager/pages/pages/CSK_Module_FileManager/CSK_Module_FileManager.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939

4040
.myCustomButton_CSK_Module_FileManager {
4141
border-radius: 30px;
42-
padding-right: 0px;
42+
padding: 11px;
4343
}

‎CSK_Module_FileManager/pages/pages/CSK_Module_FileManager/CSK_Module_FileManager.html‎

Lines changed: 51 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
<layout-row id="RowLayout3">
66
<layout-column id="ColumnLayout5" style="align-items: stretch">
77
<layout-row id="RowLayout14" style="align-items: baseline">
8-
<davinci-value-display id="VD_Title" class="myCustomLabel_CSK_Module_FileManager"
9-
value="File Manager">
10-
</davinci-value-display>
8+
<h1 id="Heading_Title" class="myCustomLabel_CSK_Module_FileManager">
9+
File Manager
10+
</h1>
1111
<davinci-value-display id="VD_Version">
12-
<crown-edpws-binding property="value" name="CSK_FileManager/OnNewStatusModuleVersion"
13-
update-on-resume>
14-
</crown-edpws-binding>
12+
<crown-on property="value" crown-event="CSK_FileManager/OnNewStatusModuleVersion">
13+
</crown-on>
1514
</davinci-value-display>
1615
</layout-row>
1716
</layout-column>
@@ -27,11 +26,11 @@
2726
<stacked-view id="SV_InfoMsg">
2827
<stacked-pane id="SP_infos" value="true">
2928
<curie-callout id="DC_InfoMsg">
30-
<crown-edpws-binding property="value" name="CSK_FileManager/OnNewStatusCalloutText"
31-
update-on-resume>
29+
<crown-edpws-binding property="value"
30+
name="CSK_FileManager/OnNewStatusCalloutText" update-on-resume>
3231
</crown-edpws-binding>
33-
<crown-edpws-binding property="type" name="CSK_FileManager/OnNewStatusCalloutType"
34-
update-on-resume>
32+
<crown-edpws-binding property="type"
33+
name="CSK_FileManager/OnNewStatusCalloutType" update-on-resume>
3534
</crown-edpws-binding>
3635
</curie-callout>
3736
</stacked-pane>
@@ -43,31 +42,35 @@
4342
<layout-row id="RowLayout8">
4443
<layout-column id="ColumnLayout3" class="myCustomFrame_CSK_Module_FileManager"
4544
style="align-items: stretch">
46-
<davinci-value-display id="VD_Folder" class="myCustomFrameLabel_CSK_Module_FileManager"
47-
value="" label="Folder" style="align-self: flex-start">
45+
<davinci-value-display id="VD_Folder"
46+
class="myCustomFrameLabel_CSK_Module_FileManager" value="" label="Folder"
47+
style="align-self: flex-start">
4848
</davinci-value-display>
4949
<davinci-text-field id="TF_Path" type="text" label="Path:"
5050
title="Set path for creating / deleting / uploading files.">
5151
<crown-on property="value" crown-event="CSK_FileManager/OnNewStatusPath">
5252
</crown-on>
53-
<crown-binding event="change" name="CSK_FileManager/setPath" path="param/args/path"
54-
auto-commit>
53+
<crown-binding event="change" name="CSK_FileManager/setPath"
54+
path="param/args/path" auto-commit>
5555
</crown-binding>
5656
</davinci-text-field>
5757
<layout-row id="RowLayout5">
58-
<davinci-button id="Button_Create" class="myCustomButton_CSK_Module_FileManager"
59-
type="primary" icon-position="append"
60-
title="Create folder like preset in 'Path'." icon="file/create_new_folder">
58+
<davinci-button id="Button_Create"
59+
class="myCustomButton_CSK_Module_FileManager" type="primary"
60+
title="Create folder like preset in 'Path'.">
61+
<davinci-icon icon="file/create_new_folder"></davinci-icon>
6162
<span></span>
62-
<crown-binding event="submit" name="CSK_FileManager/createFolder" auto-commit>
63+
<crown-binding event="submit" name="CSK_FileManager/createFolder"
64+
auto-commit>
6365
</crown-binding>
6466
</davinci-button>
6567
<davinci-button id="Button_DeleteFolder"
6668
class="myCustomButton_CSK_Module_FileManager" type="outline"
67-
icon-position="append" title="Delete folder including all subfolder / subfiles."
68-
icon="content/delete_sweep">
69+
title="Delete folder including all subfolder / subfiles.">
70+
<davinci-icon icon="content/delete_sweep"></davinci-icon>
6971
<span></span>
70-
<crown-binding event="submit" name="CSK_FileManager/deleteFolder" auto-commit>
72+
<crown-binding event="submit" name="CSK_FileManager/deleteFolder"
73+
auto-commit>
7174
</crown-binding>
7275
</davinci-button>
7376
<appspace-file-upload-button id="FileUploadButton" button-type="outline"
@@ -76,21 +79,24 @@
7679
<span>Upload</span>
7780
<crown-on property="path" crown-event="CSK_FileManager/OnNewStatusPath">
7881
</crown-on>
79-
<crown-set event="finished" crown-function="CSK_FileManager/fileUploadFinished"
80-
protocol="crownMSGPACK" crown-path="status">
82+
<crown-set event="finished"
83+
crown-function="CSK_FileManager/fileUploadFinished"
84+
protocol="crownMSGPACK" crown-path="status"
85+
converter="(value)=>{console.log(`event finished ${JSON.stringify(value)}`); return typeof value == 'boolean' ? value : value.success;}">
8186
</crown-set>
8287
</appspace-file-upload-button>
8388
</layout-row>
8489
<davinci-value-display id="VD_FreeUsedSpace">
85-
<crown-edpws-binding property="value" name="CSK_FileManager/OnNewStatusDiskInfo"
86-
update-on-resume>
87-
</crown-edpws-binding>
90+
<crown-on property="value"
91+
crown-event="CSK_FileManager/OnNewStatusDiskInfo">
92+
</crown-on>
8893
</davinci-value-display>
8994
</layout-column>
9095
<layout-column id="ColumnLayout2" class="myCustomFrame_CSK_Module_FileManager"
9196
style="align-items: stretch">
92-
<davinci-value-display id="VD_Files" class="myCustomFrameLabel_CSK_Module_FileManager"
93-
value="" label="Files" style="align-self: flex-start">
97+
<davinci-value-display id="VD_Files"
98+
class="myCustomFrameLabel_CSK_Module_FileManager" value="" label="Files"
99+
style="align-self: flex-start">
94100
</davinci-value-display>
95101
<davinci-drop-down id="DD_FileSource" label="File source:">
96102
<crown-edpws-binding property="data"
@@ -106,30 +112,34 @@
106112
</davinci-drop-down>
107113
<davinci-drop-down id="DD_FileList" label="Select file:"
108114
title="Info: Empty folders are not listed.">
109-
<crown-edpws-binding property="data" name="CSK_FileManager/OnNewStatusFileList"
110-
update-on-resume converter="convertToList">
115+
<crown-edpws-binding property="data"
116+
name="CSK_FileManager/OnNewStatusFileList" update-on-resume
117+
converter="convertToList">
111118
</crown-edpws-binding>
112-
<crown-edpws-binding property="value" name="CSK_FileManager/OnNewStatusSelectedFile"
113-
update-on-resume>
119+
<crown-edpws-binding property="value"
120+
name="CSK_FileManager/OnNewStatusSelectedFile" update-on-resume>
114121
</crown-edpws-binding>
115122
<crown-binding event="change" name="CSK_FileManager/selectFile"
116123
path="param/args/filename" auto-commit>
117124
</crown-binding>
118125
</davinci-drop-down>
119126
<layout-row id="RowLayout7">
120-
<davinci-button id="Button_Refresh" class="myCustomButton_CSK_Module_FileManager"
121-
type="outline" icon-position="append" title="Refresh file list"
122-
icon="navigation/refresh">
127+
<davinci-button id="Button_Refresh"
128+
class="myCustomButton_CSK_Module_FileManager" type="outline"
129+
title="Refresh file list">
130+
<davinci-icon icon="navigation/refresh"></davinci-icon>
123131
<span></span>
124132
<crown-binding event="submit" name="CSK_FileManager/updateListOfFiles"
125133
auto-commit>
126134
</crown-binding>
127135
</davinci-button>
128-
<davinci-button id="Button_Delete" class="myCustomButton_CSK_Module_FileManager"
129-
type="outline" icon-position="append" title="Delete selected file."
130-
icon="action/delete">
136+
<davinci-button id="Button_Delete"
137+
class="myCustomButton_CSK_Module_FileManager" type="outline"
138+
title="Delete selected file.">
139+
<davinci-icon icon="action/delete"></davinci-icon>
131140
<span></span>
132-
<crown-binding event="submit" name="CSK_FileManager/deleteFile" auto-commit>
141+
<crown-binding event="submit" name="CSK_FileManager/deleteFile"
142+
auto-commit>
133143
</crown-binding>
134144
</davinci-button>
135145
<appspace-file-download-button id="FileDownloadButton1" type="outline"
@@ -156,8 +166,8 @@
156166
</span>
157167
</davinci-callout>
158168
</stacked-pane>
159-
<crown-edpws-binding property="value" name="CSK_FileManager/OnUserLevelServiceActive" update-on-resume
160-
converter="function(value) {return value.toString();}">
169+
<crown-edpws-binding property="value" name="CSK_FileManager/OnUserLevelServiceActive"
170+
update-on-resume converter="function(value) {return value.toString();}">
161171
</crown-edpws-binding>
162172
</stacked-view>
163173
</stacked-pane>

‎CSK_Module_FileManager/pages/src/converter.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ export function convertToList(value) {
55
export function changeStyle(theme) {
66
const style: HTMLStyleElement = document.createElement('style');
77
style.id ='blub'
8+
9+
const toggleSW = document.querySelectorAll("davinci-toggle-switch")
10+
toggleSW.forEach((userItem) => {
11+
const shadowToggle = userItem.shadowRoot
12+
const finalToggleSW = shadowToggle?.querySelector('div')
13+
finalToggleSW?.classList.add('hasIcon')
14+
});
15+
816
if (theme == 'CSK_Style'){
917
var headerToolbar = `.sopasjs-ui-header-toolbar-wrapper { background-color: #FFFFFF; }`
1018
var uiHeader = `.sopasjs-ui-header>.app-logo { margin-right:0px; }`

‎CSK_Module_FileManager/pages/src/index.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ document.addEventListener('sopasjs-ready', () => {
1212
page_Setup.remove();
1313

1414
setTimeout(() => {
15+
const element = document.querySelector("div.sjs-wrapper > div > div.sjs-fullscreen-toggle")
16+
if(element) {
17+
element.parentElement.removeChild(element)
18+
}
1519
document.title = 'CSK_Module_FileManager'
1620
}, 500);
1721
})

‎CSK_Module_FileManager/project.mf.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Please check the UI of this module. +</desc>
135135
</serves>
136136
</crown>
137137
<meta key="author">SICK AG</meta>
138-
<meta key="version">1.1.0</meta>
138+
<meta key="version">1.1.1</meta>
139139
<meta key="priority">low</meta>
140140
<meta key="copy-protected">false</meta>
141141
<meta key="read-protected">false</meta>

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Tested on
1515

1616
|Device|Firmware version|Module version|
1717
|--|--|--|
18+
|SIM300|V1.1.0|V1.1.1|
1819
|TDC-E|v2.0.0|v1.1.0|
1920
|SICK AppEngine|V1.7.0|V1.1.0|
2021
|SIM1012|V2.4.2|V1.1.0|

‎docu/CSK_Module_FileManager.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta name="generator" content="Asciidoctor 2.0.12">
88
<meta name="author" content="SICK AG">
9-
<title>Documentation - CSK_Module_FileManager 1.1.0</title>
9+
<title>Documentation - CSK_Module_FileManager 1.1.1</title>
1010
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
1111
<style>
1212
/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -615,10 +615,10 @@
615615
</head>
616616
<body class="article toc2 toc-left">
617617
<div id="header">
618-
<h1>Documentation - CSK_Module_FileManager 1.1.0</h1>
618+
<h1>Documentation - CSK_Module_FileManager 1.1.1</h1>
619619
<div class="details">
620620
<span id="author" class="author">SICK AG</span><br>
621-
<span id="revnumber">version 1.1.0,</span>
621+
<span id="revnumber">version 1.1.1,</span>
622622
<span id="revdate">2024-11-12</span>
623623
</div>
624624
<div id="toc" class="toc2">
@@ -699,7 +699,7 @@ <h2 id="_document_metadata">Document metadata</h2>
699699
</tr>
700700
<tr>
701701
<th class="tableblock halign-left valign-top"><p class="tableblock">Version</p></th>
702-
<td class="tableblock halign-left valign-top"><p class="tableblock">1.1.0</p></td>
702+
<td class="tableblock halign-left valign-top"><p class="tableblock">1.1.1</p></td>
703703
</tr>
704704
<tr>
705705
<th class="tableblock halign-left valign-top"><p class="tableblock">Date</p></th>
@@ -2227,7 +2227,7 @@ <h4 id="_short_description_34">Short description</h4>
22272227
</div>
22282228
<div id="footer">
22292229
<div id="footer-text">
2230-
Version 1.1.0<br>
2230+
Version 1.1.1<br>
22312231
Last updated 2024-11-12 12:17:59 +0100
22322232
</div>
22332233
</div>

0 commit comments

Comments
 (0)