Issue357 annotations mbl #358

AntoineGautier · 2023-09-13T11:56:51Z

Description

This includes necessary refactoring related to annotations newly added to MBL via lbl-srg/modelica-buildings#3515.
No functional changes.

MODELICA_BUILDINGS_COMMIT now points to the latest commit of MBL master (6036d14).

Related Issue(s)

This closes #357 and #365.

Testing

This has been tested locally

with npm run test:ci where only 1 test fails:

console.log
     self.fp = io.open(file, filemode)
 FileNotFoundError: [Errno 2] No such file or directory: '/tmp/test-linkage-widget/sequence-doc.docx'
   at Socket.<anonymous> (src/sequence/index.ts:40:55)
 FAIL  tests/unit/sequence/index.test.ts (8.739 s)
 Control Sequence Document
 ✕ convertToDOCX executes without error (6030 ms)

Maybe due to a missing local dependency? Let's see what remote CI testing returns.

by running the client app and verifying that the configuration options are as expected.

[EDIT on 10/6]

There is an issue with the documentation export. The whole section about OA & RA damper control is missing. This needs to be understood and fixed before merging this PR.
- Ongoing investigation: It turns out that the problem already exists with MBL commit 3185e8f328. See Incompatibility with MBL master #365.
- This is solved via 2ac78ce.

Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.8. - [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md) - [Commits](minimistjs/minimist@v1.2.5...v1.2.8) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…inimist-1.2.8 Bump minimist from 1.2.5 to 1.2.8 in /client

Bumps [qs](https://github.com/ljharb/qs) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `qs` from 6.9.6 to 6.11.0 - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](ljharb/qs@v6.9.6...v6.11.0) Updates `express` from 4.17.2 to 4.18.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.17.2...4.18.2) --- updated-dependencies: - dependency-name: qs dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…s-and-express-6.11.0 Bump qs and express in /client

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](webpack/loader-utils@v1.4.0...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…oader-utils-1.4.2 Bump loader-utils from 1.4.0 to 1.4.2 in /client

Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.9. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](mde/ejs@v3.1.6...v3.1.9) --- updated-dependencies: - dependency-name: ejs dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…js-3.1.9 Bump ejs from 3.1.6 to 3.1.9 in /client

Bumps [qs](https://github.com/ljharb/qs) to 6.11.0 and updates ancestor dependencies [qs](https://github.com/ljharb/qs), [express](https://github.com/expressjs/express) and [formidable](https://github.com/node-formidable/formidable). These dependencies need to be updated together. Updates `qs` from 6.9.3 to 6.11.0 - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](ljharb/qs@v6.9.3...v6.11.0) Updates `express` from 4.17.2 to 4.18.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.17.2...4.18.2) Updates `formidable` from 2.0.1 to 2.1.2 - [Release notes](https://github.com/node-formidable/formidable/releases) - [Changelog](https://github.com/node-formidable/formidable/blob/master/CHANGELOG.md) - [Commits](https://github.com/node-formidable/formidable/commits) --- updated-dependencies: - dependency-name: qs dependency-type: indirect - dependency-name: express dependency-type: direct:production - dependency-name: formidable dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…s-and-express-and-formidable-6.11.0 Bump qs, express and formidable in /server

Bumps [minimatch](https://github.com/isaacs/minimatch) and [recursive-readdir](https://github.com/jergason/recursive-readdir). These dependencies needed to be updated together. Updates `minimatch` from 3.0.4 to 3.1.2 - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) Updates `recursive-readdir` from 2.2.2 to 2.2.3 - [Changelog](https://github.com/jergason/recursive-readdir/blob/master/CHANGELOG.md) - [Commits](https://github.com/jergason/recursive-readdir/commits/v2.2.3) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: recursive-readdir dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…inimatch-and-recursive-readdir-3.1.2 Bump minimatch and recursive-readdir in /client

Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…inimatch-3.1.2 Bump minimatch from 3.0.4 to 3.1.2 in /server

Bumps [marked](https://github.com/markedjs/marked) from 3.0.8 to 4.0.10. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](markedjs/marked@v3.0.8...v4.0.10) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>

…arked-4.0.10 Bump marked from 3.0.8 to 4.0.10 in /server

Bumps [webpack](https://github.com/webpack/webpack) from 5.65.0 to 5.88.2. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.65.0...v5.88.2) --- updated-dependencies: - dependency-name: webpack dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…ebpack-5.88.2 Bump webpack from 5.65.0 to 5.88.2 in /client

Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…son5-1.0.2 Bump json5 from 1.0.1 to 1.0.2 in /client

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](SamVerschueren/decode-uri-component@v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…ecode-uri-component-0.2.2 Bump decode-uri-component from 0.2.0 to 0.2.2 in /client

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](caolan/async@v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…sync-2.6.4 Bump async from 2.6.3 to 2.6.4 in /client

Bumps [node-forge](https://github.com/digitalbazaar/forge) and [webpack-dev-server](https://github.com/webpack/webpack-dev-server). These dependencies needed to be updated together. Updates `node-forge` from 0.10.0 to 1.3.1 - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@0.10.0...v1.3.1) Updates `webpack-dev-server` from 4.7.0 to 4.15.1 - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](webpack/webpack-dev-server@v4.7.0...v4.15.1) --- updated-dependencies: - dependency-name: node-forge dependency-type: indirect - dependency-name: webpack-dev-server dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…ode-forge-and-webpack-dev-server-1.3.1 Bump node-forge and webpack-dev-server in /client

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…ord-wrap-1.2.5 Bump word-wrap from 1.2.3 to 1.2.5 in /client

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…ord-wrap-1.2.5 Bump word-wrap from 1.2.3 to 1.2.5 in /server

Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…h-cookie-4.1.3 Bump tough-cookie from 4.1.2 to 4.1.3 in /cdk

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…-wrap-1.2.5 Bump word-wrap from 1.2.3 to 1.2.5 in /cdk

Bumps [json5](https://github.com/json5/json5) from 2.2.0 to 2.2.3. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v2.2.0...v2.2.3) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…son5-2.2.3 Bump json5 from 2.2.0 to 2.2.3 in /server

Bumps [webpack](https://github.com/webpack/webpack) from 5.75.0 to 5.76.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.75.0...v5.76.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]>

…ebpack-5.76.0 Bump webpack from 5.75.0 to 5.76.0 in /server

Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.3.6. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/commits) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…anoid-3.3.6 Bump nanoid from 3.1.30 to 3.3.6 in /client

Bumps [aws-cdk-lib](https://github.com/aws/aws-cdk/tree/HEAD/packages/aws-cdk-lib) from 2.50.0 to 2.80.0. - [Release notes](https://github.com/aws/aws-cdk/releases) - [Changelog](https://github.com/aws/aws-cdk/blob/main/CHANGELOG.v2.md) - [Commits](https://github.com/aws/aws-cdk/commits/v2.80.0/packages/aws-cdk-lib) --- updated-dependencies: - dependency-name: aws-cdk-lib dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>

…cdk-lib-2.80.0 Bump aws-cdk-lib from 2.50.0 to 2.80.0 in /cdk

Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v2.2.1...v2.2.3) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…5-2.2.3 Bump json5 from 2.2.1 to 2.2.3 in /cdk

Replace Linkage with ctrl-flow

AntoineGautier · 2023-09-28T14:56:54Z

@JayHuLBL This PR goes along with lbl-srg/modelica-buildings#3515 that has already been merged. Will you have a chance to review soon?

JayHuLBL · 2023-10-05T23:00:56Z

@AntoineGautier I was able to export the document. However, I'd firstly need to run npm run docker:build from the server package and then from client folder run npm i and npm start.

JayHuLBL

@AntoineGautier It's ready to merge.

After merging this PR, we can then check if the changes are shown in staging site. If everything looks good, I will then merge the PR #368 so the changes will be deployed to production site.

dependabot bot and others added 30 commits July 27, 2023 21:18

Merge pull request #331 from lbl-srg/dependabot/npm_and_yarn/client/m…

81e1a0a

…inimist-1.2.8 Bump minimist from 1.2.5 to 1.2.8 in /client

Merge pull request #332 from lbl-srg/dependabot/npm_and_yarn/client/q…

c5fd675

…s-and-express-6.11.0 Bump qs and express in /client

Merge pull request #333 from lbl-srg/dependabot/npm_and_yarn/client/l…

ebbe63c

…oader-utils-1.4.2 Bump loader-utils from 1.4.0 to 1.4.2 in /client

Merge pull request #334 from lbl-srg/dependabot/npm_and_yarn/client/e…

df5e1b6

…js-3.1.9 Bump ejs from 3.1.6 to 3.1.9 in /client

Merge pull request #335 from lbl-srg/dependabot/npm_and_yarn/server/q…

c64e58b

…s-and-express-and-formidable-6.11.0 Bump qs, express and formidable in /server

Merge pull request #336 from lbl-srg/dependabot/npm_and_yarn/client/m…

79b93e5

…inimatch-and-recursive-readdir-3.1.2 Bump minimatch and recursive-readdir in /client

Merge pull request #337 from lbl-srg/dependabot/npm_and_yarn/server/m…

f2f27b9

…inimatch-3.1.2 Bump minimatch from 3.0.4 to 3.1.2 in /server

Merge pull request #338 from lbl-srg/dependabot/npm_and_yarn/server/m…

1530411

…arked-4.0.10 Bump marked from 3.0.8 to 4.0.10 in /server

Merge pull request #339 from lbl-srg/dependabot/npm_and_yarn/client/w…

3f7ce1a

…ebpack-5.88.2 Bump webpack from 5.65.0 to 5.88.2 in /client

Merge pull request #340 from lbl-srg/dependabot/npm_and_yarn/client/j…

cb6b416

…son5-1.0.2 Bump json5 from 1.0.1 to 1.0.2 in /client

Merge pull request #341 from lbl-srg/dependabot/npm_and_yarn/client/d…

9a516a8

…ecode-uri-component-0.2.2 Bump decode-uri-component from 0.2.0 to 0.2.2 in /client

Merge pull request #342 from lbl-srg/dependabot/npm_and_yarn/client/a…

90ad1fd

…sync-2.6.4 Bump async from 2.6.3 to 2.6.4 in /client

Merge pull request #343 from lbl-srg/dependabot/npm_and_yarn/client/n…

ce60c7e

…ode-forge-and-webpack-dev-server-1.3.1 Bump node-forge and webpack-dev-server in /client

Merge pull request #344 from lbl-srg/dependabot/npm_and_yarn/client/w…

76cece6

…ord-wrap-1.2.5 Bump word-wrap from 1.2.3 to 1.2.5 in /client

Merge pull request #345 from lbl-srg/dependabot/npm_and_yarn/server/w…

070fb43

…ord-wrap-1.2.5 Bump word-wrap from 1.2.3 to 1.2.5 in /server

dependabot bot and others added 20 commits July 28, 2023 16:34

Merge pull request #350 from lbl-srg/dependabot/npm_and_yarn/cdk/toug…

bc80d34

…h-cookie-4.1.3 Bump tough-cookie from 4.1.2 to 4.1.3 in /cdk

Merge pull request #351 from lbl-srg/dependabot/npm_and_yarn/cdk/word…

5cbe357

…-wrap-1.2.5 Bump word-wrap from 1.2.3 to 1.2.5 in /cdk

Merge pull request #352 from lbl-srg/dependabot/npm_and_yarn/server/j…

914f62d

…son5-2.2.3 Bump json5 from 2.2.0 to 2.2.3 in /server

Merge pull request #353 from lbl-srg/dependabot/npm_and_yarn/server/w…

7a613b9

…ebpack-5.76.0 Bump webpack from 5.75.0 to 5.76.0 in /server

Merge pull request #354 from lbl-srg/dependabot/npm_and_yarn/client/n…

02c57fe

…anoid-3.3.6 Bump nanoid from 3.1.30 to 3.3.6 in /client

Merge pull request #355 from lbl-srg/dependabot/npm_and_yarn/cdk/aws-…

46de84e

…cdk-lib-2.80.0 Bump aws-cdk-lib from 2.50.0 to 2.80.0 in /cdk

Merge pull request #356 from lbl-srg/dependabot/npm_and_yarn/cdk/json…

e2bb34c

…5-2.2.3 Bump json5 from 2.2.1 to 2.2.3 in /cdk

Modify MBL annotation & commit #, remove patching

e97d7fc

Update docs and comments

863d716

Replace Linkage with ctrl-flow

Bump maven version

8a1b8a6

Fix cd

c53781e

Update MBL commit #

7872fec

Copy templates.json to client dir

669ffd1

AntoineGautier requested a review from JayHuLBL September 13, 2023 11:56

AntoineGautier marked this pull request as draft October 6, 2023 14:19

AntoineGautier mentioned this pull request Oct 13, 2023

Incompatibility with MBL master #365

Closed

AntoineGautier added 2 commits October 18, 2023 14:21

Update MBL commit # to latest

eefc182

Update mappings (see #365)

2ac78ce

AntoineGautier marked this pull request as ready for review October 19, 2023 15:56

JayHuLBL approved these changes Oct 19, 2023

View reviewed changes

AntoineGautier merged commit c5f974b into staging Oct 20, 2023
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue357 annotations mbl #358

Issue357 annotations mbl #358

AntoineGautier commented Sep 13, 2023 •

edited

Loading

AntoineGautier commented Sep 28, 2023

JayHuLBL commented Oct 5, 2023

JayHuLBL left a comment •

edited

Loading

Issue357 annotations mbl #358

Issue357 annotations mbl #358

Conversation

AntoineGautier commented Sep 13, 2023 • edited Loading

Description

Related Issue(s)

Testing

AntoineGautier commented Sep 28, 2023

JayHuLBL commented Oct 5, 2023

JayHuLBL left a comment • edited Loading

Choose a reason for hiding this comment

AntoineGautier commented Sep 13, 2023 •

edited

Loading

JayHuLBL left a comment •

edited

Loading