Skip to content

Commit

Permalink
Merge branch 'Changes-web-new' of https://github.com/SergioCasCeb/pla…
Browse files Browse the repository at this point in the history
…yground into Changes-web-new
  • Loading branch information
SergioCasCeb committed Oct 13, 2023
2 parents f6a6c1c + db553e9 commit 2783c6f
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 53 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/assertionscsv-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
- name: Add generated files and commit
if: ${{ ! steps.diff.outputs.changed }}
run: |
git config user.name 'Fady Salama'
git config user.email 'fadytawfik11@gmail.com'
git config user.name 'Ege Korkan'
git config user.email 'egekorkan@gmail.com'
git add -u
git commit -a -m "chore: sync assertions.csv with the current assertions in the spec and generate manual.csv"
git commit -a -s -m "chore: sync assertions.csv with the current assertions in the spec and generate manual.csv"
- name: Create Pull Request
if: ${{ ! steps.diff.outputs.changed }}
Expand Down
2 changes: 1 addition & 1 deletion packages/assertions/assertions-csv/assertions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -449,4 +449,4 @@
"tm-tmRef2","null","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition."
"tm-versioning-1","null","When the Thing Model definitions change over time, this SHOULD be reflected in the version container."
"tm-versioning-2","null","Due to the definition of Thing Model the term instance MUST be omitted within the version container."
"well-known-operation-types-only","null","operations types SHOULD NOT be arbitrarily set by servients and be restricted to the values in the table below."
"well-known-operation-types-only","null","operations types MUST be restricted to the values in the table below."
75 changes: 39 additions & 36 deletions packages/assertions/assertions-csv/changelog.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,48 @@
# CSV Changelog - 27/05/2023

# CSV Changelog - 08/10/2023

[Old CSV Path](assertions-csv/oldManual.csv)
[New CSV Path](assertions-csv/manual.csv)


## REMOVED

- `privacy-immutable-id-as-property` was removed
- `security-context-secure-fetch` was removed
- `privacy-immutable-id-as-property` was removed
- `security-context-secure-fetch` was removed


## LINE-CHANGE

- `privacy-mutable-identifiers` was moved from Line 51 to 50
- `privacy-temp-id-metadata` was moved from Line 52 to 51
- `sec-body-name-json-pointer-type` was moved from Line 53 to 52
- `sec-inj-no-intl-markup` was moved from Line 54 to 53
- `security-jsonld-expansion` was moved from Line 56 to 54
- `security-mutual-auth-td` was moved from Line 57 to 55
- `security-no-execution` was moved from Line 58 to 56
- `security-oauth-limits` was moved from Line 59 to 57
- `security-remote-context` was moved from Line 60 to 58
- `security-server-auth-td` was moved from Line 61 to 59
- `security-static-context` was moved from Line 62 to 60
- `td-context-ns-td10-namespacev10` was moved from Line 63 to 61
- `td-default-AdditionalResponseContentType` was moved from Line 64 to 62
- `td-default-observable` was moved from Line 65 to 63
- `td-processor-bidi-isolation` was moved from Line 66 to 64
- `td-producer-mixed-direction` was moved from Line 67 to 65
- `td-security-extension` was moved from Line 68 to 66
- `td-text-direction-first-strong` was moved from Line 69 to 67
- `td-text-direction-language-tag` was moved from Line 70 to 68
- `thing-model-td-generation-processor-extends` was moved from Line 71 to 69
- `thing-model-td-generation-processor-forms` was moved from Line 72 to 70
- `thing-model-td-generation-processor-placeholder` was moved from Line 73 to 71
- `thing-model-td-generation-processor-required` was moved from Line 74 to 72
- `tm-derivation-validity` was moved from Line 75 to 73
- `tm-overwrite-interaction` was moved from Line 76 to 74
- `tm-overwrite-types` was moved from Line 77 to 75
- `tm-placeholder-replacement` was moved from Line 78 to 76
- `tm-ref-recursive-extensions` was moved from Line 79 to 77
- `tm-tmRef-overwrite-possibility` was moved from Line 80 to 78
- `tm-tmRef-overwrite-process` was moved from Line 81 to 79
- `tm-tmRef-overwrite-semantic-meaning` was moved from Line 82 to 80
- `tm-tmRef2` was moved from Line 83 to 81
- `tm-versioning-1` was moved from Line 84 to 82
- `privacy-mutable-identifiers` was moved from Line 51 to 50
- `privacy-temp-id-metadata` was moved from Line 52 to 51
- `sec-body-name-json-pointer-type` was moved from Line 53 to 52
- `sec-inj-no-intl-markup` was moved from Line 54 to 53
- `security-jsonld-expansion` was moved from Line 56 to 54
- `security-mutual-auth-td` was moved from Line 57 to 55
- `security-no-execution` was moved from Line 58 to 56
- `security-oauth-limits` was moved from Line 59 to 57
- `security-remote-context` was moved from Line 60 to 58
- `security-server-auth-td` was moved from Line 61 to 59
- `security-static-context` was moved from Line 62 to 60
- `td-context-ns-td10-namespacev10` was moved from Line 63 to 61
- `td-default-AdditionalResponseContentType` was moved from Line 64 to 62
- `td-default-observable` was moved from Line 65 to 63
- `td-processor-bidi-isolation` was moved from Line 66 to 64
- `td-producer-mixed-direction` was moved from Line 67 to 65
- `td-security-extension` was moved from Line 68 to 66
- `td-text-direction-first-strong` was moved from Line 69 to 67
- `td-text-direction-language-tag` was moved from Line 70 to 68
- `thing-model-td-generation-processor-extends` was moved from Line 71 to 69
- `thing-model-td-generation-processor-forms` was moved from Line 72 to 70
- `thing-model-td-generation-processor-placeholder` was moved from Line 73 to 71
- `thing-model-td-generation-processor-required` was moved from Line 74 to 72
- `tm-derivation-validity` was moved from Line 75 to 73
- `tm-overwrite-interaction` was moved from Line 76 to 74
- `tm-overwrite-types` was moved from Line 77 to 75
- `tm-placeholder-replacement` was moved from Line 78 to 76
- `tm-ref-recursive-extensions` was moved from Line 79 to 77
- `tm-tmRef-overwrite-possibility` was moved from Line 80 to 78
- `tm-tmRef-overwrite-process` was moved from Line 81 to 79
- `tm-tmRef-overwrite-semantic-meaning` was moved from Line 82 to 80
- `tm-tmRef2` was moved from Line 83 to 81
- `tm-versioning-1` was moved from Line 84 to 82
9 changes: 1 addition & 8 deletions packages/assertions/assertions-csv/report.json
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
{
"generationDate": "Sat, 27 May 2023 01:02:28 GMT",
"assertionsSize": 451,
"implementedSize": 372,
"manualSize": 82,
"oldSize": 3,
"needsReviewSize": 0
}
{"generationDate":"Sun, 08 Oct 2023 06:53:07 GMT","assertionsSize":451,"implementedSize":372,"manualSize":82,"oldSize":3,"needsReviewSize":0}
6 changes: 3 additions & 3 deletions packages/web-new/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/web-new/src/scripts/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export function generateAAS(fileType, editorInstance){
? editorInstance.getValue()
: convertTDYamlToJson(editorInstance.getValue())

const AASInstance = assetInterfaceDescriptionUtil.transformTD2SM(tdToConvert, ["http", "coap"])
const AASInstance = assetInterfaceDescriptionUtil.transformTD2SM(tdToConvert)
try {
const content = fileType === "json"
? JSON.stringify(JSON.parse(AASInstance), undefined, 4)
Expand Down Expand Up @@ -575,4 +575,4 @@ export function findMonacoLocationOfJSONText(jsonPath, text, textModel) {
}

return monacoLocation
}
}

0 comments on commit 2783c6f

Please sign in to comment.