@7365admin1/module-hygiene 4.28.0 → 4.28.1-staging.7

package/.github/workflows/publish-staging.yml

@@ -0,0 +1,36 @@
+name: Publish Staging
+on:
+  push:
+    branches:
+      - staging
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: "yarn"
+          cache-dependency-path: yarn.lock
+
+      - run: yarn install --immutable
+
+      - run: yarn build
+
+      - name: Create .npmrc for publishing
+        run: |
+          echo '//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}' > ~/.npmrc
+
+      - name: Set staging prerelease version
+        run: |
+          BASE=$(node -p "const [x,y,z]=require('./package.json').version.split('-')[0].split('.'); [x,y,+z+1].join('.')")
+          npm version "$BASE-staging.${{ github.run_number }}" --no-git-tag-version
+          node -p "'Publishing ' + require('./package.json').version"
+
+      - name: Publish to npm with staging tag
+        run: npm publish --tag staging --registry https://registry.npmjs.org

package/dist/index.js

@@ -1663,7 +1663,7 @@ function useUnitRepository() {
 function useAreaService() {
   const { createArea: _createArea, getAreasForChecklist } = useAreaRepo();
   const { generateAreaExcel } = useAreaExportService();
-  const { getUnits: _getUnits } = useUnitRepository();
+  const { createUnit: _createUnit, getUnits: _getUnits } = useUnitRepository();
   async function importArea({
     dataJson,
     site,
@@ -1745,23 +1745,40 @@ function useAreaService() {
               areaData.set = setNumber;
             }
           }
-          if (row.UNITS && availableUnits.length > 0) {
+          if (row.UNITS) {
             const unitNames = String(row.UNITS).split(",").map((u) => u.trim()).filter((u) => u);
             if (unitNames.length > 0) {
               const areaUnits = [];
               for (const unitName of unitNames) {
-                const foundUnit = availableUnits.find(
+                let foundUnit = availableUnits.find(
                   (u) => u.name.toLowerCase() === unitName.toLowerCase()
                 );
+                if (!foundUnit) {
+                  try {
+                    const insertedUnitId = await _createUnit({
+                      name: unitName,
+                      site,
+                      serviceType
+                    });
+                    foundUnit = {
+                      _id: insertedUnitId,
+                      name: unitName
+                    };
+                    availableUnits.push(foundUnit);
+                    import_node_server_utils8.logger.info(
+                      `Successfully created missing unit "${unitName}" for area "${areaName}"`
+                    );
+                  } catch (error) {
+                    import_node_server_utils8.logger.warn(
+                      `Unit "${unitName}" could not be created for area "${areaName}": ${error.message}`
+                    );
+                  }
+                }
                 if (foundUnit) {
                   areaUnits.push({
                     unit: foundUnit._id,
                     name: foundUnit.name
                   });
-                } else {
-                  import_node_server_utils8.logger.warn(
-                    `Unit "${unitName}" not found in site for area "${areaName}"`
-                  );
                 }
               }
               if (areaUnits.length > 0) {
@@ -2148,6 +2165,13 @@ function useUnitService() {
     updateUnit: _updateUnit,
     deleteUnit: _deleteUnit
   } = useUnitRepository();
+  function getUnitNamesFromRow(row) {
+    const unitValue = row?.UNIT ?? row?.UNITS;
+    if (!unitValue) {
+      return [];
+    }
+    return String(unitValue).split(",").map((unit) => unit.trim()).filter((unit) => unit && !unit.startsWith("Sample:"));
+  }
   async function importUnit({
     dataJson,
     site,
@@ -2173,36 +2197,35 @@ function useUnitService() {
     try {
       for (let i = 0; i < dataArray.length; i++) {
         const row = dataArray[i];
-        if (!row?.UNIT) {
-          import_node_server_utils11.logger.warn(`Skipping row ${i + 1} with missing UNIT:`, row);
-          skippedRows.push(i + 1);
-          continue;
-        }
-        const unitName = String(row.UNIT).trim();
-        if (!unitName) {
-          import_node_server_utils11.logger.warn(`Skipping row ${i + 1} with empty unit name`);
-          skippedRows.push(i + 1);
-          continue;
-        }
-        if (unitName.startsWith("Sample:")) {
-          import_node_server_utils11.logger.warn(`Skipping row ${i + 1} with sample unit: ${unitName}`);
+        const unitNames = getUnitNamesFromRow(row);
+        if (unitNames.length === 0) {
+          import_node_server_utils11.logger.warn(`Skipping row ${i + 1} with missing UNIT/UNITS:`, row);
           skippedRows.push(i + 1);
           continue;
         }
-        try {
-          const insertedId = await _createUnit({
-            name: unitName,
-            site,
-            serviceType
-          });
-          insertedUnitIds.push(insertedId);
-          import_node_server_utils11.logger.info(`Successfully created unit: ${unitName}`);
-        } catch (error) {
-          import_node_server_utils11.logger.error(`Error creating unit "${unitName}": ${error.message}`);
-          if (error.message.includes("Unit already exists")) {
-            duplicateUnits.push(unitName);
-          } else {
-            failedUnits.push(unitName);
+        const uniqueUnitNames = Array.from(
+          new Set(unitNames.map((unitName) => unitName.toLowerCase()))
+        ).map(
+          (lowerUnitName) => unitNames.find(
+            (unitName) => unitName.toLowerCase() === lowerUnitName
+          )
+        );
+        for (const unitName of uniqueUnitNames) {
+          try {
+            const insertedId = await _createUnit({
+              name: unitName,
+              site,
+              serviceType
+            });
+            insertedUnitIds.push(insertedId);
+            import_node_server_utils11.logger.info(`Successfully created unit: ${unitName}`);
+          } catch (error) {
+            import_node_server_utils11.logger.error(`Error creating unit "${unitName}": ${error.message}`);
+            if (error.message.includes("Unit already exists")) {
+              duplicateUnits.push(unitName);
+            } else {
+              failedUnits.push(unitName);
+            }
           }
         }
       }