Merge pull request #120 from 45Drives/ncr_306843

Ncr 306843
45Drives · Nov 15, 2024 · 50208f8 · 50208f8
2 parents 278fc89 + 3c8d8c5
commit 50208f8
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-## Cockpit File Sharing 4.2.5-2
+## Cockpit File Sharing 4.2.6-1
 
-* iscsi release
+* Fix bug where only first instance of  was inspected while looking for 
diff --git a/README.md b/README.md
@@ -38,8 +38,8 @@ sudo apt install cockpit-file-sharing
 ### Direct from .deb
 Installing this way may work for other versions of Ubuntu and Debian, but it is unsupported. You won't get automatic updates this way.
 ```bash
-curl -LO https://github.com/45Drives/cockpit-file-sharing/releases/download/v4.1.0/cockpit-file-sharing_4.1.0-1focal_all.deb
-sudo apt install ./cockpit-file-sharing_4.1.0-1focal_all.deb
+curl -LO https://github.com/45Drives/cockpit-file-sharing/releases/download/v4.2.6/cockpit-file-sharing_4.2.6-1focal_all.deb
+sudo apt install ./cockpit-file-sharing_4.2.6-1focal_all.deb
 ```
 ## Rocky 8
 ### From 45Drives Repo (Recommended, Rocky 8 only)
@@ -51,7 +51,7 @@ sudo dnf install cockpit-file-sharing
 Installing this way may work for other versions of Rocky/Centos/RHEL/Fedora/etc, but it is unsupported. You won't get automatic updates this way.
 ```bash
 # dnf or yum
-sudo dnf install https://github.com/45Drives/cockpit-file-sharing/releases/download/v4.1.0/cockpit-file-sharing-4.1.0-1.el8.noarch.rpm
+sudo dnf install https://github.com/45Drives/cockpit-file-sharing/releases/download/v4.2.6/cockpit-file-sharing-4.2.6-1.el8.noarch.rpm
 ```
 ## Generic Installation
 1. Install Dependencies
@@ -81,9 +81,9 @@ samba-common-tools
 ```
 2. Download pre-built archive and install
 ```bash
-curl -LO https://github.com/45Drives/cockpit-file-sharing/releases/download/v4.1.0/cockpit-file-sharing_4.1.0_generic.zip
-unzip cockpit-file-sharing_4.1.0_generic.zip
-cd cockpit-file-sharing_4.1.0_generic
+curl -LO https://github.com/45Drives/cockpit-file-sharing/releases/download/v4.2.6/cockpit-file-sharing_4.2.6_generic.zip
+unzip cockpit-file-sharing_4.2.6_generic.zip
+cd cockpit-file-sharing_4.2.6_generic
 # no need to run `make` first, the plugin is pre-built
 sudo make install
 ```

diff --git a/...-sharing/src/tabs/iSCSI/ui/screens/radosBlockDeviceManagement/RBDDeviceCreationScreen.vue b/...-sharing/src/tabs/iSCSI/ui/screens/radosBlockDeviceManagement/RBDDeviceCreationScreen.vue
@@ -75,7 +75,6 @@
 </template>
 
 <script setup lang="ts">
-import ByteInput from "@45drives/houston-common/houston-common-ui/lib/components/ByteInput.vue";
 import { Pool } from "@/tabs/iSCSI/types/cluster/Pool";
 import type { ISCSIDriverClusteredServer } from "@/tabs/iSCSI/types/drivers/ISCSIDriverClusteredServer";
 import type { ProcessError } from "@45drives/houston-common-lib";
@@ -91,6 +90,7 @@ import {
   validationSuccess,
   validationError,
   wrapActions,
+  ByteInput,
 } from "@45drives/houston-common-ui";
 import { ok, ResultAsync, safeTry } from "neverthrow";
 import { inject, ref, type Ref } from "vue";

diff --git a/file-sharing/src/tabs/iSCSI/ui/screens/radosBlockDeviceManagement/RBDExpansionScreen.vue b/file-sharing/src/tabs/iSCSI/ui/screens/radosBlockDeviceManagement/RBDExpansionScreen.vue
@@ -33,9 +33,8 @@
 <script setup lang="ts">
 import { RadosBlockDevice } from "@/tabs/iSCSI/types/cluster/RadosBlockDevice";
 import { LogicalVolume } from "@/tabs/iSCSI/types/cluster/LogicalVolume";
-import { CardContainer, InputLabelWrapper, useTempObjectStaging, validationError, ValidationResultView, ValidationScope, validationSuccess, wrapActions } from "@45drives/houston-common-ui";
+import { CardContainer, InputLabelWrapper, useTempObjectStaging, validationError, ValidationResultView, ValidationScope, validationSuccess, wrapActions, ByteInput } from "@45drives/houston-common-ui";
 import { ResultAsync, okAsync } from "neverthrow";
-import ByteInput from "@45drives/houston-common/houston-common-ui/lib/components/ByteInput.vue";
 import { inject, ref } from "vue";
 import type { ISCSIDriverClusteredServer } from "@/tabs/iSCSI/types/drivers/ISCSIDriverClusteredServer";
 import type { ProcessError } from "@45drives/houston-common-lib";

diff --git a/file-sharing/src/tabs/iSCSI/ui/screens/virtualDevice/FileIOCreationPrompt.vue b/file-sharing/src/tabs/iSCSI/ui/screens/virtualDevice/FileIOCreationPrompt.vue
@@ -37,9 +37,9 @@ import {
   CardContainer, InputLabelWrapper, pushNotification, Notification, useTempObjectStaging, validationError, ValidationResultView,
   ValidationScope,
   validationSuccess,
-  wrapActions
+  wrapActions,
+  ByteInput,
 } from "@45drives/houston-common-ui";
-import ByteInput from "@45drives/houston-common/houston-common-ui/lib/components/ByteInput.vue";
 import { ref } from "vue";
 
 const _ = cockpit.gettext;
@@ -80,4 +80,4 @@ const { validationResult: fileSizeValidationResult } = validationScope.useValida
 
         return validationSuccess();
     });
-</script>
+</script>
diff --git a/file-sharing/src/tabs/samba/samba-manager.ts b/file-sharing/src/tabs/samba/samba-manager.ts
@@ -230,8 +230,8 @@ export class SambaManager implements ISambaManager {
     return new File(this.server, smbConfPath)
       .assertExists()
       .andThen((smbConf) => smbConf.read())
-      .andThen(IniSyntax({ duplicateKey: "ignore" }).apply)
-      .map((smbConf) => smbConf.global?.include === "registry");
+      .andThen(IniSyntax({ duplicateKey: "append" }).apply)
+      .map((smbConf) => [smbConf.global?.include ?? []].flat().includes("registry"));
   }
 
   patchSmbConfIncludeRegistry(smbConfPath: string) {

diff --git a/houston-common b/houston-common
diff --git a/manifest.json b/manifest.json
@@ -3,8 +3,8 @@
     "name": "cockpit-file-sharing",
     "title": "Cockpit File Sharing",
     "prerelease": false,
-    "version": "4.2.5",
-    "buildVersion": "2",
+    "version": "4.2.6",
+    "buildVersion": "1",
     "author": "Josh Boudreau <[email protected]>",
     "url": "https://github.com/45Drives/cockpit-file-sharing",
     "category": "utils",
@@ -65,8 +65,8 @@
     ],
     "changelog": {
         "urgency": "medium",
-        "version": "4.2.5",
-        "buildVersion": "2",
+        "version": "4.2.6",
+        "buildVersion": "1",
         "ignore": [],
         "date": null,
         "packager": "Josh Boudreau <[email protected]>",

diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec
@@ -27,6 +27,8 @@ make DESTDIR=%{buildroot} install
 /usr/share/cockpit/file-sharing/*
 
 %changelog
+* Fri Nov 15 2024 Joshua Boudreau <[email protected]> 4.2.6-1
+- Fix bug where only first instance of  was inspected while looking for 
 * Thu Oct 31 2024 Josh Boudreau <[email protected]> 4.2.5-2
 - iscsi release
 * Mon Oct 28 2024 Brandon Kelly <[email protected]> 4.2.5-1

diff --git a/packaging/focal/changelog b/packaging/focal/changelog
@@ -1,3 +1,9 @@
+cockpit-file-sharing (4.2.6-1focal) focal; urgency=medium
+
+  * Fix bug where only first instance of  was inspected while looking for 
+
+ -- Joshua Boudreau <[email protected]>  Fri, 15 Nov 2024 12:22:25 -0400
+
 cockpit-file-sharing (4.2.5-2focal) focal; urgency=medium
 
   * iscsi release
+6 −6		cockpit-typings/cockpit-extra.d.ts
+1 −0		cockpit-typings/cockpit-import-hack.d.ts
+2 −2		cockpit-typings/cockpit.d.ts
+22 −1		houston-common-lib/lib/errors.ts
+65 −48		houston-common-lib/lib/houston.ts
+6 −0		houston-common-lib/lib/index.ts
+13 −2		houston-common-lib/lib/process.ts
+3 −0		houston-common-lib/typings/window.d.ts
+2 −2		houston-common-ui/lib/components/ByteInput.vue
+1 −1		houston-common-ui/lib/components/HoustonHeader.vue
+35 −32		houston-common-ui/lib/components/NotificationView.vue
+1 −0		houston-common-ui/lib/components/index.ts
+2 −2		houston-common-ui/lib/components/modals/Modal.vue
+1 −18		houston-common-ui/lib/components/modals/ModalConfirm.vue
+29 −22		houston-common-ui/lib/composables/globalModalConfirm.ts
+25 −12		houston-common-ui/lib/composables/useTempObjectStaging.ts
+2 −0		houston-common-ui/lib/index.ts