Merge branch 'master' into barcode-scanning

.github/dependabot.yml

@@ -16,16 +16,33 @@ updates:
 
   - package-ecosystem: pip
     directories:
-    - /contrib/container
     - /docs
     - /contrib/dev_reqs
+    schedule:
+      interval: weekly
+      day: friday
+    groups:
+      dependencies:
+        patterns:
+          - "*" # Include all dependencies
+    assignees:
+      - "matmair"
+    versioning-strategy: increase
+
+  - package-ecosystem: pip
+    directories:
+    - /contrib/container
     - /src/backend
     schedule:
       interval: weekly
+      day: friday
     groups:
       dependencies:
         patterns:
           - "*" # Include all dependencies
+    assignees:
+      - "matmair"
+    versioning-strategy: increase
 
   - package-ecosystem: npm
     directories:

.github/workflows/qc_checks.yaml

@@ -480,12 +480,6 @@ jobs:
       - name: Fetch Database
         run: git clone --depth 1 https://github.com/inventree/test-db ./test-db
 
-      - name: Latest Database
-        run: |
-          cp test-db/latest.sqlite3 /home/runner/work/InvenTree/db.sqlite3
-          chmod +rw /home/runner/work/InvenTree/db.sqlite3
-          invoke migrate
-
       - name: 0.10.0 Database
         run: |
           rm /home/runner/work/InvenTree/db.sqlite3
@@ -500,20 +494,28 @@ jobs:
           chmod +rw /home/runner/work/InvenTree/db.sqlite3
           invoke migrate
 
-      - name: 0.12.0 Database
+      - name: 0.13.5 Database
         run: |
           rm /home/runner/work/InvenTree/db.sqlite3
-          cp test-db/stable_0.12.0.sqlite3 /home/runner/work/InvenTree/db.sqlite3
+          cp test-db/stable_0.13.5.sqlite3 /home/runner/work/InvenTree/db.sqlite3
           chmod +rw /home/runner/work/InvenTree/db.sqlite3
           invoke migrate
 
-      - name: 0.13.5 Database
+      - name: 0.16.0 Database
         run: |
           rm /home/runner/work/InvenTree/db.sqlite3
           cp test-db/stable_0.13.5.sqlite3 /home/runner/work/InvenTree/db.sqlite3
           chmod +rw /home/runner/work/InvenTree/db.sqlite3
           invoke migrate
 
+      - name: 0.17.0 Database
+        run: |
+          rm /home/runner/work/InvenTree/db.sqlite3
+          cp test-db/stable_0.13.5.sqlite3 /home/runner/work/InvenTree/db.sqlite3
+          chmod +rw /home/runner/work/InvenTree/db.sqlite3
+          invoke migrate
+
+
   platform_ui:
     name: Tests - Platform UI
     runs-on: ubuntu-20.04

docs/requirements.txt

@@ -187,9 +187,9 @@ importlib-metadata==8.5.0 \
     #   mkdocs
     #   mkdocs-get-deps
     #   mkdocstrings
-jinja2==3.1.4 \
-    --hash=sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 \
-    --hash=sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d
+jinja2==3.1.5 \
+    --hash=sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb \
+    --hash=sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb
     # via
     #   mkdocs
     #   mkdocs-macros-plugin

src/backend/InvenTree/plugin/samples/integration/user_interface_sample.py

@@ -75,7 +75,7 @@ def get_ui_panels(self, request, context, **kwargs):
                 'key': 'dynamic-panel',
                 'title': 'Dynamic Panel',
                 'source': self.plugin_static_file('sample_panel.js'),
-                'icon': 'part',
+                'icon': 'ti:wave-saw-tool:outline',
                 'context': {
                     'version': INVENTREE_SW_VERSION,
                     'plugin_version': self.VERSION,
@@ -97,7 +97,7 @@ def get_ui_panels(self, request, context, **kwargs):
                 'key': 'part-panel',
                 'title': _('Part Panel'),
                 'source': self.plugin_static_file('sample_panel.js:renderPartPanel'),
-                'icon': 'part',
+                'icon': 'ti:package_outline',
                 'context': {'part_name': part.name if part else ''},
             })
 

src/frontend/src/enums/ApiEndpoints.tsx

@@ -18,6 +18,7 @@ export enum ApiEndpoints {
   user_simple_login = 'email/generate/',
   user_reset = 'auth/password/reset/',
   user_reset_set = 'auth/password/reset/confirm/',
+  user_change_password = 'auth/password/change/',
   user_sso = 'auth/social/',
   user_sso_remove = 'auth/social/:id/disconnect/',
   user_emails = 'auth/emails/',

src/frontend/src/pages/Auth/ChangePassword.tsx

@@ -0,0 +1,124 @@
+import { Trans, t } from '@lingui/macro';
+import {
+  Button,
+  Center,
+  Container,
+  Divider,
+  Group,
+  Paper,
+  PasswordInput,
+  Stack,
+  Text
+} from '@mantine/core';
+import { useForm } from '@mantine/form';
+import { notifications } from '@mantine/notifications';
+import { useNavigate } from 'react-router-dom';
+
+import { api } from '../../App';
+import { StylishText } from '../../components/items/StylishText';
+import { ProtectedRoute } from '../../components/nav/Layout';
+import { LanguageContext } from '../../contexts/LanguageContext';
+import { ApiEndpoints } from '../../enums/ApiEndpoints';
+import { apiUrl } from '../../states/ApiState';
+import { useUserState } from '../../states/UserState';
+
+export default function Set_Password() {
+  const simpleForm = useForm({
+    initialValues: {
+      new_password1: '',
+      new_password2: ''
+    }
+  });
+
+  const user = useUserState();
+  const navigate = useNavigate();
+
+  function passwordError(values: any) {
+    let message: any =
+      values?.new_password2 ||
+      values?.new_password1 ||
+      values?.error ||
+      t`Password could not be changed`;
+
+    // If message is array
+    if (!Array.isArray(message)) {
+      message = [message];
+    }
+
+    message.forEach((msg: string) => {
+      notifications.show({
+        title: t`Error`,
+        message: msg,
+        color: 'red'
+      });
+    });
+  }
+
+  function handleSet() {
+    // Set password with call to backend
+    api
+      .post(apiUrl(ApiEndpoints.user_change_password), {
+        new_password1: simpleForm.values.new_password1,
+        new_password2: simpleForm.values.new_password2
+      })
+      .then((val) => {
+        if (val.status === 200) {
+          notifications.show({
+            title: t`Password Changed`,
+            message: t`The password was set successfully. You can now login with your new password`,
+            color: 'green',
+            autoClose: false
+          });
+          navigate('/login');
+        } else {
+          passwordError(val.data);
+        }
+      })
+      .catch((err) => {
+        passwordError(err.response.data);
+      });
+  }
+
+  return (
+    <LanguageContext>
+      <ProtectedRoute>
+        <Center mih='100vh'>
+          <Container w='md' miw={425}>
+            <Stack>
+              <StylishText size='xl'>{t`Reset Password`}</StylishText>
+              <Divider />
+              {user.username() && (
+                <Paper>
+                  <Group>
+                    <StylishText size='md'>{t`User`}</StylishText>
+                    <Text>{user.username()}</Text>
+                  </Group>
+                </Paper>
+              )}
+              <Divider />
+              <Stack gap='xs'>
+                <PasswordInput
+                  required
+                  aria-label='input-password-1'
+                  label={t`New Password`}
+                  description={t`Enter your new password`}
+                  {...simpleForm.getInputProps('new_password1')}
+                />
+                <PasswordInput
+                  required
+                  aria-label='input-password-2'
+                  label={t`Confirm New Password`}
+                  description={t`Confirm your new password`}
+                  {...simpleForm.getInputProps('new_password2')}
+                />
+              </Stack>
+              <Button type='submit' onClick={handleSet}>
+                <Trans>Confirm</Trans>
+              </Button>
+            </Stack>
+          </Container>
+        </Center>
+      </ProtectedRoute>
+    </LanguageContext>
+  );
+}

src/frontend/src/pages/Auth/Set-Password.tsx → src/frontend/src/pages/Auth/ResetPassword.tsx

@@ -17,7 +17,7 @@ import { LanguageContext } from '../../contexts/LanguageContext';
 import { ApiEndpoints } from '../../enums/ApiEndpoints';
 import { apiUrl } from '../../states/ApiState';
 
-export default function Set_Password() {
+export default function ResetPassword() {
   const simpleForm = useForm({ initialValues: { password: '' } });
   const [searchParams] = useSearchParams();
   const navigate = useNavigate();

src/frontend/src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx

@@ -3,15 +3,17 @@ import { Group, Stack, Table, Title } from '@mantine/core';
 import { IconKey, IconUser } from '@tabler/icons-react';
 import { useMemo } from 'react';
 
+import { useNavigate } from 'react-router-dom';
 import { YesNoUndefinedButton } from '../../../../components/buttons/YesNoButton';
 import type { ApiFormFieldSet } from '../../../../components/forms/fields/ApiFormField';
 import { ActionDropdown } from '../../../../components/items/ActionDropdown';
 import { ApiEndpoints } from '../../../../enums/ApiEndpoints';
-import { notYetImplemented } from '../../../../functions/notifications';
 import { useEditApiFormModal } from '../../../../hooks/UseForm';
 import { useUserState } from '../../../../states/UserState';
 
 export function AccountDetailPanel() {
+  const navigate = useNavigate();
+
   const [user, fetchUserState] = useUserState((state) => [
     state.user,
     state.fetchUserState
@@ -51,10 +53,12 @@ export function AccountDetailPanel() {
                 onClick: editUser.open
               },
               {
-                name: t`Set Password`,
+                name: t`Change Password`,
                 icon: <IconKey />,
-                tooltip: t`Set User Password`,
-                onClick: notYetImplemented
+                tooltip: t`Change User Password`,
+                onClick: () => {
+                  navigate('/change-password');
+                }
               }
             ]}
           />

src/frontend/src/router.tsx

@@ -107,8 +107,13 @@ export const Login = Loadable(lazy(() => import('./pages/Auth/Login')));
 export const Logout = Loadable(lazy(() => import('./pages/Auth/Logout')));
 export const Logged_In = Loadable(lazy(() => import('./pages/Auth/Logged-In')));
 export const Reset = Loadable(lazy(() => import('./pages/Auth/Reset')));
-export const Set_Password = Loadable(
-  lazy(() => import('./pages/Auth/Set-Password'))
+
+export const ChangePassword = Loadable(
+  lazy(() => import('./pages/Auth/ChangePassword'))
+);
+
+export const ResetPassword = Loadable(
+  lazy(() => import('./pages/Auth/ResetPassword'))
 );
 
 // Routes
@@ -168,7 +173,8 @@ export const routes = (
       <Route path='/logout' element={<Logout />} />,
       <Route path='/logged-in' element={<Logged_In />} />
       <Route path='/reset-password' element={<Reset />} />
-      <Route path='/set-password' element={<Set_Password />} />
+      <Route path='/set-password' element={<ResetPassword />} />
+      <Route path='/change-password' element={<ChangePassword />} />
     </Route>
   </Routes>
 );

src/frontend/tests/pages/pui_part.spec.ts

@@ -116,6 +116,8 @@ test('Parts - Allocations', async ({ page }) => {
   await page.getByText('5 / 109').waitFor();
 
   // Navigate to the "Allocations" tab
+  await page.waitForTimeout(500);
+
   await page.getByRole('tab', { name: 'Allocations' }).click();
 
   await page.getByRole('button', { name: 'Build Order Allocations' }).waitFor();

src/frontend/tests/pui_login.spec.ts

@@ -93,3 +93,37 @@ test('Login - Failures', async ({ page }) => {
 
   await loginWithError();
 });
+
+test('Login - Change Password', async ({ page }) => {
+  await doQuickLogin(page, 'noaccess', 'youshallnotpass');
+
+  // Navigate to the 'change password' page
+  await page.goto(`${baseUrl}/settings/user/account`);
+  await page.getByLabel('action-menu-user-actions').click();
+  await page.getByLabel('action-menu-user-actions-change-password').click();
+
+  // First attempt with some errors
+  await page.getByLabel('input-password-1').fill('12345');
+  await page.getByLabel('input-password-2').fill('54321');
+  await page.getByRole('button', { name: 'Confirm' }).click();
+  await page.getByText('The two password fields didn’t match').waitFor();
+
+  await page.getByLabel('input-password-2').fill('12345');
+  await page.getByRole('button', { name: 'Confirm' }).click();
+
+  await page.getByText('This password is too short').waitFor();
+  await page.getByText('This password is entirely numeric').waitFor();
+
+  await page.getByLabel('input-password-1').fill('youshallnotpass');
+  await page.getByLabel('input-password-2').fill('youshallnotpass');
+  await page.getByRole('button', { name: 'Confirm' }).click();
+
+  await page.getByText('Password Changed').waitFor();
+  await page.getByText('The password was set successfully').waitFor();
+
+  // Should have redirected to the index page
+  await page.waitForURL('**/platform/home**');
+  await page.getByText('InvenTree Demo Server - Norman Nothington');
+
+  await page.waitForTimeout(1000);
+});