From e68d1b32334715ce0cff59f63ccaa33b1236ef08 Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Wed, 28 Feb 2024 10:22:32 -0800 Subject: [PATCH 1/8] remove cloud mode for transfer website --- .../websites/[websiteId]/WebsiteData.tsx | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx index 080b9b5ce..ed2a40465 100644 --- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx @@ -33,23 +33,21 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: return ( <> - {process.env.cloudMode && ( - - - - - {(close: () => void) => ( - - )} - - - - )} + + + + + {(close: () => void) => ( + + )} + + + Date: Wed, 28 Feb 2024 10:19:22 -0800 Subject: [PATCH 2/8] add orderby to query. --- src/pages/api/teams/[teamId]/users/index.ts | 8 +------- src/pages/api/users/[userId]/teams.ts | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/pages/api/teams/[teamId]/users/index.ts b/src/pages/api/teams/[teamId]/users/index.ts index 3c4dfd711..3a03feaf4 100644 --- a/src/pages/api/teams/[teamId]/users/index.ts +++ b/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 ( }, }, }, - { - query, - page, - pageSize, - }, + req.query, ); return ok(res, users); diff --git a/src/pages/api/users/[userId]/teams.ts b/src/pages/api/users/[userId]/teams.ts index dda65355d..279df1e35 100644 --- a/src/pages/api/users/[userId]/teams.ts +++ b/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, { - query, - page, - pageSize, - }); + const teams = await getUserTeams(userId as string, req.query); return ok(res, teams); } From 719699762c6d1d67ddc0df893aaa4bd936de9c30 Mon Sep 17 00:00:00 2001 From: Brian Cao Date: Wed, 28 Feb 2024 12:40:23 -0800 Subject: [PATCH 3/8] add orderBy --- src/pages/api/teams/[teamId]/websites/index.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/pages/api/teams/[teamId]/websites/index.ts b/src/pages/api/teams/[teamId]/websites/index.ts index e4919d209..dd2fdeff1 100644 --- a/src/pages/api/teams/[teamId]/websites/index.ts +++ b/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, { - page, - query, - pageSize, - }); + const websites = await getTeamWebsites(teamId, req.query); return ok(res, websites); } From 87b947d174695719fb7f89b32f824ca74d5eb640 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Wed, 28 Feb 2024 16:08:50 -0800 Subject: [PATCH 4/8] Fixed date buttons for today/yesterday selection. --- src/lib/date.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/lib/date.ts b/src/lib/date.ts index cf2f09df5..79dd89769 100644 --- a/src/lib/date.ts +++ b/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, From 7e742730aea8d2eb49de34bbbf9c7f5938211841 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 29 Feb 2024 14:14:29 -0800 Subject: [PATCH 5/8] Bump version. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4a38c4e84..0124f360b 100644 --- a/package.json +++ b/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 ", + "author": "Umami Software, Inc. ", "license": "MIT", "homepage": "https://umami.is", "repository": { From a6acd5e0990d4d5864c93ad095206bc045742df1 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 29 Feb 2024 20:01:38 -0800 Subject: [PATCH 6/8] Added Docker labels to manual build. --- .github/workflows/cd-manual.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/cd-manual.yml b/.github/workflows/cd-manual.yml index ac701fcc5..6fefd16c1 100644 --- a/.github/workflows/cd-manual.yml +++ b/.github/workflows/cd-manual.yml @@ -8,6 +8,20 @@ on: description: Version required: true +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 @@ -25,6 +39,7 @@ jobs: with: image: umami tags: ${{ matrix.db-type }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest + labels: $DOCKER_LABELS buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io multiPlatform: true From 0bae517677f655d99025cf9f5ab1248c338fb69e Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 29 Feb 2024 20:19:56 -0800 Subject: [PATCH 7/8] Updated var reference. --- .github/workflows/cd-manual.yml | 2 +- .github/workflows/cd.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd-manual.yml b/.github/workflows/cd-manual.yml index 6fefd16c1..b3f2f2a0f 100644 --- a/.github/workflows/cd-manual.yml +++ b/.github/workflows/cd-manual.yml @@ -39,7 +39,7 @@ jobs: with: image: umami tags: ${{ matrix.db-type }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest - labels: $DOCKER_LABELS + labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io multiPlatform: true diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 920542b72..105b76fe5 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -39,7 +39,7 @@ jobs: with: image: umami tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest - labels: $DOCKER_LABELS + labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io multiPlatform: true @@ -53,7 +53,7 @@ jobs: with: image: umamisoftware/umami tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest - labels: $DOCKER_LABELS + labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: docker.io username: ${{ secrets.DOCKER_USERNAME }} From 75d2e3af41d2ec29d862043182981e9a21ad4b37 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 29 Feb 2024 20:21:51 -0800 Subject: [PATCH 8/8] Removed docker labels. --- .github/workflows/cd-manual.yml | 15 --------------- .github/workflows/cd.yml | 16 ---------------- 2 files changed, 31 deletions(-) diff --git a/.github/workflows/cd-manual.yml b/.github/workflows/cd-manual.yml index b3f2f2a0f..ac701fcc5 100644 --- a/.github/workflows/cd-manual.yml +++ b/.github/workflows/cd-manual.yml @@ -8,20 +8,6 @@ on: description: Version required: true -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 }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest - labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io multiPlatform: true diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 105b76fe5..b4de54992 100644 --- a/.github/workflows/cd.yml +++ b/.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 }}