Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Infra: Continuous integration workflow #304

Draft
wants to merge 150 commits into
base: development
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
dbc67b3
Add Export model button to list of models page
idmarjr Dec 12, 2021
6de196c
Add export model button to Logic model workspace
idmarjr Dec 12, 2021
3b56200
Add export model button to cConceptual model workspace
idmarjr Dec 12, 2021
689952d
Remove aria-hidden from actions in models list
idmarjr Dec 12, 2021
edca2d6
Merge branch 'development' into feature/export-model
idmarjr Dec 12, 2021
8a3ec81
Merge branch 'development' into feature/export-model
idmarjr Dec 13, 2021
0cdb208
Add script to run cypress tests on firefox
wlsf82 Dec 13, 2021
258d4be
Create github workflow to run tests
wlsf82 Dec 13, 2021
7bd3a01
Merge branch 'development' into feature/export-model
idmarjr May 13, 2022
9496040
Merge branch 'development' into feature/export-model
idmarjr Jun 26, 2022
a13e645
Validate user on get model
miltonbsn Sep 16, 2023
7a18bfd
Move .separator to atomic.scss
idmarjr Sep 17, 2023
f859605
No access page
idmarjr Sep 17, 2023
6aa1fa6
Remove debbug code
miltonbsn Sep 17, 2023
378ce39
Fix typo
miltonbsn Sep 17, 2023
3edc0f9
Validade user on get logic model
miltonbsn Sep 17, 2023
007ce1c
Set log on error
miltonbsn Sep 17, 2023
8b0e1aa
feat(config): Add config file to centralize the env var loads
joaomfiumari Dec 20, 2022
84551cb
feat(auth): Add jwt middleware to validate received access-token
joaomfiumari Dec 20, 2022
680f141
feat(auth): Add interceptor to add jwt token in the requests
joaomfiumari Dec 20, 2022
e16750b
Bump jsonwebtoken from 8.5.1 to 9.0.0
dependabot[bot] Sep 24, 2023
1110104
Merge pull request #468 from brmodeloweb/dependabot/npm_and_yarn/json…
miltonbsn Sep 24, 2023
46651c6
Merge branch 'main' into ci/create-continuous-integration-workflow
idmarjr Sep 30, 2023
ccea7fa
Merge branch 'main' into feature/export-model
idmarjr Sep 30, 2023
b98e3f1
Update ci.yml
idmarjr Sep 30, 2023
d58b098
Update minor version devDependencies updates
idmarjr Oct 1, 2023
59b3d9c
Update Major devDependencies with 1x version
idmarjr Oct 1, 2023
0075b7f
Update rimraf: v3.x --> v5.x
idmarjr Oct 1, 2023
fa5bdb5
Update Cypress & Jest
idmarjr Oct 1, 2023
ee6129d
Merge pull request #471 from brmodeloweb/update-dev-dependencies
idmarjr Oct 1, 2023
31c16b0
Define missing children types
idmarjr Oct 2, 2023
fe98e2e
Update react related dependencies
idmarjr Oct 2, 2023
16c14fd
Update dependencies with minor version changes
idmarjr Oct 2, 2023
eee8c0f
Update dotenv dependency
idmarjr Oct 2, 2023
e2be9c2
Update i18next related dependencies
idmarjr Oct 2, 2023
e850dab
Merge pull request #472 from brmodeloweb/update-project-dependencies
idmarjr Oct 3, 2023
a423b09
Remove default tracker
miltonbsn Oct 7, 2023
5be728a
Send track event on route change
miltonbsn Oct 7, 2023
eb8fa7f
Optimize listAll query
miltonbsn Oct 7, 2023
6422298
Add copyAll, pastAll and deletAll on elementSelector
miltonbsn Oct 8, 2023
90b5a83
Add new features to conceptual editor
miltonbsn Oct 8, 2023
5cbf2f6
Add new features to logic editor
miltonbsn Oct 8, 2023
1ea3cd2
Fix email type
miltonbsn Oct 8, 2023
7bb81ce
Merge pull request #477 from brmodeloweb/feature/copy-and-past
miltonbsn Oct 8, 2023
3a1627b
Merge pull request #478 from brmodeloweb/fix/email-signup-validation
miltonbsn Oct 8, 2023
e975a47
Create FUNDING.yml
idmarjr Oct 9, 2023
9aeda01
Bump @babel/traverse from 7.16.5 to 7.23.2
dependabot[bot] Oct 17, 2023
b4bb90a
Update default app <title>
idmarjr Oct 19, 2023
4d0c0cd
Merge pull request #479 from brmodeloweb/dependabot/npm_and_yarn/babe…
idmarjr Oct 22, 2023
c58767d
Update Cypress to V13
idmarjr Nov 12, 2023
9401526
Update depenencis via: yarn upgrade
idmarjr Nov 12, 2023
b57b81f
Update faker
idmarjr Nov 12, 2023
1272976
Update faker import at test files
idmarjr Nov 12, 2023
cece600
Define api url as a cypress env
wlsf82 Nov 12, 2023
0465931
Login via gui in all tests
wlsf82 Nov 12, 2023
7d550f6
Delete the login via api custom cmd
wlsf82 Nov 12, 2023
022d1ef
Remove test assertions that are not working
wlsf82 Nov 12, 2023
1a7cc03
Get token and use as request header
wlsf82 Nov 12, 2023
13fb652
Temporarily skip failing test
wlsf82 Nov 12, 2023
83c2ee4
Delete drag and drop command
wlsf82 Nov 12, 2023
0855957
Update Tests section o Readme.md
idmarjr Nov 13, 2023
0791255
Fix header hiearchy on Readme.md
idmarjr Nov 13, 2023
837ddd9
Better text on Tests WARNING block
idmarjr Nov 13, 2023
7b4a61f
Merge pull request #485 from brmodeloweb/migrate-cypress-files-to-v13
idmarjr Nov 13, 2023
ea73145
Bump follow-redirects from 1.15.3 to 1.15.4
dependabot[bot] Jan 11, 2024
519ca9d
Merge pull request #491 from brmodeloweb/dependabot/npm_and_yarn/foll…
idmarjr Jan 20, 2024
7c2366f
Create DISPLAY_SPONSORS.yml
idmarjr Jan 28, 2024
851ba6c
Update DISPLAY_SPONSORS.yml
idmarjr Jan 28, 2024
de017c1
Update DISPLAY_SPONSORS.yml
idmarjr Jan 28, 2024
7cb497f
Update README.md
idmarjr Jan 28, 2024
bbcbf15
Update Sponsor insertion markup
idmarjr Jan 28, 2024
7f016f7
Update README.md
idmarjr Feb 4, 2024
cedae09
Update DISPLAY_SPONSORS.yml
idmarjr Feb 4, 2024
961f5e5
Update DISPLAY_SPONSORS.yml
idmarjr Feb 4, 2024
532eeb7
Remove Sponsors workflow (For now)
idmarjr Feb 4, 2024
34c3c98
Add git and mongo db folder to .dockerignore
Tarliton Feb 4, 2024
4e9edd0
Rewrite Dockerfile
Tarliton Feb 4, 2024
d51648f
Bump docker-compose version to 3
Tarliton Feb 4, 2024
792cd99
docs: update README.md [skip ci]
allcontributors[bot] Feb 4, 2024
ef76001
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Feb 4, 2024
f7d65e7
Merge pull request #497 from brmodeloweb/all-contributors/add-Tarliton
miltonbsn Feb 4, 2024
2437d9f
Bump ip from 2.0.0 to 2.0.1
dependabot[bot] Feb 21, 2024
9df7a7c
Merge pull request #502 from brmodeloweb/dependabot/npm_and_yarn/ip-2…
idmarjr Feb 24, 2024
c8d055a
Bump follow-redirects from 1.15.4 to 1.15.6
dependabot[bot] Mar 16, 2024
f1c2526
Bump webpack-dev-middleware from 5.3.3 to 5.3.4
dependabot[bot] Mar 23, 2024
6fb5cf9
Merge pull request #507 from brmodeloweb/dependabot/npm_and_yarn/webp…
idmarjr Mar 26, 2024
e31fd0f
Bump express from 4.18.2 to 4.19.2
dependabot[bot] Mar 26, 2024
d7ec21d
Create publicview module structure
miltonbsn Apr 20, 2024
1dc2b08
Merge pull request #512 from brmodeloweb/dependabot/npm_and_yarn/expr…
miltonbsn Apr 20, 2024
5a9b69e
Merge pull request #504 from brmodeloweb/dependabot/npm_and_yarn/foll…
miltonbsn Apr 20, 2024
818537e
Merge branch 'main' into feature/export-model
idmarjr Apr 20, 2024
39316b3
Update icon and copy frokm "Export" to "Share"
idmarjr Apr 20, 2024
0fb1731
Add Share modal
idmarjr Apr 20, 2024
4334e81
Create load share apis
miltonbsn Apr 20, 2024
857432e
Merge branch 'feature/share-backend' into feature/export-model
miltonbsn Apr 20, 2024
22d2818
Visual adjustments to publicView
idmarjr Apr 20, 2024
3db0424
Avoid layout break for models with long names
idmarjr Apr 20, 2024
5246f1e
Fix: .projectsList layout break
idmarjr Apr 20, 2024
04c7888
Create load config endpoint
miltonbsn Apr 21, 2024
cad5789
Add share into list
miltonbsn Apr 21, 2024
b752178
Remove logs
miltonbsn Apr 21, 2024
583ae4e
Add share into conceptual
miltonbsn Apr 21, 2024
02f72db
Remove logs
miltonbsn Apr 21, 2024
122c125
Short refactoring
miltonbsn Apr 21, 2024
53240f4
Add share into logic
miltonbsn Apr 21, 2024
a095b02
Change load to support always generate link
miltonbsn Apr 21, 2024
bbf3d53
Prevents exit on click outside modal
miltonbsn Apr 21, 2024
f3c83e1
Add new save button and related functions
miltonbsn Apr 21, 2024
84583f9
Disable copy button when url is empty
miltonbsn Apr 21, 2024
b778f9b
Draft markupo for Sponsor banner at Models List
idmarjr Apr 21, 2024
343d9e0
Update copy and add translations
idmarjr Apr 22, 2024
beefc18
Small copy update
idmarjr Apr 22, 2024
37f8e21
Merge pull request #516 from brmodeloweb/feature/public-view-module
miltonbsn Apr 22, 2024
7b23b78
Move GithubSponsorBanner to it's own component
idmarjr Apr 22, 2024
701c855
Fix bug on duplicate model feedback message
idmarjr Apr 22, 2024
a872c8e
Add Feedback module to ModelsList
idmarjr Apr 22, 2024
77b1eb4
Update success save message for copy consistency
idmarjr Apr 22, 2024
88ec8c7
Improve ModelList feedback
idmarjr Apr 22, 2024
9f91e89
Create load shared model api
miltonbsn Apr 22, 2024
98d746a
Load shared model on publicview module
miltonbsn Apr 22, 2024
ebc3263
Merge branch 'feature/export-model' of github.com:brmodeloweb/brmodel…
miltonbsn Apr 22, 2024
f3cccce
Remove unused testes
miltonbsn Apr 22, 2024
2e7d365
Small fixies
miltonbsn Apr 22, 2024
67b7859
Merge pull request #520 from brmodeloweb/bugfix/workspace-feedback-mo…
miltonbsn Apr 22, 2024
64150b6
Use icons to represent model types
idmarjr Apr 22, 2024
d298c2c
Merge pull request #521 from brmodeloweb/model-type-icons
miltonbsn Apr 22, 2024
142be07
Merge main features
miltonbsn Apr 23, 2024
3edd0c2
Add sharing feedback on workspace
miltonbsn Apr 23, 2024
6bd0954
Fix sharing config message on conceptual model
miltonbsn Apr 23, 2024
80e6640
Fix sharing config message on logic model
miltonbsn Apr 23, 2024
8c06ea9
Add icon type on publicviem
miltonbsn Apr 23, 2024
2c0a77f
Add panning command into public view
miltonbsn Apr 23, 2024
f24140f
Fix missing translation
idmarjr Apr 23, 2024
560c104
Move publicView styles to it's ow component scss
idmarjr Apr 23, 2024
207f93b
Fix small interface bug on modelSidebar
idmarjr Apr 23, 2024
e9f5a17
Change shared model contract
miltonbsn Apr 23, 2024
bac5c00
Merge branch 'feature/export-model' of github.com:brmodeloweb/brmodel…
idmarjr Apr 23, 2024
c4c78eb
Fix icon loading
miltonbsn Apr 23, 2024
6350c03
Merge pull request #518 from brmodeloweb/feature/export-model
miltonbsn Apr 23, 2024
a1e8bf6
Merge branch 'main' into github-sponsor-visibility-boost
idmarjr Apr 23, 2024
423cc01
1px layout fix (True story)
idmarjr Apr 23, 2024
efa2183
Fix missing translation at Share modal
idmarjr Apr 23, 2024
00cbd4e
Merge pull request #519 from brmodeloweb/github-sponsor-visibility-boost
idmarjr Apr 23, 2024
ce8e715
Create duplicate api endpoint
miltonbsn Apr 24, 2024
59b1a85
Improve duplicate modal functionality
miltonbsn Apr 24, 2024
51d298c
Add new duplicate modal to conceptual model
miltonbsn Apr 24, 2024
d51fa53
Add new duplicate modal to logic model
miltonbsn Apr 24, 2024
c461d2f
Add new duplicate modal to workspace
miltonbsn Apr 24, 2024
fc59ebc
Merge pull request #524 from brmodeloweb/fix/duplicate-model
miltonbsn Apr 24, 2024
1c12d0b
Merge branch 'main' into ci/create-continuous-integration-workflow
idmarjr Apr 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix icon loading
miltonbsn committed Apr 23, 2024
commit c4c78eb63f6d18e7dd69fd6d376290be4103eecb
3 changes: 2 additions & 1 deletion app/angular/conceptual/conceptual.js
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ import EntityExtensor from "./entityExtensor";
import KeyboardController, { types } from "../components/keyboardController";
import ToolsViewService from "../service/toolsViewService";
import preventExitServiceModule from "../service/preventExitService";
import iconConceptual from "../components/icons/conceptual";

const controller = function (ModelAPI, $stateParams, $rootScope, $timeout, $uibModal, $state, $transitions, preventExitService, $filter) {
const ctrl = this;
@@ -566,7 +567,7 @@ const controller = function (ModelAPI, $stateParams, $rootScope, $timeout, $uibM
};

export default angular
.module("app.workspace.conceptual", [modelDuplicatorComponent, preventExitServiceModule, bugReportButton, statusBar, shareModelModal])
.module("app.workspace.conceptual", [modelDuplicatorComponent, preventExitServiceModule, bugReportButton, statusBar, shareModelModal, iconConceptual])
.component("editorConceptual", {
template,
controller,
3 changes: 2 additions & 1 deletion app/angular/logic/logic.js
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ import view from "../view/view";
import columnForm from "./columnForm";
import checkConstraint from "./checkConstraint";
import sidebarControlLogical from "./sidebarControl";
import iconLogic from "../components/icons/logic";

const controller = function (
$rootScope,
@@ -266,7 +267,7 @@ const controller = function (
};

export default angular
.module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule, bugReportButton, statusBar, view, columnForm, sidebarControlLogical, checkConstraint, queryExpressionModal, sqlComparasionDropdown, shareModelModal])
.module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule, bugReportButton, statusBar, view, columnForm, sidebarControlLogical, checkConstraint, queryExpressionModal, sqlComparasionDropdown, shareModelModal, iconLogic])
.component("editorLogic", {
template,
controller,