Merge branch 'umami-software:master' into master

.github/workflows/cd.yml

@@ -2,20 +2,6 @@ name: Create docker images
 
 on: [create]
 
-env:
-  # set Docker OCI Labels
-  DOCKER_LABELS: > 
-    org.opencontainers.image.title=${{github.event.repository.name}},
-    org.opencontainers.image.description="Umami is a simple, fast, privacy-focused alternative to Google Analytics",
-    org.opencontainers.image.vendor=${{github.repository_owner}},
-    org.opencontainers.image.licenses="MIT",
-    org.opencontainers.image.version=${{github.ref_name}},
-    org.opencontainers.image.source=${{github.server_url}}/${{github.repository}},
-    org.opencontainers.image.revision=${{github.sha}},
-    org.opencontainers.image.url="https://umami.is/",
-    org.opencontainers.image.documentation="https://umami.is/docs",
-    org.opencontainers.image.base.name="docker.io/library/node:18-alpine"
-
 jobs:
   build:
     name: Build, push, and deploy
@@ -39,7 +25,6 @@ jobs:
         with:
           image: umami
           tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest
-          labels: $DOCKER_LABELS
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: ghcr.io
           multiPlatform: true
@@ -53,7 +38,6 @@ jobs:
         with:
           image: umamisoftware/umami
           tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest
-          labels: $DOCKER_LABELS
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}

package.json

@@ -1,8 +1,8 @@
 {
   "name": "umami",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
-  "author": "Mike Cao <mike@mikecao.com>",
+  "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",
   "homepage": "https://umami.is",
   "repository": {

src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx

@@ -33,23 +33,21 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
 
   return (
     <>
-      {process.env.cloudMode && (
+      <ActionForm
-        <ActionForm
+        label={formatMessage(labels.transferWebsite)}
-          label={formatMessage(labels.transferWebsite)}
+        description={formatMessage(messages.transferWebsite)}
-          description={formatMessage(messages.transferWebsite)}
+      >
-        >
+        <ModalTrigger disabled={!isTeamOwner}>
-          <ModalTrigger disabled={!isTeamOwner}>
+          <Button variant="secondary" disabled={!isTeamOwner}>
-            <Button variant="secondary" disabled={!isTeamOwner}>
+            {formatMessage(labels.transfer)}
-              {formatMessage(labels.transfer)}
+          </Button>
-            </Button>
+          <Modal title={formatMessage(labels.transferWebsite)}>
-            <Modal title={formatMessage(labels.transferWebsite)}>
+            {(close: () => void) => (
-              {(close: () => void) => (
+              <WebsiteTransferForm websiteId={websiteId} onSave={handleSave} onClose={close} />
-                <WebsiteTransferForm websiteId={websiteId} onSave={handleSave} onClose={close} />
+            )}
-              )}
+          </Modal>
-            </Modal>
+        </ModalTrigger>
-          </ModalTrigger>
+      </ActionForm>
-        </ActionForm>
-      )}
       <ActionForm
         label={formatMessage(labels.resetWebsite)}
         description={formatMessage(messages.resetWebsiteWarning)}

src/lib/date.ts

@@ -263,6 +263,13 @@ export function getOffsetDateRange(dateRange: DateRange, increment: number) {
   const { unit: originalUnit } = parseDateValue(value) || {};
 
   switch (originalUnit) {
+    case 'day':
+      return {
+        ...dateRange,
+        startDate: addDays(startDate, increment),
+        endDate: addDays(endDate, increment),
+        offset: offset + increment,
+      };
     case 'week':
       return {
         ...dateRange,

src/pages/api/teams/[teamId]/users/index.ts

@@ -44,8 +44,6 @@ export default async (
       return unauthorized(res);
     }
 
-    const { query, page, pageSize } = req.query;
-
     const users = await getTeamUsers(
       {
         where: {
@@ -63,11 +61,7 @@ export default async (
           },
         },
       },
-      {
+      req.query,
-        query,
-        page,
-        pageSize,
-      },
     );
 
     return ok(res, users);

src/pages/api/teams/[teamId]/websites/index.ts

@@ -43,13 +43,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const { page, query, pageSize } = req.query;
+    const websites = await getTeamWebsites(teamId, req.query);
-
-    const websites = await getTeamWebsites(teamId, {
-      page,
-      query,
-      pageSize,
-    });
 
     return ok(res, websites);
   }

src/pages/api/users/[userId]/teams.ts

@@ -39,13 +39,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const { page, query, pageSize } = req.query;
+    const teams = await getUserTeams(userId as string, req.query);
-
-    const teams = await getUserTeams(userId as string, {
-      query,
-      page,
-      pageSize,
-    });
 
     return ok(res, teams);
   }