Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/web/elliptic-6.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
adityatoshniwal authored Nov 4, 2024
2 parents aa47c3f + 25c3142 commit cf31902
Show file tree
Hide file tree
Showing 12 changed files with 1,310 additions and 1,436 deletions.
5 changes: 4 additions & 1 deletion docs/en_US/release_notes_8_13.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Version 8.13
************

Release date: 2024-10-22
Release date: 2024-11-14

This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.12.

Expand All @@ -29,6 +29,8 @@ New features
Housekeeping
************

| `Issue #8061 <https://github.com/pgadmin-org/pgadmin4/issues/8061>`_ - Updated the react-menu library from v2 to v4.
| `Issue #8077 <https://github.com/pgadmin-org/pgadmin4/issues/8077>`_ - Remove bootstrap from the runtime code.
Bug fixes
*********
Expand All @@ -37,6 +39,7 @@ Bug fixes
| `Issue #7289 <https://github.com/pgadmin-org/pgadmin4/issues/7289>`_ - Move 'About pgAdmin 4' to app menu on macOS.
| `Issue #7655 <https://github.com/pgadmin-org/pgadmin4/issues/7655>`_ - Fixed an issue where the query tool was crashing when an empty geometry was being rendered.
| `Issue #7837 <https://github.com/pgadmin-org/pgadmin4/issues/7837>`_ - Fixed an issue where role properties were not loading.
| `Issue #7883 <https://github.com/pgadmin-org/pgadmin4/issues/7883>`_ - Fix multiple issues related to debugger params dialog input.
| `Issue #7907 <https://github.com/pgadmin-org/pgadmin4/issues/7907>`_ - Ensure server connection is successful for sslrootcert=system in server configuration.
| `Issue #7919 <https://github.com/pgadmin-org/pgadmin4/issues/7919>`_ - Fixed an issue where the dock layout was not saved upon closing a tab.
| `Issue #7920 <https://github.com/pgadmin-org/pgadmin4/issues/7920>`_ - Fixed an issue where the copy shortcut CTRL +C was not working in the Query Tool data grid.
Expand Down
11 changes: 6 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,21 @@ Flask-Babel==4.0.*
Flask-Security-Too==5.5.*; python_version >= '3.10'
Flask-Security-Too==5.4.*; python_version <= '3.9'
Flask-SocketIO==5.4.*
WTForms==3.1.*
WTForms==3.2.*; python_version >= '3.10'
WTForms==3.1.*; python_version <= '3.9'
passlib==1.*
pytz==2024.*
speaklater3==1.*
sqlparse==0.*
psutil==6.0.*
psutil==6.1.*
psycopg[c]==3.2.3
python-dateutil==2.*
SQLAlchemy==2.*
bcrypt==4.2.*
cryptography==43.0.*
sshtunnel==0.*
ldap3==2.*
gssapi==1.8.*
gssapi==1.9.*
eventlet==0.37.0
user-agents==2.2.0
pywinpty==2.0.*; sys_platform=="win32"
Expand All @@ -45,9 +46,9 @@ qrcode[pil]==8.*; python_version >= '3.9'
boto3==1.35.*
urllib3==1.26.*
azure-mgmt-rdbms==10.1.0
azure-mgmt-resource==23.1.1
azure-mgmt-resource==23.2.0
azure-mgmt-subscription==3.1.1
azure-identity==1.18.0
azure-identity==1.19.0
google-api-python-client==2.*
google-auth-oauthlib==1.2.1
keyring==25.*
Expand Down
1 change: 0 additions & 1 deletion runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
},
"dependencies": {
"axios": "^1.7.7",
"bootstrap": "^4.5.3",
"electron-context-menu": "^4.0.4",
"electron-store": "^10.0.0"
}
Expand Down
142 changes: 108 additions & 34 deletions runtime/src/css/pgadmin-desktop.css
Original file line number Diff line number Diff line change
@@ -1,44 +1,118 @@
@import "../../node_modules/bootstrap/dist/css/bootstrap.css";
body {
font-family: system-ui;
height: 100vh;
display: flex;
flex-direction: column;
margin: 0;
font-size: 0.9em;
background-color:var(--background-color);
color: var(--color);

.card {
margin: 0.25rem !important;
--color: #222;
--background-color: #fff;
--border-color: #bac1cd;
--primary-color: #326690;
}

.content {
min-height: 0;
display: flex;
flex-direction: column;
flex-grow: 1;
padding: 8px;
}

#status-text {
font-size: medium;
align-self: center;
.footer {
display: flex;
align-items: center;
justify-content: space-between;
border-top: 1px solid var(--border-color);
padding: 8px;
}

#server_log_label {
.card {
margin: 4px 0px;
}

.card .card-header {
padding: 8px 4px;
font-weight: 500;
}

.card .card-body {
border: 1px solid var(--border-color);
border-radius: 4px;
padding: 12px;
}

.form-inline {
display: flex;
padding: 16px 0px;
}

.form-group {
display: flex;
align-items: center;
gap: 4px;
}

.form-check-input {
height: 16px;
width: 16px;
accent-color: var(--primary-color);
}
.form-check-input:focus {
outline-color: var(--primary-color);
}

.form-input {
padding: 4px 6px;
background-color: var(--background-color);
border-style: none;
border: 1px solid var(--border-color);
color: var(--color);
border-radius: 4px;
}
.form-input:disabled {
opacity: 0.7;
}
.form-input:focus {
outline-color: var(--primary-color);
}

.mt-4 {
margin-top: 16px;
}
.mr-2 {
margin-right: 8px;
}
.mr-3 {
margin-right: 12px;
}

.btn {
padding: 6px 12px;
border-radius: 4px;
box-shadow: none;
border-style: none;
cursor: pointer;
}

.btn-primary {
color: #fff;
background-color: #326690;
border-color: #326690;
}
.btn-primary:hover {
color: #fff;
background-color: #285274;
border-color: #254b6a;
}
.btn-primary:focus, .btn-primary.focus {
color: #fff;
background-color: #285274;
border-color: #254b6a;
box-shadow: 0 0 0 0 rgba(81, 125, 161, 0.5);
}
.btn-primary.disabled, .btn-primary:disabled {
color: #fff;
background-color: #326690;
border-color: #326690;
}
.btn-primary:not(:disabled):not(.disabled):active, .btn-primary:not(:disabled):not(.disabled).active, .show > .btn-primary.dropdown-toggle {
color: #fff;
background-color: #254b6a;
border-color: #224461;
}
.btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-primary.dropdown-toggle:focus {
box-shadow: 0 0 0 0 rgba(81, 125, 161, 0.5);
color: #fff;
background-color: var(--primary-color);
border-color: var(--primary-color);
}
.btn-primary:disabled {
opacity: 0.75;
cursor: unset;
}

@media (prefers-color-scheme: dark) {
body {
--color: #d4d4d4;
--background-color: #212121;
--border-color: #4a4a4a;
--primary-color: #234d6e;
}
}
85 changes: 36 additions & 49 deletions runtime/src/html/configure.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,71 +6,58 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>pgAdmin 4 Runtime Configuration</title>
<link rel="stylesheet" href="../css/pgadmin-desktop.css"/>
<style>
body, html {
font-size: 14px;
background-color: #ebeef3;
}
@media screen and (forced-colors: active) {
body {
forced-color-adjust: none !important;
}
}
</style>
</head>
<body>
<div class="card shadow-sm">
<div class="card-header h6">Fixed Port</div>
<div class="card-body">
<div class="form-group">
<label>By default, pgAdmin uses a random port number to ensure it can always run successfully. If you need to use a predictable port number, you can set one here. Note that if the port is already in use, the application will be unable to start.</label>
</div>
<div class="form-inline">
<div class="form-check mr-3">
<label class="form-check-label mr-2" for="fixedPortCheck">Fixed port number?</label>
<input type="checkbox" class="form-check-input" id="fixedPortCheck"
data-name="fixed_port"/>
</div>
<div class="content">
<div class="card">
<div class="card-header">Fixed Port</div>
<div class="card-body">
<div class="form-group">
<label class="mr-1" for="portNo">Port Number</label>
<input type="number" class="form-control" id="portNo" min="1025" max="65535" value="5050" style="min-width: 100px;">
<span>By default, pgAdmin uses a random port number to ensure it can always run successfully. If you need to use a predictable port number, you can set one here. Note that if the port is already in use, the application will be unable to start.</span>
</div>
<div class="form-group mt-4">
<div class="mr-3 form-group">
<label class="mr-2" for="fixedPortCheck">Fixed port number?</label>
<input type="checkbox" class="form-check-input" id="fixedPortCheck"
data-name="fixed_port"/>
</div>
<div class="form-group">
<label class="mr-1" for="portNo">Port Number</label>
<input type="number" class="form-input" id="portNo" min="1025" max="65535" value="5050" style="min-width: 100px;">
</div>
</div>
</div>
</div>
</div>
<div class="card shadow-sm mt-3">
<div class="card-header h6">Connection Timeout</div>
<div class="card-body">
<div class="form-group">
<label>Connection Timeout will define how long to wait for the pgAdmin server to start before throwing an error. By default, pgAdmin will wait for 90 seconds.
</label>
</div>
<div class="form-inline">
<div class="card">
<div class="card-header">Connection Timeout</div>
<div class="card-body">
<div class="form-group">
<label class="mr-2">Timeout</label>
<input type="number" class="form-control" id="timeOut" min="10" max="600" value="90" style="min-width: 80px;">
<label class="ml-1">seconds</label>
<span>Connection Timeout will define how long to wait for the pgAdmin server to start before throwing an error. By default, pgAdmin will wait for 90 seconds.
</span>
</div>
<div class="form-group mt-4">
<label class="mr-2" for="timeOut">Timeout</label>
<input type="number" class="form-input" id="timeOut" min="10" max="600" value="90" style="min-width: 80px;">
<span class="ml-1">seconds</span>
</div>
</div>
</div>
</div>
<div class="card shadow-sm mt-3">
<div class="card-header h6">Open Documentation</div>
<div class="card-body">
<div class="form-group">
<label>By checking this option, all documentation links will open in the default browser instead of a new window.
</label>
</div>
<div class="form-inline">
<div class="form-check mr-3">
<label class="form-check-label mr-2" for="fixedPortCheck">Open Documentation in Default Browser?</label>
<div class="card">
<div class="card-header">Open Documentation</div>
<div class="card-body">
<div class="form-group">
<span>By checking this option, all documentation links will open in the default browser instead of a new window.
</span>
</div>
<div class="form-group mt-4 form-group">
<label class="mr-2" for="fixedPortCheck">Open Documentation in Default Browser?</label>
<input type="checkbox" class="form-check-input" id="openDocsInBrowser"
data-name="open_docs_in_browser"/>
</div>
</div>
</div>
</div>
<div class="p-2 d-flex fixed-bottom shadow bg-white">
<div class="footer">
<div class="mr-auto" id="status-text"></div>
<div class="ml-auto">
<button id="btnSave" type="submit" class="btn btn-primary" disabled>Save</button>
Expand Down
39 changes: 18 additions & 21 deletions runtime/src/html/server_error.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,26 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Fatal Error</title>
<link rel="stylesheet" href="../css/pgadmin-desktop.css"/>
<style>
body, html {
font-size: 14px;
background-color: #ebeef3;
}
@media screen and (forced-colors: active) {
body {
forced-color-adjust: none !important;
}
}
</style>
</head>
<style>
.header {
font-weight: 500;
margin-bottom: 8px;
color: red;
}
.content .form-input {
flex-grow: 1;
}
</style>
<body>
<div class="card shadow-sm">
<div class="card-body">
<label id="server_error_label" style=" color: red; font-size: large;"></label>
<textarea id="server_error_log" style="min-width: 750px; min-height: 300px; resize: none;" readonly></textarea>
</div>
<div class="p-2 d-flex fixed-bottom shadow bg-white">
<div class="mr-auto" id="status-text"></div>
<div class="ml-auto">
<button id="btnConfigure" class="btn btn-primary">Configure...</button>
</div>
<div class="content">
<div class="header" id="server_error_label">The pgAdmin 4 server could not be contacted:</div>
<textarea class="form-input" id="server_error_log" style="min-width: 750px; min-height: 300px;resize: none;" readonly></textarea>
</div>
<div class="footer">
<div class="mr-auto" id="status-text"></div>
<div class="ml-auto">
<button id="btnConfigure" class="btn btn-primary">Configure...</button>
</div>
</div>
<script>
Expand Down
Loading

0 comments on commit cf31902

Please sign in to comment.