Skip to content

Commit 62889d3

Browse files
authored
Merge pull request #80 from alexanderoster/develop
Merged Develop upstream
2 parents bc4c9d4 + c18d06c commit 62889d3

145 files changed

Lines changed: 10682 additions & 2215 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/deploy.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Deploy static site to GitHub Pages
2+
3+
on:
4+
push:
5+
branches: [ "develop" ] # or "main" – pick your branch
6+
paths:
7+
- "Documentation/Website/**"
8+
- ".github/workflows/deploy.yml"
9+
workflow_dispatch:
10+
11+
permissions:
12+
contents: read
13+
pages: write
14+
id-token: write
15+
16+
concurrency:
17+
group: "pages"
18+
cancel-in-progress: true
19+
20+
jobs:
21+
deploy:
22+
environment:
23+
name: github-pages
24+
url: ${{ steps.deployment.outputs.page_url }}
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v4
28+
29+
# Upload your static site folder directly
30+
- uses: actions/upload-pages-artifact@v3
31+
with:
32+
path: Documentation/Website
33+
34+
# Publish to Pages
35+
- id: deployment
36+
uses: actions/deploy-pages@v4

ACT/LibMC.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,10 @@
701701
<error name="INVALIDFRONTENDMODULEPATH" code="676" description="Invalid frontend module path." />
702702
<error name="INVALIDFRONTENDATTRIBUTENAME" code="677" description="Invalid frontend attribute name." />
703703
<error name="DUPLICATEFRONTENDATTRIBUTENAME" code="678" description="Duplicate frontend attribute name." />
704+
<error name="INVALIDCOLUMNRANGE" code="679" description="Invalid column range." />
705+
<error name="INVALIDROWRANGE" code="680" description="Invalid row range." />
706+
<error name="CONFIGURATIONLISTNAMEMISSING" code="681" description="Configuration list name missing" />
707+
<error name="CONFIGURATIONLISTBUTTONNAMEMISSING" code="682" description="Configuration list button name missing" />
704708

705709
</errors>
706710

ACT/LibMCData.xml

Lines changed: 162 additions & 93 deletions
Large diffs are not rendered by default.

ACT/LibMCEnv.xml

Lines changed: 224 additions & 73 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
de4928052636939a11b8e223e2f440da41fb23e6
1+
864af701b933b1d4bae3e21bac376e640f076aa3
1.27 KB
Binary file not shown.
4.67 KB
Binary file not shown.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Maintainers are responsible for responding to pull requests and issues, as well
3030

3131
We currently have three maintainers:
3232
- Alexander Oster alexander.oster@autodesk.com
33-
- Martin Wassmann martin.wassmann@autodesk.com
33+
- Martin Wassmann martin.weismann@autodesk.com
3434
- Philipp Neumann philipp.neumann@autodesk.com
3535

3636
If you've established yourself as an impactful contributor to the project, and are willing take on the extra work, we'd love to have your help maintaining it! Email the current maintainers for details.

Client/src/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
352352
353353
uiOnTimer() {
354354
if (this.Application) {
355+
this.Application.updateModules ();
355356
this.Application.updateContentItems ();
356357
}
357358
},

Client/src/common/AMCApplication.js

Lines changed: 73 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,9 +477,75 @@ export default class AMCApplication extends Common.AMCObject {
477477

478478
}
479479

480+
}
481+
482+
updateModule(module) {
483+
484+
// Early return if module is invalid
485+
if (!module)
486+
return;
487+
488+
// Reset refresh flag before attempting update
489+
module.refresh = false;
490+
491+
if (module.isActive()) {
492+
493+
// Prepare authorization headers (same policy as for content items)
494+
let headers = {};
495+
let authToken = this.API.authToken;
496+
497+
if (authToken != Common.nullToken())
498+
headers.Authorization = "Bearer " + authToken;
499+
500+
// Optional state segment
501+
let stateidstring = "";
502+
if (module.stateid > 0)
503+
stateidstring = "/" + module.stateid;
504+
505+
// Build request URL for modules
506+
let url = this.API.baseURL + "/ui/module/" + Assert.UUIDValue(module.uuid) + stateidstring;
507+
508+
Axios({
509+
method: "GET",
510+
"headers": headers,
511+
url: url
512+
})
513+
.then(resultJSON => {
514+
515+
// Update module from server payload (if present)
516+
if (resultJSON.data) {
517+
if (resultJSON.data.content) {
518+
if (module && typeof module.updateFromJSON === "function") {
519+
module.updateFromJSON(resultJSON.data.content);
520+
}
521+
}
522+
}
523+
524+
// Reset failure counter on success
525+
this.unsuccessfulUpdateCounter = 0;
526+
})
527+
.catch(err => {
528+
529+
// Increment failure counter and react accordingly
530+
this.unsuccessfulUpdateCounter = this.unsuccessfulUpdateCounter + 1;
531+
if (this.unsuccessfulUpdateCounter > 5) {
532+
this.setStatusToError(err.message);
533+
}
534+
});
535+
}
480536
}
481-
482-
537+
538+
updateModules() {
539+
540+
let uuid, module;
541+
if (this.AppContent.ModuleMap) {
542+
for ([uuid, module] of this.AppContent.ModuleMap) {
543+
uuid;
544+
this.updateModule(module);
545+
}
546+
}
547+
}
548+
483549
onJobUploadChunkSuccess (application, uploadObject, chunkData, uploadOffset) {
484550

485551
Assert.ObjectInstance (application, "amcApplication");
@@ -745,6 +811,11 @@ export default class AMCApplication extends Common.AMCObject {
745811
let pageString = String(page);
746812
this.AppState.activePage = pageString;
747813

814+
let pageObject = this.AppContent.PageMap.get(pageString);
815+
if(pageObject) {
816+
pageObject.setActive();
817+
}
818+
748819
if (this.AppState.appResizeEvent)
749820
this.AppState.appResizeEvent ();
750821

0 commit comments

Comments
 (0)