Skip to content

Commit

Permalink
Nightly Merge Fri 31 Jan 2025 10:15:33 GMT
Browse files Browse the repository at this point in the history
  • Loading branch information
toxophilist committed Jan 31, 2025
2 parents a0b4b2c + 1225872 commit 184f8e8
Show file tree
Hide file tree
Showing 32 changed files with 424 additions and 188 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ Detailed OKIT Installation steps can be found in the [OCI Designer Toolkit Insta
3. [Oracle Linux](documentation/Installation.md#oracle-linux-ol8)
### OKIT-Ocd
OKIT-Ocd is the next iteration of OKIT and is currently available as a Beta release. The native installables can be found in the Assets section
on the [0.66.1 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.66.1).
on the [0.67.0 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.67.0).
1. MacOS
1. [Arm dmg](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.66.1/ocd-0.2.6-arm64.dmg)
2. [x64 dmg](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.66.1/ocd-0.2.6-x64.dmg)
1. [Arm dmg](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.67.0/ocd-0.2.7-arm64.dmg)
2. [x64 dmg](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.67.0/ocd-0.2.7-x64.dmg)
2. Windows
1. [Setup](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.66.1/ocd-0.2.6-Setup.exe)
1. [Setup](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.67.0/ocd-0.2.7-Setup.exe)
3. Linux
1. [rpm](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.66.1/ocd-0.2.6-1.x86_64.rpm)
2. [deb](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.66.1/ocd_0.2.6_amd64.deb)
1. [rpm](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.67.0/ocd-0.2.7-1.x86_64.rpm)
2. [deb](https://github.com/oracle/oci-designer-toolkit/releases/download/v0.67.0/ocd_0.2.7_amd64.deb)



Expand Down
File renamed without changes.
91 changes: 46 additions & 45 deletions ocd/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 ocd/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ocd",
"version": "0.2.6",
"version": "0.2.7",
"description": "OKIT Open Cloud Designer Desktop",
"title": "OKIT Open Cloud Designer (Beta)",
"author": {
Expand Down Expand Up @@ -35,7 +35,7 @@
"fresh-install": "npm run install-and-codegen",
"reinstall": "npm run purge && npm run install-and-codegen",
"clean": "npm run clean --workspaces --if-present && rm -rf lib dist build",
"purge": "npm run purge --workspaces --if-present && rm -rf node_modules",
"purge": "npm run purge --workspaces --if-present && rm -rf node_modules lib dist build",
"build": "npm run build --workspaces --if-present",
"rebuild": "npm run clean && npm run build",
"compile": "npm run compile --workspaces --if-present",
Expand Down
14 changes: 7 additions & 7 deletions ocd/packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ocd/cli",
"version": "0.2.6",
"version": "0.2.7",
"description": "OKIT Open Cloud Designer Command-line",
"title": "OKIT Open Cloud Designer Command-linetop",
"author": {
Expand Down Expand Up @@ -34,12 +34,12 @@
"test-query": "node lib/esm/ocd.js query oci -d ../../test/query.okit -p DEFAULT -c OKIT -c infrastructure -c network"
},
"dependencies": {
"@ocd/codegen": ">=0.2.6",
"@ocd/core": ">=0.2.6",
"@ocd/export": ">=0.2.6",
"@ocd/import": ">=0.2.6",
"@ocd/model": ">=0.2.6",
"@ocd/query": ">=0.2.6",
"@ocd/codegen": ">=0.2.7",
"@ocd/core": ">=0.2.7",
"@ocd/export": ">=0.2.7",
"@ocd/import": ">=0.2.7",
"@ocd/model": ">=0.2.7",
"@ocd/query": ">=0.2.7",
"oci-sdk": "^2.69.0"
}
}
4 changes: 2 additions & 2 deletions ocd/packages/codegen-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ocd/codegen-cli",
"version": "0.2.6",
"version": "0.2.7",
"description": "OKIT Open Cloud DesignerCodegen Command-line",
"title": "OKIT Open Cloud Designer Codegen Command-linetop",
"author": {
Expand Down Expand Up @@ -83,6 +83,6 @@
"import-and-generate": "npm run import-and-generate-oci && npm run import-and-generate-azurerm && npm run import-and-generate-google"
},
"dependencies": {
"@ocd/codegen": ">=0.2.6"
"@ocd/codegen": ">=0.2.7"
}
}
4 changes: 2 additions & 2 deletions ocd/packages/codegen/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ocd/codegen",
"version": "0.2.6",
"version": "0.2.7",
"description": "OKIT Open Cloud Designer Code Generation Module",
"title": "OKIT Open Cloud Designer Code Generation Module",
"author": {
Expand Down Expand Up @@ -42,7 +42,7 @@
"build": "npm run compile && npm run pack"
},
"dependencies": {
"@ocd/core": ">=0.2.6",
"@ocd/core": ">=0.2.7",
"fs": "^0.0.1-security",
"path": "^0.12.7"
}
Expand Down
2 changes: 1 addition & 1 deletion ocd/packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ocd/core",
"version": "0.2.6",
"version": "0.2.7",
"description": "OKIT Open Cloud Designer Core Utility Module",
"title": "OKIT Open Cloud Designer Core Utility Module",
"author": {
Expand Down
14 changes: 7 additions & 7 deletions ocd/packages/desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ocd",
"productName": "ocd",
"version": "0.2.6",
"version": "0.2.7",
"description": "OKIT Open Cloud Designer Desktop",
"title": "OKIT Open Cloud Designer Desktop",
"author": {
Expand Down Expand Up @@ -59,12 +59,12 @@
"vite": "^6.0.3"
},
"dependencies": {
"@ocd/core": ">=0.2.6",
"@ocd/export": ">=0.2.6",
"@ocd/import": ">=0.2.6",
"@ocd/model": ">=0.2.6",
"@ocd/query": ">=0.2.6",
"@ocd/react": ">=0.2.6",
"@ocd/core": ">=0.2.7",
"@ocd/export": ">=0.2.7",
"@ocd/import": ">=0.2.7",
"@ocd/model": ">=0.2.7",
"@ocd/query": ">=0.2.7",
"@ocd/react": ">=0.2.7",
"electron-squirrel-startup": "^1.0.1",
"exceljs": "^4.4.0",
"oci-sdk": "^2.69.0"
Expand Down
4 changes: 0 additions & 4 deletions ocd/packages/desktop/src/css/ocd.css
Original file line number Diff line number Diff line change
Expand Up @@ -2324,10 +2324,6 @@ table {
text-decoration: none;
}

/* .ocd-compartment-picker li > ul {
padding-left: 1em;
} */

.ocd-compartment-picker li > label,
.ocd-compartment-picker li > span {
font-family: var(--dialog-input-font-family);
Expand Down
15 changes: 15 additions & 0 deletions ocd/packages/desktop/src/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,18 @@ details > summary.summary-background {
details[open] > summary.summary-background {
background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGVsbGlwc2UgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwIiBjeD0iNi4xMSIgY3k9IjMuNTUiIHJ4PSIyLjExIiByeT0iMi4xNSIvPjxlbGxpcHNlIGZpbGw9Im5vbmUiIHN0cm9rZT0iIzAwMCIgY3g9IjYuMTEiIGN5PSIxNS41NSIgcng9IjIuMTEiIHJ5PSIyLjE1Ii8+PGNpcmNsZSBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAiIGN4PSIxMy4xNSIgY3k9IjkuNTUiIHI9IjIuMTUiLz48cGF0aCBkPSJNMSAzaDN2MUgxek0xMCAzaDh2MWgtOHpNMSA5aDh2MUgxek0xNSA5aDN2MWgtM3pNMSAxNWgzdjFIMXpNMTAgMTVoOHYxaC04eiIvPjwvc3ZnPg==");
}

/*
** Third Party
*/
.excel {
background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMjg5Ljc1IDIxMzAiPjxwYXRoIGZpbGw9IiMxODVDMzciIGQ9Ik0xNDM3Ljc1IDEwMTEuNzVMNTMyLjUgODUydjExODAuMzkzYzAgNTMuOTA3IDQzLjcgOTcuNjA3IDk3LjYwNyA5Ny42MDdoMTU2Mi4wMzZjNTMuOTA3IDAgOTcuNjA3LTQzLjcgOTcuNjA3LTk3LjYwN1YxNTk3LjVsLTg1Mi01ODUuNzV6Ii8+PHBhdGggZmlsbD0iIzIxQTM2NiIgZD0iTTE0MzcuNzUgMEg2MzAuMTA3QzU3Ni4yIDAgNTMyLjUgNDMuNyA1MzIuNSA5Ny42MDdWNTMyLjVsOTA1LjI1IDUzMi41TDE5MTcgMTIyNC43NSAyMjg5Ljc1IDEwNjVWNTMyLjVMMTQzNy43NSAweiIvPjxwYXRoIGZpbGw9IiMxMDdDNDEiIGQ9Ik01MzIuNSA1MzIuNWg5MDUuMjVWMTA2NUg1MzIuNVY1MzIuNXoiLz48cGF0aCBvcGFjaXR5PSIuMSIgZD0iTTExODAuMzkzIDQyNkg1MzIuNXYxMzMxLjI1aDY0Ny44OTNjNTMuODM0LS4xNzUgOTcuNDMyLTQzLjc3MyA5Ny42MDctOTcuNjA3VjUyMy42MDdjLS4xNzUtNTMuODM0LTQzLjc3My05Ny40MzItOTcuNjA3LTk3LjYwN3oiLz48cGF0aCBvcGFjaXR5PSIuMiIgZD0iTTExMjcuMTQzIDQ3OS4yNUg1MzIuNVYxODEwLjVoNTk0LjY0M2M1My44MzQtLjE3NSA5Ny40MzItNDMuNzczIDk3LjYwNy05Ny42MDdWNTc2Ljg1N2MtLjE3NS01My44MzQtNDMuNzczLTk3LjQzMi05Ny42MDctOTcuNjA3eiIvPjxwYXRoIG9wYWNpdHk9Ii4yIiBkPSJNMTEyNy4xNDMgNDc5LjI1SDUzMi41VjE3MDRoNTk0LjY0M2M1My44MzQtLjE3NSA5Ny40MzItNDMuNzczIDk3LjYwNy05Ny42MDdWNTc2Ljg1N2MtLjE3NS01My44MzQtNDMuNzczLTk3LjQzMi05Ny42MDctOTcuNjA3eiIvPjxwYXRoIG9wYWNpdHk9Ii4yIiBkPSJNMTA3My44OTMgNDc5LjI1SDUzMi41VjE3MDRoNTQxLjM5M2M1My44MzQtLjE3NSA5Ny40MzItNDMuNzczIDk3LjYwNy05Ny42MDdWNTc2Ljg1N2MtLjE3NS01My44MzQtNDMuNzczLTk3LjQzMi05Ny42MDctOTcuNjA3eiIvPjxsaW5lYXJHcmFkaWVudCBpZD0icHJlZml4X19hIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjIwMy41MTMiIHkxPSIxNzI5LjAxOCIgeDI9Ijk2Ny45ODciIHkyPSI0MDQuOTgyIiBncmFkaWVudFRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDAgMjEzMikiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iIzE4ODg0ZiIvPjxzdG9wIG9mZnNldD0iLjUiIHN0b3AtY29sb3I9IiMxMTdlNDMiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiMwYjY2MzEiLz48L2xpbmVhckdyYWRpZW50PjxwYXRoIGZpbGw9InVybCgjcHJlZml4X19hKSIgZD0iTTk3LjYwNyA0NzkuMjVoOTc2LjI4NWM1My45MDcgMCA5Ny42MDcgNDMuNyA5Ny42MDcgOTcuNjA3djk3Ni4yODVjMCA1My45MDctNDMuNyA5Ny42MDctOTcuNjA3IDk3LjYwN0g5Ny42MDdDNDMuNyAxNjUwLjc1IDAgMTYwNy4wNSAwIDE1NTMuMTQzVjU3Ni44NTdjMC01My45MDcgNDMuNy05Ny42MDcgOTcuNjA3LTk3LjYwN3oiLz48cGF0aCBmaWxsPSIjRkZGIiBkPSJNMzAyLjMgMTM4Mi4yNjRsMjA1LjMzMi0zMTguMTY5TDMxOS41IDc0Ny42ODNoMTUxLjMzNmwxMDIuNjY2IDIwMi4zNWM5LjQ3OSAxOS4yMjMgMTUuOTc1IDMzLjQ5NCAxOS40OSA0Mi45MTloMS4zMzFhNzk4LjY2NyA3OTguNjY3IDAgMDEyMS4zLTQ0LjY3N0w3MjUuMzcxIDc0Ny43OUg4NjQuM2wtMTkyLjkyNSAzMTQuNTQ4TDg2OS4yIDEzODIuMjYzSDcyMS4zNzhMNjAyLjc5IDExNjAuMTU4YTE4Ni4yOTggMTg2LjI5OCAwIDAxLTE0LjE2NC0yOS42NmgtMS43NTdhMTQwLjQ1OCAxNDAuNDU4IDAgMDEtMTMuNzM5IDI4Ljc1NWwtMTIyLjEwMiAyMjMuMDExSDMwMi4zeiIvPjxwYXRoIGZpbGw9IiMzM0M0ODEiIGQ9Ik0yMTkyLjE0MyAwSDE0MzcuNzV2NTMyLjVoODUyVjk3LjYwN0MyMjg5Ljc1IDQzLjcgMjI0Ni4wNSAwIDIxOTIuMTQzIDB6Ii8+PHBhdGggZmlsbD0iIzEwN0M0MSIgZD0iTTE0MzcuNzUgMTA2NWg4NTJ2NTMyLjVoLTg1MlYxMDY1eiIvPjwvc3ZnPg==");
}

.opentofu {
background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PHBhdGggZmlsbD0iIzBkMWEyYSIgZD0iTTE3LjA2LjYxYTIuMjEgMi4yMSAwIDAwLTIuMTIgMEw0LjEgNi41N2wtLjAzLjAxLTEuNDIuNzlBMi4xOCAyLjE4IDAgMDAxLjUgOS4yOXYxMy40YzAgLjgxLjQ0IDEuNTUgMS4xNCAxLjk0bDEwLjk1IDYuMDIuMDUuMDIgMS4zLjcyYy42Ni4zNiAxLjQ2LjM2IDIuMTIgMGwxLjMxLS43Mi4wNC0uMDIgMTAuOTUtNi4wMmEyLjIgMi4yIDAgMDAxLjE0LTEuOTJWOS4yOWMwLS44LS40NC0xLjU0LTEuMTQtMS45MmwtMS40Mi0uNzgtLjAzLS4wMXptLjcgMTUuMzlsMTAuMTQtNS41OC4wMy0uMDEuMTMtLjA3YS41LjUgMCAwMS43NC40NHYxMC40NGEuNS41IDAgMDEtLjc0LjQ0bC0uMS0uMDUtLjA2LS4wM3ptLTEzLjctNS42bC4wMy4wMiAxMC4xNSA1LjU3TDQuMSAyMS41OGwtLjA2LjAzLS4xLjA1YS41LjUgMCAwMS0uNzQtLjQ0VjEwLjc4YS41LjUgMCAwMS43NC0uNDVsLjEzLjA3ek0yNy4xIDguMDZsLTkuNS01LjIzYS41LjUgMCAwMC0uNzYuNDN2MTEuMzFMMjcuMSA4Ljk0YS41LjUgMCAwMDAtLjg4em0tMjIuMi44N2wxMC4yNSA1LjYzVjMuMjZhLjUuNSAwIDAwLS43NS0uNDNMNC45IDguMDZhLjUuNSAwIDAwMCAuODd6bTAgMTUuMDFhLjUuNSAwIDAxLS4wMi0uODdsMTAuMjgtNS42NHYxMS4zYy0uMDEuMzgtLjQuNjEtLjc0LjQ1bC05LjUxLTUuMjN6bTExLjk0IDQuNzh2LTExLjNsMTAuMjggNS42NGEuNS41IDAgMDEtLjAzLjg4bC05LjUxIDUuMjNhLjUuNSAwIDAxLS43NC0uNDR6Ii8+PHBhdGggZmlsbD0iI2U2YzIyMCIgZD0iTTE1Ljc1IDIuMDhhLjUuNSAwIDAxLjUgMGwxMC44NCA1Ljk3Yy4zNS4xOS4zNS43IDAgLjg5TDE2LjI0IDE0LjlhLjUuNSAwIDAxLS40OSAwTDQuOTEgOC45NGEuNS41IDAgMDEwLS45eiIvPjxwYXRoIGZpbGw9IiNmZWRhMTUiIGQ9Ik0zLjE5IDEwLjc4YS41LjUgMCAwMS43NS0uNDVsMTAuOTUgNi4wMmMuMTYuMS4yNi4yNi4yNi40NHYxMS45M2EuNS41IDAgMDEtLjc1LjQ0TDMuNDYgMjMuMTVhLjUxLjUxIDAgMDEtLjI2LS40NFYxMC43OHoiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMjguMDYgMTAuMzNhLjUuNSAwIDAxLjc0LjQ1VjIyLjdhLjUuNSAwIDAxLS4yNi40NEwxNy42IDI5LjE2YS41LjUgMCAwMS0uNzUtLjQ0VjE2Ljc5YzAtLjE4LjEtLjM1LjI2LS40NHoiLz48cGF0aCBmaWxsPSIjMGQxYTJhIiBkPSJNNy43OSAyMC4xM3YuMDJMNS4yMiAxOC44di0uMDJjLjA2LS44LjY4LTEuMTUgMS4zOS0uNzdzMS4yNCAxLjMyIDEuMTggMi4xMnptNC4wNCAyLjMzdi4wMmwtMi41Ny0xLjM2di0uMDFjLjA2LS44LjY4LTEuMTUgMS4zOS0uNzdzMS4yNCAxLjMyIDEuMTggMi4xMnoiLz48L3N2Zz4=");
}

.markdown {
background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMDgiIGhlaWdodD0iMTI4Ij48cGF0aCBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMTAiIGQ9Ik0xNSA1aDE3OGM1LjUyMyAwIDEwIDQuNDc3IDEwIDEwdjk4YzAgNS41MjMtNC40NzcgMTAtMTAgMTBIMTVjLTUuNTIzIDAtMTAtNC40NzctMTAtMTBWMTVDNSA5LjQ3NyA5LjQ3NyA1IDE1IDV6Ii8+PHBhdGggZD0iTTMwIDk4VjMwaDIwbDIwIDI1IDIwLTI1aDIwdjY4SDkwVjU5TDcwIDg0IDUwIDU5djM5SDMwem0xMjUgMGwtMzAtMzNoMjBWMzBoMjB2MzVoMjBsLTMwIDMzeiIvPjwvc3ZnPg==");
}
Loading

0 comments on commit 184f8e8

Please sign in to comment.