Commit Graph

5203 Commits

Author SHA1 Message Date
Dominic Jäger
2cc64d0e42 vzdump mail: Refactor text part
Less lines exeeding the character limit, less nesting, less duplicate code,
more readable sprintf arguments.

Co-authored-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
2020-11-17 14:13:11 +01:00
Aaron Lauterer
d27a44a615 ui: fix column behavior with browser scaling
especially on chromium based browser (e.g. chrome, edge) it can happen,
depending on the zoom level, that the last column does not fit next to
the other columns and is moved below the other columns.

This results in an ugly looking UI and in the worst case makes it
unusable.

This can also be triggered if the monitor is set to a higher scaling /
different DPI settings. I was able to have the same problem in Edge when
setting the scaling in the windows display settings to 125% (Clone VM).

Changing the layout from columns with 0.5 width to extjs HBOXes with
flex 1 works as expected.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
2020-11-17 09:58:49 +01:00
Fabian Ebner
b15bdd864e fix maxfiles behavior
Commit b64dd8c8a5 hard-coded 0 as the default
for maxfiles in the --storage case, but the actual default should be the
value from read_vzdump_defaults(), which obtains the value from
/etc/vzdump.conf or the VZDump schema if the value has not been modified in
that file. The initial default from the schema is 1, not 0.
Tested on PVE 6.1 to verify that behavior.

Move the sanity check for zero-ness to where we have the final value for
maxfiles. Like this, we also have an implicit definedness check and more
importantly, it is more future-proof in case we ever allow maxfiles 0 in the
VZDump schema itself.

Also, force conversion to int to be extra safe.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-16 18:18:32 +01:00
Thomas Lamprecht
5939af6bbb aplinfo: update shipped index
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-16 18:06:16 +01:00
Dominic Jäger
d0610a6b4f vzdump mail: fix #3136: Add name to plain/text part
The html/text part already has VMID NAME STATUS TIME..., but the text part only
had VMID STATUS TIME... so far. Therefore, add the missing "name" column.

Limit the length of names so that the content of the following columns remains
aligned to the headings. Note that (like before, too) this only works with
monospaced fonts.

Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
2020-11-16 18:06:12 +01:00
Dominik Csapak
9493ac144b ui: remove sum for percentages of ceph pools
because different pools can have different crush rules, etc.
the sum of the 'percentage used' column makes no real sense, so we
remove it

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2020-11-16 10:12:03 +01:00
Thomas Lamprecht
c8a71b9e1f ui: storage content view: add clear trigger to search
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-16 10:09:05 +01:00
Thomas Lamprecht
1d8306e4ca ui: storage content view: eslint fixes and code cleanup
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-16 09:58:04 +01:00
Thomas Lamprecht
2dcc87c798 ui: storage: re-order navigation tree entries, avoid state saving
So we have first backups, then disk images (VM, CT), then templates
(VM, CT) and finally snippets.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-15 19:38:38 +01:00
Thomas Lamprecht
6ecc74209f ui: reverse showColumns to hideColumns, default to hide comment
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-15 19:37:21 +01:00
Thomas Lamprecht
896475ee5b ui: makefile: fix order
else some panels try to use conetent view before it is defined,
triggering the ExtJS auto-load from server magic, which fails - while
it does not breaks the UI, it generates a warning in the console and
an unnecessary request doomed to fail anyway.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-15 19:34:58 +01:00
Fabian Ebner
7ef0f4c36c content view: allow specifying which columns to show on init
depending on the content type, we might want to show different information, e.g.
parent for cloned VM/CT images, verification for backups, etc. Of course the
properties would have to be added to the model and the availableColumns first

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 19:02:21 +01:00
Fabian Ebner
1fe81ce99d simplify reload call
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
f5e17f156a create ImageView and use it for VM and CT images
The enableFn's that were responsible for switching
between the image remove button and the standard remove button
are not needed anymore.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
4323c70b47 get rid of unneccessary enableFn's
There's only backups in this view.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
1665b8402c create and use BackupView
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
13d7dfccee create and use TemplateView
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
8798c35bcd add upload button conditionally
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
dbeddeb322 turn {nodename, storage, sm} into object variables
so they can be used and specified in derived classes.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
9ce0c25857 content view: allow specifying title bar elements for init
in preparation to create derived classes.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
dc19fb838b remove the now unneccessary content type column
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
606b1d41ac remove the now unnecessary grouping by content type
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
e8b422bc77 use separate view for each content type
Organized as separate "if"s to allow changing properties easily later.

The StorageContentView now serves as a parent class, so the stateId
cannot be fixed there. Instead make each individual view stateful with a
unique stateId.

statusStore is not needed anymore, now there is a single fixed content type,
and the template and upload button are disabled depending on that type.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
4958029958 add CD ROM and lxc icons for treelist-item-icon
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
1a763337a2 storage panel/browser: use insertNodes function
in preparation for dynamically loading nodes for content-type-specific views.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
a83c659a11 config panel: allow new nodes to be added later
in preparation for dynamically loading nodes for content-type-specific views.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Fabian Ebner
c128543fd5 fix extension filter for upload window
so that it selects the correct filter for container templates

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
2020-11-15 18:41:11 +01:00
Thomas Lamprecht
d1a7c6ee15 ui: storage/PBS: allow to download/print new encryption key
note that the key is really important, add our recommended backup
strategy (copy to PW manager, save onto secured USB drive, print
paperkey and secure it) with the respective buttons to do so.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-15 16:46:02 +01:00
Thomas Lamprecht
71dec88f99 ui: storage: implement apiCallDone callback for storage input panels
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-15 14:56:37 +01:00
Thomas Lamprecht
57e40406de ui: storage/PBS: drop beta hint
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-15 14:56:37 +01:00
Thomas Lamprecht
d74c7e80c7 ui: token create: use clipboard icon
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-15 14:51:43 +01:00
Thomas Lamprecht
9ebe2165c3 ui: save cluster name in PVE global
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-15 14:51:13 +01:00
Thomas Lamprecht
425e05d7ca ui: content/backup-view: move comment to second col, make flex
to make it more look like what we to in PBS

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-12 18:34:38 +01:00
Thomas Lamprecht
c9a3516898 ui: storage content: fix verify time tooltip
this was partial copied over from PBS, but there we pull out the task
startime alreay when building the store.

As eslint mentions, task was unused, verify_time not defined, fix
that.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-12 18:31:17 +01:00
Thomas Lamprecht
814c5942dc eslint fixes
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-12 18:23:47 +01:00
Dominik Csapak
957a53bd61 ui: add comment/verification columns to backup/content grid
verification column only shows in the backup grid and for
pbs storages

(renderer is mostly copied from proxmox-backup)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2020-11-12 18:14:53 +01:00
Thomas Lamprecht
43faab1838 ui: package versions: make taller, add copy button
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-05 19:45:10 +01:00
Thomas Lamprecht
3ddcdadce1 ui: package versions: code cleanup, use template strings
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-05 19:43:57 +01:00
Stefan Reiter
b64dd8c8a5 restore default value of 0 for remove/maxfiles
If neither the 'remove' option of vzdump nor the 'maxfiles' option in
the storage config are set, assume a value of 0, i.e. do not delete
anything and allow unlimited backups.

Restores previous behaviour that was broken in e6946086e3.

Also fixes a warning about using '== 0' on a non-number type.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
2020-11-05 16:29:00 +01:00
Stefan Reiter
6a073b92e9 ui: qemu: set correct disabled state for start button
If a guest's QEMU process is 'running', but QMP says 'shutdown' or
'prelaunch', the VM is ready to be booted anew, so we can show the
button.

The 'shutdown' button is intentionally not touched, as we always want to
give the user the ability to 'stop' a VM (and thus kill any potentially
leftover processes).

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
2020-11-05 13:31:29 +01:00
Stefan Reiter
7828eef6f2 apt: add libproxmox-backup-qemu0 to displayed packages
Can provide important information for debugging issues in forum etc...

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
2020-11-05 10:30:08 +01:00
Thomas Lamprecht
4fad8e30f9 bump version to 6.2-15
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-01 20:35:03 +01:00
Thomas Lamprecht
33b8ed2ed0 vzdump: fix regression with keep forever logic
fixes commit f354fe47fc, which changed
the logic to the newer storage prune helpers, but those are designed
in the spirits of PBS, with a keep-option not set meaning to keep
none.

This does not respects the storage special handling of maxfiles.
While in the API/CLI that option must be > 0m in can be zero when set
in a storage configuration entry, and then it means keep all. So, set
the internal remove option to false if that special condition is met.

This would have been a clearer, and less prone to changes,
implementation to begin with.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-01 20:11:03 +01:00
Dominik Csapak
d18e15dd26 ui: Utils: add product specific task descriptions
move them from widget-toolkit to here
i took the chance, and sorted them alphabetically

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2020-10-30 14:06:28 +01:00
Dominic Jäger
5b849276b4 ui: Add verify SSL cert checkbox for active directory
Like for LDAP, the option is too important to be hidden in CLI.

Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
2020-10-29 19:22:51 +01:00
Thomas Lamprecht
acff3d6eec follouwp whitespace fix
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-10-29 09:12:22 +01:00
Fabian Grünbichler
0fc553eb1b status/metrics: make MTU configurable
since some users don't even have a full 1500 (and some systems might
have links with bigger MTU and not require as much fragmentation).

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2020-10-29 08:51:51 +01:00
Thomas Lamprecht
0b9e52ddc6 ui: osd: do not confuse view and controller scopes
The me variable should only be assigned from `this`, else it gets
confusing and wrong fast.

here the managed listener tried to do a this.reload, but this is
ambiguous here, and not the controller.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-10-28 10:49:52 +01:00
Thomas Lamprecht
4f14c9c94b ui: osd: eslint fixes
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-10-28 10:49:52 +01:00
Thomas Lamprecht
09aef6ee84 buildsys: fix JS source makefile order
they cannot really be alphabetically sorted, as else some elements
are tried to be accessed before they are defined, which makes ExtJS
do a HTTP request for them.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-10-28 10:35:26 +01:00